mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
88e1ef2225
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.9.6";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
hash = "sha256-YC6oUKD48mKlX/bHWPMKm+0Ub0/5dnXmBFnVIGqzb/g=";
|
||||
hash = "sha256-+zyI5pBkhdrbesaEUxl3X4GQFzhULVuEqNCdDOOizcs=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OQh8xub/4DHZk4sGIJldyoXGR/TQ9F0reERk2lpjYi8=";
|
||||
hash = "sha256-KGHghhHALMoFuO7i4wq9B2HA2WTA80WSOR5Odpo1Ing=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-etvCtNCW6tuzKZEEx2RODzMx0W9hGoXNS2jWGJO+Pc0=";
|
||||
vendorHash = "sha256-+YzC7xjrRI0e8/cOcJM3AZS5hI82H1qFxnfUGMgqXhs=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "114.0b6";
|
||||
version = "114.0b7";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "50127c640e0cb617ca031df022a09df8bba7dd44e9b88b034d9c9276d1adcec17a937d80ab3e540433290e8f78982a405b7281724713f43c36e5e266df721854";
|
||||
sha512 = "6cfcaa08d74d6e123047cd33c1bc2e012e948890ea8bab5feb43459048a41c10f6bc549241386a3c81d438b59e966e7949161fe3f18b359ec8659bdf2ba0f187";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "114.0b6";
|
||||
version = "114.0b7";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "cf5a6ab9b950af602c91d2c6ffc9c5efd96d83f580f3de16e03cbcf3ef5fa04e4d86536a82c1e2503ca09ae744991bc360e35a2e1c03c8b8408fa3f4c956823e";
|
||||
sha512 = "2aa9ec2eb57b6debe3a15ac43f4410a4d649c8373725be8ed2540effa758d970e29c9ca675d9ac27a4b58935fc428aaf8b84ecd769b88f3607e911178492ebf1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.15.9";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tR3qffGB83iyg3T7YRD1YRX/PG4YGLOnElHJ0ju47Y8=";
|
||||
hash = "sha256-vVCKQDcL/NWeNE3tbmEUgDOBw6zxXy7IcT7IB6/paSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "22.13.0";
|
||||
version = "23.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-cZ9SFdKNURhcInM6zZNwoi+WyHAsGCeAgkfpAVi7GYE=";
|
||||
sha256 = "sha256-+jzGcuAcbXOwsyAL+Hr9Fas2vO2S8ZKSaZeCf/bnl7A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
cp otf/*.otf $out/share/fonts/opentype
|
||||
install --mode=-x -Dt $out/share/fonts/opentype otf/*.otf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
{ lib
|
||||
, ddcutil
|
||||
, easyeffects
|
||||
, gjs
|
||||
, glib
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, gsound
|
||||
, hddtemp
|
||||
, libgda
|
||||
, libgtop
|
||||
, liquidctl
|
||||
, lm_sensors
|
||||
, netcat-gnu
|
||||
, nvme-cli
|
||||
, procps
|
||||
, pulseaudio
|
||||
, libgtop
|
||||
, python3
|
||||
, smartmontools
|
||||
, substituteAll
|
||||
|
|
@ -61,6 +63,16 @@ super: lib.trivial.pipe super [
|
|||
'';
|
||||
}))
|
||||
|
||||
(patchExtension "eepresetselector@ulville.github.io" (old: {
|
||||
patches = [
|
||||
# Needed to find the currently set preset
|
||||
(substituteAll {
|
||||
src = ./extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch;
|
||||
easyeffects_gsettings_path = "${glib.getSchemaPath easyeffects}";
|
||||
})
|
||||
];
|
||||
}))
|
||||
|
||||
(patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
--- a/extension.js
|
||||
+++ b/extension.js
|
||||
@@ -339,9 +339,9 @@ const EEPSIndicator = GObject.registerClass(
|
||||
_lastUsedInputPreset = _idata.trim().slice(1, -1);
|
||||
} else if (appType === 'native') {
|
||||
// Get last used presets
|
||||
- const settings = new Gio.Settings({
|
||||
- schema_id: 'com.github.wwmm.easyeffects',
|
||||
- });
|
||||
+ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@easyeffects_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
|
||||
+ const _schema = _schema_source.lookup('com.github.wwmm.easyeffects', false);
|
||||
+ const settings = new Gio.Settings({settings_schema: _schema});
|
||||
_lastUsedOutputPreset = settings.get_string(
|
||||
'last-used-output-preset'
|
||||
);
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.28.3";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3uHR6W2Vbqen9e6OXEFFl91/LzXCix4alnprFB36yes=";
|
||||
hash = "sha256-qGFF6Q1cY2hDb2TycB39RY7RAIJica0y6ju76NeIplY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoHash = "sha256-3+Jb/POABFIBkKpaTD9JDc1vrDzsJe9mGRBQR3UnDAg=";
|
||||
cargoHash = "sha256-/WIM7DhnfPlo/DGoTSEHON+et55h364V++VHU8Olvuc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, writeText
|
||||
, asttokens
|
||||
, pycryptodome
|
||||
, importlib-metadata
|
||||
, recommonmark
|
||||
, semantic-version
|
||||
, sphinx
|
||||
|
|
@ -27,14 +28,14 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8jw92ttKhXubzDr0tt9/OoCsPEyB9yPRsueK+j4PO6Y=";
|
||||
sha256 = "sha256-x3MTKxXZgAT35o8pekGxSXhcr5MrrRPr86+3Lab4qn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,6 +54,7 @@ buildPythonPackage rec {
|
|||
asttokens
|
||||
pycryptodome
|
||||
semantic-version
|
||||
importlib-metadata
|
||||
|
||||
# docs
|
||||
recommonmark
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rascal";
|
||||
version = "0.6.2";
|
||||
version = "0.28.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar";
|
||||
sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
|
||||
sha256 = "sha256-KMoGTegjXuGSzNnwH6SkcM5GC/F3oluvFrlJ51Pms3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "portmidi";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bLGqi3b9FHBA43baNDT8jkPBQSXAUDfurQSJHLcy3AE=";
|
||||
sha256 = "sha256-uqBeh9vBP6+V+FN4lfeGxePQcpZMDYUuAo/d9a5rQxU=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib
|
||||
, absl-py
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, dm-tree
|
||||
, docutils
|
||||
, etils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, numpy
|
||||
, pythonOlder
|
||||
, tabulate
|
||||
|
|
@ -27,6 +28,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "replace-np-bool-with-np-bool_.patch";
|
||||
url = "https://github.com/deepmind/sonnet/commit/df5d099d4557a9a81a0eb969e5a81ed917bcd612.patch";
|
||||
hash = "sha256-s7abl83osD4wa0ZhqgDyjqQ3gagwGYCdQifwFqhNp34=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dm-tree
|
||||
etils
|
||||
|
|
@ -42,7 +51,9 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
click
|
||||
docutils
|
||||
tensorflow
|
||||
tensorflow-datasets
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "rasterio";
|
||||
repo = "rasterio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C5jenXcONNYiUNa5GQ7ATBi8m0JWvg8Dyp9+ejGX+Fs=";
|
||||
hash = "sha256-6AtGRXGuAXMrePqS2lmNdOuPZi6LHuiWP2LJyxH3L3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -90,7 +90,10 @@ buildPythonPackage rec {
|
|||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/rio --version | grep ${version} > /dev/null
|
||||
$out/bin/rio --show-versions | grep -E "rasterio:\s${version}" > /dev/null
|
||||
$out/bin/rio --show-versions | grep -E "GDAL:\s[0-9]+(\.[0-9]+)*" > /dev/null
|
||||
$out/bin/rio --show-versions | grep -E "PROJ:\s[0-9]+(\.[0-9]+)*" > /dev/null
|
||||
$out/bin/rio --show-versions | grep -E "GEOS:\s[0-9]+(\.[0-9]+)*" > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, pkg-config
|
||||
, which
|
||||
, cairo
|
||||
, pango
|
||||
, python
|
||||
, doxygen
|
||||
, ncurses
|
||||
, libintl
|
||||
, wxGTK
|
||||
, gtk3
|
||||
, IOKit
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, AudioToolbox
|
||||
, OpenGL
|
||||
, CoreFoundation
|
||||
, pillow
|
||||
, numpy
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wxPython";
|
||||
version = "4.0.7.post2";
|
||||
format = "other";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ pkg-config which doxygen setuptools wxGTK ];
|
||||
|
||||
buildInputs = [ ncurses libintl ]
|
||||
++ (if stdenv.isDarwin
|
||||
then
|
||||
[ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
|
||||
else
|
||||
[ gtk3 ]
|
||||
);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pillow
|
||||
six
|
||||
];
|
||||
|
||||
DOXYGEN = "${doxygen}/bin/doxygen";
|
||||
|
||||
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
|
||||
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
|
||||
--replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
|
||||
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
|
||||
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
|
||||
("gdk", "${gtk3}/lib/libgtk-x11-2.0.so"),
|
||||
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
|
||||
("appsvc", None)
|
||||
]}'
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
# Remove the OSX-Only wx.webkit module
|
||||
sed -i "s/makeETGRule(.*'WXWEBKIT')/pass/" wscript
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out
|
||||
'';
|
||||
|
||||
passthru = { wxWidgets = wxGTK; };
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Cross platform GUI toolkit for Python, Phoenix version";
|
||||
homepage = "http://wxpython.org/";
|
||||
license = lib.licenses.wxWindows;
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, setuptools
|
||||
, which
|
||||
, pkg-config
|
||||
, python
|
||||
, isPy27
|
||||
, doxygen
|
||||
, cairo
|
||||
, ncurses
|
||||
, pango
|
||||
, wxGTK
|
||||
, gtk3
|
||||
, AGL
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
, AVKit
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, CoreFoundation
|
||||
, CoreMedia
|
||||
, IOKit
|
||||
, Kernel
|
||||
, OpenGL
|
||||
, Security
|
||||
, WebKit
|
||||
, pillow
|
||||
, numpy
|
||||
, six
|
||||
, libXinerama
|
||||
, libSM
|
||||
, libXxf86vm
|
||||
, libXtst
|
||||
, libGLU
|
||||
, libGL
|
||||
, xorgproto
|
||||
, gst_all_1
|
||||
, libglvnd
|
||||
, mesa
|
||||
, webkitgtk
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
let
|
||||
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "wxPython";
|
||||
version = "4.1.1";
|
||||
disabled = isPy27;
|
||||
format = "other";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80";
|
||||
};
|
||||
|
||||
# ld: framework not found System
|
||||
postPatch = ''
|
||||
for file in ext/wxWidgets/configure*; do
|
||||
substituteInPlace $file --replace "-framework System" ""
|
||||
done
|
||||
'';
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/75759
|
||||
# https://github.com/wxWidgets/Phoenix/issues/1316
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
doxygen
|
||||
gtk3
|
||||
pkg-config
|
||||
setuptools
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
ncurses
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libXinerama
|
||||
libSM
|
||||
libXxf86vm
|
||||
libXtst
|
||||
xorgproto
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libGLU
|
||||
libGL
|
||||
libglvnd
|
||||
mesa
|
||||
webkitgtk
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AGL
|
||||
AudioToolbox
|
||||
AVFoundation
|
||||
AVKit
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
CoreMedia
|
||||
IOKit
|
||||
Kernel
|
||||
OpenGL
|
||||
Security
|
||||
WebKit
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
numpy
|
||||
six
|
||||
];
|
||||
|
||||
DOXYGEN = "${doxygen}/bin/doxygen";
|
||||
|
||||
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
|
||||
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
|
||||
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
|
||||
("gdk", "${gtk3}/lib/libgtk-x11-3.0.so"),
|
||||
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
|
||||
("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"),
|
||||
("appsvc", None)
|
||||
]}'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
${python.pythonForBuild.interpreter} build.py -v build_wx dox etg --nodoc sip build_py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross platform GUI toolkit for Python, Phoenix version";
|
||||
homepage = "http://wxpython.org/";
|
||||
license = licenses.wxWindows;
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.6.8";
|
||||
version = "4.6.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-ECj94r/0jEB9xzlX5A8q4jvOr92yRsTpD4IkxXMF2EM=";
|
||||
hash = "sha256-CNtaaMvBXJ6Fl5FJIWva5nAs/zniPA2rcfcf+RegymY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ let
|
|||
};
|
||||
|
||||
# Thanks to the live-bootstrap project!
|
||||
# See https://github.com/fosslinux/live-bootstrap/blob/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0/coreutils-5.0.kaem
|
||||
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0";
|
||||
# See https://github.com/fosslinux/live-bootstrap/blob/a8752029f60217a5c41c548b16f5cdd2a1a0e0db/sysa/coreutils-5.0/coreutils-5.0.kaem
|
||||
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/a8752029f60217a5c41c548b16f5cdd2a1a0e0db/sysa/coreutils-5.0";
|
||||
|
||||
makefile = fetchurl {
|
||||
url = "${liveBootstrap}/mk/main.mk";
|
||||
|
|
@ -63,6 +63,11 @@ let
|
|||
url = "${liveBootstrap}/patches/sort-locale.patch";
|
||||
sha256 = "0bdch18mpyyxyl6gyqfs0wb4pap9flr11izqdyxccx1hhz0a2i6c";
|
||||
})
|
||||
# don't assume fopen cannot return stdin or stdout.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/uniq-fopen.patch";
|
||||
sha256 = "0qs6shyxl9j4h34v5j5sgpxrr4gjfljd2hxzw416ghwc3xzv63fp";
|
||||
})
|
||||
];
|
||||
in
|
||||
kaem.runCommand "${pname}-${version}" {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
|
||||
|
||||
let
|
||||
version = "3.5.7";
|
||||
version = "3.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VgWY622RJ8f4yA6TRC5IvatVFw2CP5lN3QBS3Xaevbc=";
|
||||
hash = "sha256-Vp8U49fp0FowIuSSvbrMWjAKG2oDO1o0qO4izSnTR3U=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-w/aWrQF/PAWTGMFUcpHiiDef6cvLLdYP06iwBdxrGkQ=";
|
||||
vendorHash = "sha256-vu5VKHnDbvxSd8qpIFy0bA88IIXLaQ5S8dVUJEwnKJA=";
|
||||
|
||||
modRoot = "./server";
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-Bq5vOZCflLDAhhmwSww9JCahfL/JHKa3ZT4cwNXzW90=";
|
||||
vendorHash = "sha256-i60rKCmbEXkdFOZk2dTbG5EtYKb5eCBSyMcsTtnvATs=";
|
||||
|
||||
modRoot = "./etcdutl";
|
||||
};
|
||||
|
|
@ -55,7 +55,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-KUr0SrfuE5sh54THdvJwuMO/U6O+civ6onEPzNGqf18=";
|
||||
vendorHash = "sha256-awl/4kuOjspMVEwfANWK0oi3RId6ERsFkdluiRaaXlA=";
|
||||
|
||||
modRoot = "./etcdctl";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.24.0";
|
||||
hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=";
|
||||
version = "1.25.0";
|
||||
hash = "sha256-XtRNRZQycqTopbz0Q0I3IQ8t4xuQP8peOBwbvX7uHow=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,14 @@
|
|||
{ callPackage
|
||||
, fetchhg
|
||||
, nginxMainline
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
pname = "nginxQuic";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.nginx.org/nginx-quic";
|
||||
rev = "0af598651e33"; # branch=quic
|
||||
hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
ln -s auto/configure configure
|
||||
'';
|
||||
inherit (nginxMainline) src version;
|
||||
|
||||
configureFlags = [
|
||||
"--with-http_v3_module"
|
||||
"--with-stream_quic_module"
|
||||
];
|
||||
|
||||
version = "1.23.4";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2023-05-04T21-44-30Z";
|
||||
version = "2023-05-18T00-05-36Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-CSB7QFKb96QVgcBlfP+ghVlLlPGkcI0um6hC2rp+CWc=";
|
||||
sha256 = "sha256-VOv5gYjoHPO4MuiQHN7nX5IghoOeqj3/vu/vILGv/yA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EthPqudNGnXTixnDRbRXdgOfJHIrIYZ8IHy5BZLSwJQ=";
|
||||
vendorHash = "sha256-ZwkToIEzbU1PYxxQCGc+Zkiu7SkO83oJFzwi4Qyqzn0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "zsh-autocomplete";
|
||||
version = "22.01.21";
|
||||
version = "23.05.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marlonrichert";
|
||||
repo = "zsh-autocomplete";
|
||||
rev = version;
|
||||
sha256 = "sha256-+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs=";
|
||||
sha256 = "sha256-HVt7JGkNxg9Kb29x95mxq/vtQ1dBbNeQlb9lK2qTBSI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
, vulkan-loader
|
||||
, wayland
|
||||
, wrapQtAppsHook
|
||||
, withX11 ? true
|
||||
, x11Support ? true
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-caps-viewer";
|
||||
version = "3.29";
|
||||
version = "3.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SaschaWillems";
|
||||
repo = "VulkanCapsViewer";
|
||||
rev = version;
|
||||
hash = "sha256-c7jvlwvz85cf8lUlBPyRYvDkSlvkzSW6Jc6wlyKnHBc=";
|
||||
hash = "sha256-sTJwPPiSPCt+X2FADcDpKtjiQ+GNHB3Jp3Mn+bK9tgA=";
|
||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||
# To help us, they've put it in a git-submodule.
|
||||
# The result will work with any vulkan-loader version.
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
vulkan-loader
|
||||
wayland
|
||||
] ++ lib.lists.optionals withX11 [ qtx11extras ];
|
||||
] ++ lib.lists.optionals x11Support [ qtx11extras ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace vulkanCapsViewer.pro \
|
||||
|
|
|
|||
Loading…
Reference in a new issue