From ab3f8547cbddc167abe1be7092d3a531d7e9f28c Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Thu, 7 Dec 2023 12:08:43 +0300 Subject: [PATCH 001/163] bzip2: update patch URL For some reason ftp.suse.com refuses connections via IPv6 on HTTPS, which breaks download from IPv6-only network. This commit changes protocol to FTP, which works fine via IPv6 and which is consistent with other mention of this domain in nixpkgs. --- pkgs/tools/compression/bzip2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index bfab2dbb9467..0268b60afc52 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -25,7 +25,7 @@ in { patches = [ (fetchurl { - url = "https://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; + url = "ftp://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; sha256 = "sha256-QMufl6ffJVVVVZespvkCbFpB6++R1lnq1687jEsUjr0="; }) ]; From d4186518db69d0387cd013b201ea92568142323f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 03:57:30 +0000 Subject: [PATCH 002/163] upx: 4.2.3 -> 4.2.4 --- pkgs/tools/compression/upx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 3a2c6394f90a..f20e39a4bca5 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-3+aOadTqQ1apnrXt2I27j8P6iJF96W90YjxVTPmRhs0="; + hash = "sha256-r36BD5f/sQSz3GjvreOptc7atIaaBZKpU+7qm+BKLss="; }; nativeBuildInputs = [ cmake ]; From 560957bae1ee123b43d6534eebf2a5917a78e0a2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 22 Nov 2023 18:23:59 +0200 Subject: [PATCH 003/163] edk2: building of `antlr` and `dlg` should be built with native architecture. They should be built with native architecture --- pkgs/development/compilers/edk2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 17151cf9f947..b448a9c51406 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -82,6 +82,13 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; + # Fix cross-compilation issue, use build cc/c++ for building antlr and dlg + postPatch = '' + substituteInPlace BaseTools/Source/C/VfrCompile/GNUmakefile \ + --replace '$(MAKE) -C Pccts/antlr' '$(MAKE) -C Pccts/antlr CC=cc CXX=c++' \ + --replace '$(MAKE) -C Pccts/dlg' '$(MAKE) -C Pccts/dlg CC=cc CXX=c++' + ''; + installPhase = '' mkdir -vp $out mv -v BaseTools $out From da5ec6b0c3e0bfce25dc9e5c3e45fdd8c38affdf Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 23 Nov 2023 21:16:33 +0200 Subject: [PATCH 004/163] edk2: Fix OVMF cross compilation --- pkgs/development/compilers/edk2/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index b448a9c51406..2d2cce113f9e 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -82,11 +82,10 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; - # Fix cross-compilation issue, use build cc/c++ for building antlr and dlg - postPatch = '' - substituteInPlace BaseTools/Source/C/VfrCompile/GNUmakefile \ - --replace '$(MAKE) -C Pccts/antlr' '$(MAKE) -C Pccts/antlr CC=cc CXX=c++' \ - --replace '$(MAKE) -C Pccts/dlg' '$(MAKE) -C Pccts/dlg CC=cc CXX=c++' + # For cross-compilation we need to build antlr and dlg for the build arch + preBuild = '' + BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/antlr CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES + BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/dlg CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES ''; installPhase = '' @@ -125,13 +124,13 @@ edk2 = stdenv.mkDerivation rec { prePatch = '' rm -rf BaseTools - ln -sv ${edk2}/BaseTools BaseTools + ln -sv ${buildPackages.edk2}/BaseTools BaseTools ''; configurePhase = '' runHook preConfigure export WORKSPACE="$PWD" - . ${edk2}/edksetup.sh BaseTools + . ${buildPackages.edk2}/edksetup.sh BaseTools runHook postConfigure ''; From 474fe1a90547c7d1b8509e8b4aeef9e8935f94a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 May 2024 15:18:04 +0200 Subject: [PATCH 005/163] edk2: use patchShebangs for fixing up shell wrappers --- pkgs/development/compilers/edk2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 2d2cce113f9e..302d5611c19e 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -94,8 +94,8 @@ edk2 = stdenv.mkDerivation rec { mv -v edksetup.sh $out # patchShebangs fails to see these when cross compiling for i in $out/BaseTools/BinWrappers/PosixLike/*; do - substituteInPlace $i --replace '/usr/bin/env bash' ${buildPackages.bash}/bin/bash chmod +x "$i" + patchShebangs --build "$i" done ''; From 7e2c76bb84c4cd7cccf07a3ef645c14516f09b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 May 2024 15:50:21 +0200 Subject: [PATCH 006/163] edk2: fix cross-compilation by using an upstream patch --- pkgs/development/compilers/edk2/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 302d5611c19e..cd15f29e370c 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -41,6 +41,11 @@ edk2 = stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) + # https://github.com/tianocore/edk2/pull/5658 + (fetchpatch { + url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch"; + hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU="; + }) ]; srcWithVendoring = fetchFromGitHub { @@ -82,12 +87,6 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; - # For cross-compilation we need to build antlr and dlg for the build arch - preBuild = '' - BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/antlr CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES - BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/dlg CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES - ''; - installPhase = '' mkdir -vp $out mv -v BaseTools $out From 7f301eab1b3989fefb49f6c1f4edd7eb7b274756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 May 2024 19:32:49 -0700 Subject: [PATCH 007/163] imagemagick: fix passthru.tests.pkg-config The version suffix starting with "-" is not present in the pkg-config file. --- pkgs/applications/graphics/ImageMagick/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c15af9d94fb2..608e7bc50612 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -135,7 +135,10 @@ stdenv.mkDerivation (finalAttrs: { inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + version = lib.head (lib.splitString "-" finalAttrs.version); + }; }; meta = with lib; { From 8dc644818790363b40f86700f3d0399f2aa7d966 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 May 2024 14:22:57 +0200 Subject: [PATCH 008/163] rasm: 0.117 -> 2.2.3, change upstream source --- pkgs/development/compilers/rasm/default.nix | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index c131e4b79980..024fd484f7d4 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -1,22 +1,18 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rasm"; - version = "0.117"; + version = "2.2.3"; - src = fetchurl { - url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; - sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z"; + src = fetchFromGitHub { + owner = "EdouardBERGE"; + repo = "rasm"; + rev = "v${version}"; + hash = "sha256-cG/RZqZRS5uuXlQo7hylCEfbXXLBa68NXsr1iQCjhNc="; }; - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - buildPhase = '' - # according to official documentation - ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm - ''; + # by default the EXEC variable contains `rasm.exe` + makeFlags = [ "EXEC=rasm" ]; installPhase = '' install -Dt $out/bin rasm From 4d6e011773176acead319a9869fc7420a5872349 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 13:03:49 -0300 Subject: [PATCH 009/163] ablog: move to by-name, fix build Signed-off-by: lucasew --- .../default.nix => by-name/ab/ablog/package.nix} | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/ablog/default.nix => by-name/ab/ablog/package.nix} (77%) diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/by-name/ab/ablog/package.nix similarity index 77% rename from pkgs/applications/misc/ablog/default.nix rename to pkgs/by-name/ab/ablog/package.nix index 67b21e5199de..791c8598868c 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -1,6 +1,7 @@ { lib , python3 -, fetchPypi +, fetchFromGitHub +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -8,9 +9,11 @@ python3.pkgs.buildPythonApplication rec { version = "0.11.8"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak="; + src = fetchFromGitHub { + owner = "sunpy"; + repo = "ablog"; + rev = "v${version}"; + hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw="; }; nativeBuildInputs = with python3.pkgs; [ @@ -31,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook + defusedxml ]; pytestFlagsArray = [ @@ -39,6 +43,8 @@ python3.pkgs.buildPythonApplication rec { "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "ABlog for blogging with Sphinx"; mainProgram = "ablog"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be39de7832ac..19b6da52820a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1501,8 +1501,6 @@ with pkgs; abduco = callPackage ../tools/misc/abduco { }; - ablog = callPackage ../applications/misc/ablog { }; - acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; From 1e1685f116d30b0dcddc4e022cd2ee87d320493f Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 13:04:30 -0300 Subject: [PATCH 010/163] ablog: 0.11.8 -> 0.11.10 Signed-off-by: lucasew --- pkgs/by-name/ab/ablog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix index 791c8598868c..3221b16dcfcf 100644 --- a/pkgs/by-name/ab/ablog/package.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ablog"; - version = "0.11.8"; + version = "0.11.10"; format = "pyproject"; src = fetchFromGitHub { owner = "sunpy"; repo = "ablog"; rev = "v${version}"; - hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw="; + hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs="; }; nativeBuildInputs = with python3.pkgs; [ From a1c8fe355c1f9809e72c320d0b629cdc3849d5d4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 May 2024 14:26:02 +0200 Subject: [PATCH 011/163] rasm: migrate to by-name --- .../compilers/rasm/default.nix => by-name/ra/rasm/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{development/compilers/rasm/default.nix => by-name/ra/rasm/package.nix} (91%) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/by-name/ra/rasm/package.nix similarity index 91% rename from pkgs/development/compilers/rasm/default.nix rename to pkgs/by-name/ra/rasm/package.nix index 024fd484f7d4..d770d13578f8 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.roudoudou.com/rasm/"; + homepage = "http://rasm.wikidot.com/english-index:home"; description = "Z80 assembler"; mainProgram = "rasm"; # use -n option to display all licenses diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05aca9f4018f..d18ebba36121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16538,8 +16538,6 @@ with pkgs; qbe = callPackage ../development/compilers/qbe { }; - rasm = callPackage ../development/compilers/rasm { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From 6a8e27add392ac05749d8c1ebd44ba8d3826a0a1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 6 Apr 2024 02:07:17 +0200 Subject: [PATCH 012/163] cano: 0-unstable-2024-31-3 -> 0.1.0-alpha --- pkgs/by-name/ca/cano/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cano/package.nix b/pkgs/by-name/ca/cano/package.nix index 31de871c491d..ba431a541f4e 100644 --- a/pkgs/by-name/ca/cano/package.nix +++ b/pkgs/by-name/ca/cano/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { name = "cano"; - version = "0-unstable-2024-31-3"; + version = "0.1.0-alpha"; src = fetchFromGitHub { owner = "CobbCoding1"; repo = "Cano"; - rev = "6b3488545b4180f20a7fa892fb0ee719e9298ddc"; - hash = "sha256-qFo0szZVGLUf7c7KdEIofcieWZqtM6kQE6D8afrZ+RU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-BKbBDN7xZwlNzw7UFgX+PD9UXbr9FtELo+PlbfSHyRY="; }; buildInputs = [ gnumake ncurses ]; From b9756872bd1a0a2431db76d2576d19b24f083ca6 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 17 May 2024 20:27:58 -0300 Subject: [PATCH 013/163] apgdiff: build from source Fixes #309487 Co-authored-by: Anderson Torres --- .../tools/database/apgdiff/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix index 2aa53fbabd29..8ce720efd681 100644 --- a/pkgs/development/tools/database/apgdiff/default.nix +++ b/pkgs/development/tools/database/apgdiff/default.nix @@ -1,22 +1,33 @@ { lib -, stdenvNoCC -, fetchurl -, makeWrapper +, maven +, fetchFromGitHub , jre +, makeWrapper }: -stdenvNoCC.mkDerivation (finalAttrs: { - version = "2.7.0"; +maven.buildMavenPackage rec { pname = "apgdiff"; + version = "2.7.0"; - src = fetchurl { - url = "https://github.com/fordfrog/apgdiff/raw/release_${finalAttrs.version}/releases/apgdiff-${finalAttrs.version}.jar"; - sha256 = "sha256-6OempDmedl6LOwP/s5y0hOIxGDWHd7qM7/opW3UwQ+I="; + src = fetchFromGitHub { + sparseCheckout = [ "src" ]; + owner = "fordfrog"; + repo = "apgdiff"; + rev = "refs/tags/release_${version}"; + hash = "sha256-2m+9QNwQV2tJwOabTXE2xjRB5gDrSwyL6zL2op+wmkM="; }; + # Fix wrong version string in --help + postPatch = '' + sed -i 's/VersionNumber=.*/VersionNumber=${version}/' \ + src/main/resources/cz/startnet/utils/pgdiff/Resources.properties + ''; + + mvnHash = "sha256-zJQirS8sVqHKZsBukEOf7ox5IeiAVOP6wEHWb4CAyxc="; + nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' - install -Dm644 $src $out/lib/apgdiff.jar + installPhase = '' + install -Dm644 target/apgdiff-${version}.jar $out/lib/apgdiff.jar mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/apgdiff \ @@ -30,7 +41,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://apgdiff.com"; license = licenses.mit; inherit (jre.meta) platforms; - sourceProvenance = [ sourceTypes.binaryBytecode ]; maintainers = [ maintainers.misterio77 ]; }; -}) +} From 6022f4ef5740a0e8fc9de4514592942a9ee42064 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Sat, 18 May 2024 14:48:46 -0300 Subject: [PATCH 014/163] hdos: init at 8 Fixes #307154 --- pkgs/by-name/hd/hdos/package.nix | 64 ++++++++++++++++++++++++++++++++ pkgs/by-name/hd/hdos/update.sh | 7 ++++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/by-name/hd/hdos/package.nix create mode 100755 pkgs/by-name/hd/hdos/update.sh diff --git a/pkgs/by-name/hd/hdos/package.nix b/pkgs/by-name/hd/hdos/package.nix new file mode 100644 index 000000000000..9737d12d273d --- /dev/null +++ b/pkgs/by-name/hd/hdos/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + # TODO: for jre 17+, we'll need a workaroud: + # https://gitlab.com/hdos/issues/-/issues/2004 + openjdk11, + makeDesktopItem, + copyDesktopItems, + libGL, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "hdos"; + version = "8"; + + src = fetchurl { + url = "https://cdn.hdos.dev/launcher/v${finalAttrs.version}/hdos-launcher.jar"; + hash = "sha256-00ddeR+ov6Tjrn+pscXoao4C0ek/iP9Hdlgq946pL8A="; + }; + + dontUnpack = true; + + desktop = makeDesktopItem { + name = "HDOS"; + type = "Application"; + exec = "hdos"; + icon = fetchurl { + url = "https://raw.githubusercontent.com/flathub/dev.hdos.HDOS/8e17cbecb06548fde2c023032e89ddf30befeabc/dev.hdos.HDOS.png"; + hash = "sha256-pqLNJ0g7GCPotgEPfw2ZZOqapaCRAsJxB09INp6Y6gM="; + }; + comment = "HDOS is a client for Old School RuneScape that emulates the era of 2008-2011 RuneScape HD"; + desktopName = "HDOS"; + genericName = "Oldschool Runescape"; + categories = [ "Game" ]; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + makeWrapper ${lib.getExe openjdk11} $out/bin/hdos \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --add-flags "-jar $src" + runHook postInstall + ''; + + desktopItems = [ finalAttrs.desktop ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "High Detail Old School Runescape Client"; + homepage = "https://hdos.dev"; + changelog = "https://hdos.dev/changelog"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.unfree; + platforms = openjdk11.meta.platforms; + maintainers = [ lib.maintainers.misterio77 ]; + }; +}) diff --git a/pkgs/by-name/hd/hdos/update.sh b/pkgs/by-name/hd/hdos/update.sh new file mode 100755 index 000000000000..e2effc6d0d9e --- /dev/null +++ b/pkgs/by-name/hd/hdos/update.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts findutils + +set -euo pipefail + +version="$(curl -s https://cdn.hdos.dev/client/getdown.txt | grep 'launcher.version = ' | cut -d '=' -f2 | xargs)" +update-source-version hdos "$version" From f1b079c3e0d3ab3623def8111a3fcb79a1be58d2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 8 May 2024 21:17:01 +0200 Subject: [PATCH 015/163] libclipboard: init at 1.1 --- pkgs/by-name/li/libclipboard/package.nix | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/li/libclipboard/package.nix diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix new file mode 100644 index 000000000000..5420501270b3 --- /dev/null +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libxcb, + libXau, + libXdmcp, + darwin, + lib +}: + +stdenv.mkDerivation (finalAttrs: { + name = "libclipboard"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "jtanx"; + repo = "libclipboard"; + rev = "v${finalAttrs.version}"; + hash = "sha256-553hNG8QUlt/Aff9EKYr6w279ELr+2MX7nh1SKIklhA="; + }; + + buildInputs = [ libxcb libXau libXdmcp ] + ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + outputs = [ "out" "dev" ]; + + meta = { + description = "Lightweight cross-platform clipboard library"; + homepage = "https://jtanx.github.io/libclipboard"; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sigmanificient ]; + }; +}) From 9c9c3848d41dae2ae83f92dfdc5599917e509b99 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 6 May 2024 12:41:46 +0100 Subject: [PATCH 016/163] cli.nix: permit separators between args -> `-a=b`, `--xyz=abc`, etc --- lib/cli.nix | 11 ++++++++++- lib/tests/misc.nix | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/cli.nix b/lib/cli.nix index fcffacb5ea99..311037c519a6 100644 --- a/lib/cli.nix +++ b/lib/cli.nix @@ -90,7 +90,16 @@ rec { mkOption ? k: v: if v == null then [] - else [ (mkOptionName k) (lib.generators.mkValueStringDefault {} v) ] + else if optionValueSeparator == null then + [ (mkOptionName k) (lib.generators.mkValueStringDefault {} v) ] + else + [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault {} v}" ], + + # how to separate an option from its flag; + # by default, there is no separator, so option `-c` and value `5` + # would become ["-c" "5"]. + # This is useful if the command requires equals, for example, `-c=5`. + optionValueSeparator ? null }: options: let diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 6774939023d2..408ea5416293 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -1639,6 +1639,27 @@ runTests { ]; }; + testToGNUCommandLineSeparator = { + expr = cli.toGNUCommandLine { optionValueSeparator = "="; } { + data = builtins.toJSON { id = 0; }; + X = "PUT"; + retry = 3; + retry-delay = null; + url = [ "https://example.com/foo" "https://example.com/bar" ]; + silent = false; + verbose = true; + }; + + expected = [ + "-X=PUT" + "--data={\"id\":0}" + "--retry=3" + "--url=https://example.com/foo" + "--url=https://example.com/bar" + "--verbose" + ]; + }; + testToGNUCommandLineShell = { expr = cli.toGNUCommandLineShell {} { data = builtins.toJSON { id = 0; }; From 5458b62cf785f02ef25f5312da8f2ce172bafcf3 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 6 May 2024 12:42:02 +0100 Subject: [PATCH 017/163] ebusd: fix argument passing, separate using an equals (`=`) --- nixos/modules/services/home-automation/ebusd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix index ac9ec06639c1..f5c5479e8eaf 100644 --- a/nixos/modules/services/home-automation/ebusd.nix +++ b/nixos/modules/services/home-automation/ebusd.nix @@ -138,7 +138,7 @@ in after = [ "network.target" ]; serviceConfig = { ExecStart = let - args = cli.toGNUCommandLineShell { } (foldr (a: b: a // b) { } [ + args = cli.toGNUCommandLineShell { optionValueSeparator = "="; } (foldr (a: b: a // b) { } [ { inherit (cfg) device port configpath scanconfig readonly; foreground = true; From aa7ba46ebb42558cb541d1b2f1b57f1583a76ad6 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 22 May 2024 20:04:47 +0200 Subject: [PATCH 018/163] ark-pixel-font: unbreak by suppressing debug logs, and remove extraneous builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason build.py builds a lot of stuff that is completely unrelated to the fonts themselves. Let's remove that! Also the script is generating so much debug output that Hydra refuses to evaluate the package — my fix is to pipe the output through grep to filter out any log message below INFO, but I wish the script has a built-in way to set the log level so that I don't have to do this hack --- .../ar/ark-pixel-font/limit-builds.patch | 34 +++++++++++++++++++ pkgs/by-name/ar/ark-pixel-font/package.nix | 10 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ar/ark-pixel-font/limit-builds.patch diff --git a/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch b/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch new file mode 100644 index 000000000000..c63798e071c9 --- /dev/null +++ b/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch @@ -0,0 +1,34 @@ +diff --git a/build.py b/build.py +index 48bc757d..88b9ed9b 100644 +--- a/build.py ++++ b/build.py +@@ -1,6 +1,5 @@ + from scripts import configs + from scripts.configs import path_define +-from scripts.services import publish_service, info_service, template_service, image_service + from scripts.services.font_service import DesignContext, FontContext + from scripts.utils import fs_util + +@@ -21,21 +20,6 @@ def main(): + font_context.make_pcf() + font_context.make_otc() + font_context.make_ttc() +- publish_service.make_release_zips(font_config, width_mode) +- info_service.make_info_file(design_context, width_mode) +- info_service.make_alphabet_txt_file(design_context, width_mode) +- template_service.make_alphabet_html_file(design_context, width_mode) +- template_service.make_demo_html_file(design_context) +- image_service.make_preview_image_file(font_config) +- template_service.make_index_html_file() +- template_service.make_playground_html_file() +- image_service.make_readme_banner() +- image_service.make_github_banner() +- image_service.make_itch_io_banner() +- image_service.make_itch_io_background() +- image_service.make_itch_io_cover() +- image_service.make_afdian_cover() +- + + if __name__ == '__main__': + main() + diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 578552a03f13..e93cccf68420 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -28,10 +28,15 @@ python312Packages.buildPythonPackage rec { gitpython ]; + # By default build.py builds a LOT of extraneous artifacts we don't need. + patches = [ ./limit-builds.patch ]; + buildPhase = '' runHook preBuild - python build.py + # Too much debug output would break Hydra, so this jankness has to be here for it to build at all. + # I wish there's a builtin way to set the log level without modifying the script itself... + python3 build.py 2>&1 >/dev/null | grep -E '^(INFO|WARN|ERROR)' runHook postBuild ''; @@ -43,6 +48,9 @@ python312Packages.buildPythonPackage rec { install -Dm444 build/outputs/*.otf -t $out/share/fonts/opentype install -Dm444 build/outputs/*.ttf -t $out/share/fonts/truetype install -Dm444 build/outputs/*.woff2 -t $out/share/fonts/woff2 + install -Dm444 build/outputs/*.pcf -t $out/share/fonts/pcf + install -Dm444 build/outputs/*.otc -t $out/share/fonts/otc + install -Dm444 build/outputs/*.ttc -t $out/share/fonts/ttc runHook postInstall ''; From 16cfb8dcbf698f8767a82507c38fe24446130abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 19:11:30 +0000 Subject: [PATCH 019/163] gitoxide: 0.35.0 -> 0.36.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 40c744e1aed4..1688160c3459 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -18,16 +18,16 @@ let gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-Sl7nNYoiCdTZ50tIfJcq5x9KOBkgJsb5bq09chWbyQc="; + hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A="; }; - cargoHash = "sha256-G1NWRkhcmFrcHaIxQ7nzvRejPZUuZQDiNonZykkt4qM="; + cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From 0d9a87863800289aa0f8d834077df71ab6141202 Mon Sep 17 00:00:00 2001 From: Malte Neuss Date: Mon, 20 May 2024 13:25:43 +0200 Subject: [PATCH 020/163] maintainers: add malteneuss --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1409fb743964..8fb13c961e1d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12415,6 +12415,11 @@ githubId = 18661391; name = "Malte Janz"; }; + malteneuss = { + github = "malteneuss"; + githubId = 5301202; + name = "Malte Neuss"; + }; malte-v = { email = "nixpkgs@mal.tc"; github = "malte-v"; From 1df1f8d3be8c916aa50cc5dd0c2d828a3472a70b Mon Sep 17 00:00:00 2001 From: Malte Neuss Date: Mon, 20 May 2024 13:46:30 +0200 Subject: [PATCH 021/163] nextjs-ollama-llm-ui: init at 1.0.1 --- .../0001-update-nextjs.patch | 879 ++++++++++++++++++ .../0002-use-local-google-fonts.patch | 20 + .../0003-add-standalone-output.patch | 16 + .../ne/nextjs-ollama-llm-ui/package.nix | 94 ++ 4 files changed, 1009 insertions(+) create mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch create mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch create mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch create mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch new file mode 100644 index 000000000000..d904f04f7344 --- /dev/null +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch @@ -0,0 +1,879 @@ +diff --git a/package-lock.json b/package-lock.json +index 11dfbf6..b9470d0 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -30,7 +30,7 @@ + "framer-motion": "^11.0.3", + "langchain": "^0.1.13", + "lucide-react": "^0.322.0", +- "next": "14.1.0", ++ "next": "^14.2.3", + "next-themes": "^0.2.1", + "react": "^18", + "react-code-blocks": "^0.1.6", +@@ -40,6 +40,7 @@ + "react-resizable-panels": "^2.0.3", + "react-textarea-autosize": "^8.5.3", + "remark-gfm": "^4.0.0", ++ "sharp": "^0.33.4", + "sonner": "^1.4.0", + "tailwind-merge": "^2.2.1", + "tailwindcss-animate": "^1.0.7", +@@ -139,6 +140,15 @@ + "node": ">=6.9.0" + } + }, ++ "node_modules/@emnapi/runtime": { ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.1.1.tgz", ++ "integrity": "sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==", ++ "optional": true, ++ "dependencies": { ++ "tslib": "^2.4.0" ++ } ++ }, + "node_modules/@emoji-mart/data": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@emoji-mart/data/-/data-1.1.2.tgz", +@@ -304,6 +314,437 @@ + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "dev": true + }, ++ "node_modules/@img/sharp-darwin-arm64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz", ++ "integrity": "sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-darwin-arm64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-darwin-x64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz", ++ "integrity": "sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-darwin-x64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-darwin-arm64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz", ++ "integrity": "sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "macos": ">=11", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-darwin-x64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.2.tgz", ++ "integrity": "sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "macos": ">=10.13", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linux-arm": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.2.tgz", ++ "integrity": "sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==", ++ "cpu": [ ++ "arm" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.28", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linux-arm64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.2.tgz", ++ "integrity": "sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linux-s390x": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.2.tgz", ++ "integrity": "sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==", ++ "cpu": [ ++ "s390x" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.28", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linux-x64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz", ++ "integrity": "sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linuxmusl-arm64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.2.tgz", ++ "integrity": "sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "musl": ">=1.2.2", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-libvips-linuxmusl-x64": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.2.tgz", ++ "integrity": "sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "musl": ">=1.2.2", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-linux-arm": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz", ++ "integrity": "sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==", ++ "cpu": [ ++ "arm" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.28", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linux-arm": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-linux-arm64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz", ++ "integrity": "sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linux-arm64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-linux-s390x": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz", ++ "integrity": "sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==", ++ "cpu": [ ++ "s390x" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.31", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linux-s390x": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-linux-x64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz", ++ "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "glibc": ">=2.26", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linux-x64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-linuxmusl-arm64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz", ++ "integrity": "sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==", ++ "cpu": [ ++ "arm64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "musl": ">=1.2.2", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-linuxmusl-x64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz", ++ "integrity": "sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "musl": ">=1.2.2", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-libvips-linuxmusl-x64": "1.0.2" ++ } ++ }, ++ "node_modules/@img/sharp-wasm32": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz", ++ "integrity": "sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==", ++ "cpu": [ ++ "wasm32" ++ ], ++ "optional": true, ++ "dependencies": { ++ "@emnapi/runtime": "^1.1.1" ++ }, ++ "engines": { ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-win32-ia32": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz", ++ "integrity": "sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==", ++ "cpu": [ ++ "ia32" ++ ], ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, ++ "node_modules/@img/sharp-win32-x64": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz", ++ "integrity": "sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==", ++ "cpu": [ ++ "x64" ++ ], ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", ++ "npm": ">=9.6.5", ++ "pnpm": ">=7.1.0", ++ "yarn": ">=3.2.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ } ++ }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", +@@ -800,9 +1241,9 @@ + } + }, + "node_modules/@next/env": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/env/-/env-14.1.0.tgz", +- "integrity": "sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==" ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz", ++ "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==" + }, + "node_modules/@next/eslint-plugin-next": { + "version": "14.1.0", +@@ -814,9 +1255,9 @@ + } + }, + "node_modules/@next/swc-darwin-arm64": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz", +- "integrity": "sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz", ++ "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==", + "cpu": [ + "arm64" + ], +@@ -829,9 +1270,9 @@ + } + }, + "node_modules/@next/swc-darwin-x64": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz", +- "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz", ++ "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==", + "cpu": [ + "x64" + ], +@@ -844,9 +1285,9 @@ + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz", +- "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz", ++ "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==", + "cpu": [ + "arm64" + ], +@@ -859,9 +1300,9 @@ + } + }, + "node_modules/@next/swc-linux-arm64-musl": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz", +- "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz", ++ "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==", + "cpu": [ + "arm64" + ], +@@ -874,9 +1315,9 @@ + } + }, + "node_modules/@next/swc-linux-x64-gnu": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz", +- "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz", ++ "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==", + "cpu": [ + "x64" + ], +@@ -889,9 +1330,9 @@ + } + }, + "node_modules/@next/swc-linux-x64-musl": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz", +- "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz", ++ "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==", + "cpu": [ + "x64" + ], +@@ -904,9 +1345,9 @@ + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz", +- "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz", ++ "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==", + "cpu": [ + "arm64" + ], +@@ -919,9 +1360,9 @@ + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz", +- "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", ++ "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", + "cpu": [ + "ia32" + ], +@@ -934,9 +1375,9 @@ + } + }, + "node_modules/@next/swc-win32-x64-msvc": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz", +- "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz", ++ "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==", + "cpu": [ + "x64" + ], +@@ -1810,11 +2251,17 @@ + "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==", + "dev": true + }, ++ "node_modules/@swc/counter": { ++ "version": "0.1.3", ++ "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", ++ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==" ++ }, + "node_modules/@swc/helpers": { +- "version": "0.5.2", +- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", +- "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", ++ "version": "0.5.5", ++ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz", ++ "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==", + "dependencies": { ++ "@swc/counter": "^0.1.3", + "tslib": "^2.4.0" + } + }, +@@ -2930,6 +3377,18 @@ + "periscopic": "^3.1.0" + } + }, ++ "node_modules/color": { ++ "version": "4.2.3", ++ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", ++ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", ++ "dependencies": { ++ "color-convert": "^2.0.1", ++ "color-string": "^1.9.0" ++ }, ++ "engines": { ++ "node": ">=12.5.0" ++ } ++ }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", +@@ -2946,6 +3405,15 @@ + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, ++ "node_modules/color-string": { ++ "version": "1.9.1", ++ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", ++ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", ++ "dependencies": { ++ "color-name": "^1.0.0", ++ "simple-swizzle": "^0.2.2" ++ } ++ }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", +@@ -3152,6 +3620,14 @@ + "node": ">=6" + } + }, ++ "node_modules/detect-libc": { ++ "version": "2.0.3", ++ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", ++ "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", ++ "engines": { ++ "node": ">=8" ++ } ++ }, + "node_modules/detect-node-es": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", +@@ -4677,6 +5153,11 @@ + "url": "https://github.com/sponsors/ljharb" + } + }, ++ "node_modules/is-arrayish": { ++ "version": "0.3.2", ++ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", ++ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" ++ }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", +@@ -6676,12 +7157,12 @@ + "dev": true + }, + "node_modules/next": { +- "version": "14.1.0", +- "resolved": "https://registry.npmjs.org/next/-/next-14.1.0.tgz", +- "integrity": "sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==", ++ "version": "14.2.3", ++ "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz", ++ "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==", + "dependencies": { +- "@next/env": "14.1.0", +- "@swc/helpers": "0.5.2", ++ "@next/env": "14.2.3", ++ "@swc/helpers": "0.5.5", + "busboy": "1.6.0", + "caniuse-lite": "^1.0.30001579", + "graceful-fs": "^4.2.11", +@@ -6695,18 +7176,19 @@ + "node": ">=18.17.0" + }, + "optionalDependencies": { +- "@next/swc-darwin-arm64": "14.1.0", +- "@next/swc-darwin-x64": "14.1.0", +- "@next/swc-linux-arm64-gnu": "14.1.0", +- "@next/swc-linux-arm64-musl": "14.1.0", +- "@next/swc-linux-x64-gnu": "14.1.0", +- "@next/swc-linux-x64-musl": "14.1.0", +- "@next/swc-win32-arm64-msvc": "14.1.0", +- "@next/swc-win32-ia32-msvc": "14.1.0", +- "@next/swc-win32-x64-msvc": "14.1.0" ++ "@next/swc-darwin-arm64": "14.2.3", ++ "@next/swc-darwin-x64": "14.2.3", ++ "@next/swc-linux-arm64-gnu": "14.2.3", ++ "@next/swc-linux-arm64-musl": "14.2.3", ++ "@next/swc-linux-x64-gnu": "14.2.3", ++ "@next/swc-linux-x64-musl": "14.2.3", ++ "@next/swc-win32-arm64-msvc": "14.2.3", ++ "@next/swc-win32-ia32-msvc": "14.2.3", ++ "@next/swc-win32-x64-msvc": "14.2.3" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", ++ "@playwright/test": "^1.41.2", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "sass": "^1.3.0" +@@ -6715,6 +7197,9 @@ + "@opentelemetry/api": { + "optional": true + }, ++ "@playwright/test": { ++ "optional": true ++ }, + "sass": { + "optional": true + } +@@ -7928,13 +8413,9 @@ + } + }, + "node_modules/semver": { +- "version": "7.5.4", +- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", +- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", +- "dev": true, +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, ++ "version": "7.6.2", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", ++ "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, +@@ -7942,18 +8423,6 @@ + "node": ">=10" + } + }, +- "node_modules/semver/node_modules/lru-cache": { +- "version": "6.0.0", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", +- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", +- "dev": true, +- "dependencies": { +- "yallist": "^4.0.0" +- }, +- "engines": { +- "node": ">=10" +- } +- }, + "node_modules/seroval": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz", +@@ -8010,6 +8479,45 @@ + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, ++ "node_modules/sharp": { ++ "version": "0.33.4", ++ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz", ++ "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==", ++ "hasInstallScript": true, ++ "dependencies": { ++ "color": "^4.2.3", ++ "detect-libc": "^2.0.3", ++ "semver": "^7.6.0" ++ }, ++ "engines": { ++ "libvips": ">=8.15.2", ++ "node": "^18.17.0 || ^20.3.0 || >=21.0.0" ++ }, ++ "funding": { ++ "url": "https://opencollective.com/libvips" ++ }, ++ "optionalDependencies": { ++ "@img/sharp-darwin-arm64": "0.33.4", ++ "@img/sharp-darwin-x64": "0.33.4", ++ "@img/sharp-libvips-darwin-arm64": "1.0.2", ++ "@img/sharp-libvips-darwin-x64": "1.0.2", ++ "@img/sharp-libvips-linux-arm": "1.0.2", ++ "@img/sharp-libvips-linux-arm64": "1.0.2", ++ "@img/sharp-libvips-linux-s390x": "1.0.2", ++ "@img/sharp-libvips-linux-x64": "1.0.2", ++ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2", ++ "@img/sharp-libvips-linuxmusl-x64": "1.0.2", ++ "@img/sharp-linux-arm": "0.33.4", ++ "@img/sharp-linux-arm64": "0.33.4", ++ "@img/sharp-linux-s390x": "0.33.4", ++ "@img/sharp-linux-x64": "0.33.4", ++ "@img/sharp-linuxmusl-arm64": "0.33.4", ++ "@img/sharp-linuxmusl-x64": "0.33.4", ++ "@img/sharp-wasm32": "0.33.4", ++ "@img/sharp-win32-ia32": "0.33.4", ++ "@img/sharp-win32-x64": "0.33.4" ++ } ++ }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", +@@ -8054,6 +8562,14 @@ + "url": "https://github.com/sponsors/isaacs" + } + }, ++ "node_modules/simple-swizzle": { ++ "version": "0.2.2", ++ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", ++ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", ++ "dependencies": { ++ "is-arrayish": "^0.3.1" ++ } ++ }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", +@@ -9369,12 +9885,6 @@ + "node": ">=0.4" + } + }, +- "node_modules/yallist": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", +- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "dev": true +- }, + "node_modules/yaml": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", +diff --git a/package.json b/package.json +index 4185096..4ab1c58 100644 +--- a/package.json ++++ b/package.json +@@ -31,7 +31,7 @@ + "framer-motion": "^11.0.3", + "langchain": "^0.1.13", + "lucide-react": "^0.322.0", +- "next": "14.1.0", ++ "next": "^14.2.3", + "next-themes": "^0.2.1", + "react": "^18", + "react-code-blocks": "^0.1.6", +@@ -41,6 +41,7 @@ + "react-resizable-panels": "^2.0.3", + "react-textarea-autosize": "^8.5.3", + "remark-gfm": "^4.0.0", ++ "sharp": "^0.33.4", + "sonner": "^1.4.0", + "tailwind-merge": "^2.2.1", + "tailwindcss-animate": "^1.0.7", +-- +2.42.0 + diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch new file mode 100644 index 000000000000..454e005284fe --- /dev/null +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch @@ -0,0 +1,20 @@ +diff --git a/src/app/layout.tsx b/src/app/layout.tsx +index 647ed68..b08088e 100644 +--- a/src/app/layout.tsx ++++ b/src/app/layout.tsx +@@ -1,10 +1,10 @@ + import type { Metadata } from "next"; +-import { Inter } from "next/font/google"; ++import localFont from "next/font/local"; + import "./globals.css"; + import { ThemeProvider } from "@/providers/theme-provider"; + import { Toaster } from "@/components/ui/sonner" + +-const inter = Inter({ subsets: ["latin"] }); ++const inter = localFont({ src: './Inter.ttf' }); + + export const metadata: Metadata = { + title: "Ollama UI", +-- +2.42.0 + diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch new file mode 100644 index 000000000000..50d161114896 --- /dev/null +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch @@ -0,0 +1,16 @@ +diff --git a/next.config.mjs b/next.config.mjs +index dc34f1a..f6f90c4 100644 +--- a/next.config.mjs ++++ b/next.config.mjs +@@ -1,6 +1,7 @@ + /** @type {import('next').NextConfig} */ + const nextConfig = { +- webpack: (config, { isServer }) => { ++ output: 'standalone', ++ webpack: (config, { isServer }) => { + // Fixes npm packages that depend on `fs` module + if (!isServer) { + config.resolve.fallback = { +-- +2.42.0 + diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix new file mode 100644 index 000000000000..381f65593421 --- /dev/null +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix @@ -0,0 +1,94 @@ +{ + buildNpmPackage, + fetchFromGitHub, + inter, + lib, + # This is a app can only be used in a browser and starts a web server only accessible at + # localhost/127.0.0.1 from the local computer at the given port. + defaultHostname ? "127.0.0.1", + defaultPort ? 3000, + # Where to find the Ollama service; this url gets baked into the Nix package + ollamaUrl ? "http://127.0.0.1:11434", + ... +}: + +let + version = "1.0.1"; +in +buildNpmPackage { + pname = "nextjs-ollama-llm-ui"; + inherit version; + + src = fetchFromGitHub { + owner = "jakobhoeg"; + repo = "nextjs-ollama-llm-ui"; + rev = "v${version}"; + hash = "sha256-pZJgiopm0VGwaZxsNcyRawevvzEcK1j5WhngX1Pn6YE="; + }; + npmDepsHash = "sha256-wtHOW0CyEOszgiZwDkF2/cSxbw6WFRLbhDnd2FlY70E="; + + patches = [ + # Update to a newer nextjs version that buildNpmPackage is able to build. + # Remove at nextjs update. + ./0001-update-nextjs.patch + # nextjs tries to download google fonts from the internet during buildPhase and fails in Nix sandbox. + # We patch the code to expect a local font from src/app/Inter.ttf that we load from Nixpkgs in preBuild phase. + ./0002-use-local-google-fonts.patch + # Modify next.config.js to produce a production "standalone" output at .next/standalone. + # This output is easy to package with Nix and run with "node .next/standalone/server.js" later. + ./0003-add-standalone-output.patch + ]; + + # Adjust buildNpmPackage phases with nextjs quirk workarounds. + # These are adapted from + # https://github.com/NixOS/nixpkgs/blob/485125d667747f971cfcd1a1cfb4b2213a700c79/pkgs/servers/homepage-dashboard/default.nix + #######################3 + preBuild = '' + # We have to pass and bake in the Ollama URL into the package + echo "NEXT_PUBLIC_OLLAMA_URL=${ollamaUrl}" > .env + + # Replace the googleapis.com Inter font with a local copy from nixpkgs + cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf + ''; + + postBuild = '' + # Add a shebang to the server js file, then patch the shebang to use a nixpkgs nodejs binary. + sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js + patchShebangs .next/standalone/server.js + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{share,bin} + + cp -r .next/standalone $out/share/homepage/ + cp -r .env $out/share/homepage/ + cp -r public $out/share/homepage/public + + mkdir -p $out/share/homepage/.next + cp -r .next/static $out/share/homepage/.next/static + + chmod +x $out/share/homepage/server.js + + # we set a default port to support "nix run ..." + makeWrapper $out/share/homepage/server.js $out/bin/nextjs-ollama-llm-ui \ + --set-default PORT ${toString defaultPort} \ + --set-default HOSTNAME ${defaultHostname} + + runHook postInstall + ''; + + doDist = false; + ####################### + + meta = { + description = "Simple chat web interface for Ollama LLMs."; + changelog = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui/releases/tag/v${version}"; + mainProgram = "nextjs-ollama-llm-ui"; + homepage = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ malteneuss ]; + platforms = lib.platforms.all; + }; +} From da16e1c80ecf8345b29f8cfa4e9bdb0058184624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 21:55:19 +0000 Subject: [PATCH 022/163] astyle: 3.4.15 -> 3.4.16 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index a23e7936985c..ca714b393ee1 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.4.15"; + version = "3.4.16"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-BQTHM7v+lmiLZsEHtt8/oFJj3vq7I4WOQsRLpVRYbms="; + hash = "sha256-y3YENPfkYk1e6yd2rDNOeeARGb6kGfyYbt0sJNk4A2Q="; }; nativeBuildInputs = [ cmake ]; From c232871be174283d6f507fc48190b5ca399b1740 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 22:54:34 +0000 Subject: [PATCH 023/163] melange: 0.7.0 -> 0.8.0 --- pkgs/development/tools/melange/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 90383cba4c03..d013f88086e1 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-RkX6jS3Oh0pRn7kwNDRi8RQ2apLx3W82yQYI1JLJXjQ="; + hash = "sha256-l2KVy3E1JkVPmRPLNSagjlWpkW3wTF4NylWrSwUW/fQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-0IBpnwAkvrGkll/mE67BXb/TmwYJyX2oG/aBqsKcn4g="; + vendorHash = "sha256-+O7SXIf1nCiNsIfhq2xkDqjPBwMsv95gWEZmFwIZ7VE="; subPackages = [ "." ]; From c18af227ff69246a16fb6da912cde12b5bd22a25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 23:45:33 +0000 Subject: [PATCH 024/163] kdiff3: 1.11.0 -> 1.11.1 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index c22814372314..456b2c568d82 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-O/N5VMoZo2Xze1WLV0yPvTZnGcCH17gheI0++tDESFE="; + hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; From a1950a3a32d7cba1bc3736b8e459f4e9aba2fd39 Mon Sep 17 00:00:00 2001 From: Liam Murphy Date: Wed, 15 May 2024 18:46:41 +1000 Subject: [PATCH 025/163] ruffle: build on darwin --- .../applications/emulators/ruffle/default.nix | 86 ++++++++++--------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index e538def0d47c..ed19110f4ee8 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -6,6 +6,7 @@ pkg-config, python3, rustPlatform, + stdenv, lib, wayland, xorg, @@ -18,6 +19,7 @@ gsettings-desktop-schemas, glib, libxkbcommon, + darwin, }: let @@ -34,56 +36,62 @@ rustPlatform.buildRustPackage { hash = "sha256-WfoYQku1NFhvWyqeSVKtsMMEyUA97YFD7cvdn4XYIPI="; }; - nativeBuildInputs = [ - glib - gsettings-desktop-schemas - jre_minimal - makeWrapper - pkg-config - python3 - wrapGAppsHook3 - ]; + nativeBuildInputs = + [ jre_minimal ] + ++ lib.optionals stdenv.isLinux [ + glib + gsettings-desktop-schemas + makeWrapper + pkg-config + python3 + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = [ - alsa-lib - cairo - gtk3 - openssl - wayland - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libxcb - xorg.libXrender - vulkan-loader - udev - ]; + buildInputs = + lib.optionals stdenv.isLinux [ + alsa-lib + cairo + gtk3 + openssl + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libxcb + xorg.libXrender + vulkan-loader + udev + ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; dontWrapGApps = true; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/ruffle_desktop \ --add-needed libxkbcommon-x11.so \ --add-needed libwayland-client.so \ --add-rpath ${libxkbcommon}/lib:${wayland}/lib ''; - postFixup = '' - # This name is too generic - mv $out/bin/exporter $out/bin/ruffle_exporter + postFixup = + '' + # This name is too generic + mv $out/bin/exporter $out/bin/ruffle_exporter + '' + + lib.optionalString stdenv.isLinux '' + vulkanWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ) - vulkanWrapperArgs+=( - --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib - ) + wrapProgram $out/bin/ruffle_exporter \ + "''${vulkanWrapperArgs[@]}" - wrapProgram $out/bin/ruffle_exporter \ - "''${vulkanWrapperArgs[@]}" - - wrapProgram $out/bin/ruffle_desktop \ - "''${vulkanWrapperArgs[@]}" \ - "''${gappsWrapperArgs[@]}" - ''; + wrapProgram $out/bin/ruffle_desktop \ + "''${vulkanWrapperArgs[@]}" \ + "''${gappsWrapperArgs[@]}" + ''; cargoBuildFlags = [ "--workspace" ]; @@ -109,7 +117,7 @@ rustPlatform.buildRustPackage { govanify jchw ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "ruffle_desktop"; }; } From e0f7a8d00ee5b11cfcdbdcb635fe7256e6e8beda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:08:12 +0000 Subject: [PATCH 026/163] yamlscript: 0.1.58 -> 0.1.59 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index eb67d09dbb85..603f6c88371f 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.58"; + version = "0.1.59"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-rARUkbVq77uPrQZwfQ0NNM4XwYaVhSinLi0sCoVR63E="; + hash = "sha256-I5Z9QB8ZmTyeMs/WxUhJZM65VpUIx+t7QKzCRuRdRG4="; }; executable = "ys"; From cbcb982a1d3847afa69deed5aad0ade9efd85c49 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 23 May 2024 14:02:41 +0700 Subject: [PATCH 027/163] s9fes: fix build on darwin --- pkgs/development/interpreters/s9fes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix index 7cf60b00eb9b..4107b28e1cf9 100644 --- a/pkgs/development/interpreters/s9fes/default.nix +++ b/pkgs/development/interpreters/s9fes/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ ncurses ]; + preBuild = '' + makeFlagsArray+=(CFLAGS="-O2 -std=c89") + ''; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + enableParallelBuilding = true; # ...-bash-5.2-p15/bin/bash: line 1: ...-s9fes-20181205/bin/s9help: No such file or directory # make: *** [Makefile:157: install-util] Error 1 From e7a0547b1cf47897783d9c45d1ef96c45e92c9b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:23:05 +0200 Subject: [PATCH 028/163] python312Packages.casbin: refactor --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 81c0dd3c24b6..0670369db9c5 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { hash = "sha256-MeTOxDrk6pvJ1L9ZOKzWhXK8WXo0jWXGKEKR7y0ejbQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ simpleeval wcmatch ]; From dede7feaa7730c8b43d0f06fd295b865da9a1e6a Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 05:06:05 -0500 Subject: [PATCH 029/163] openjdk: 16+36 -> 16.0.2-ga Build number is set to 1, as this was the last release and thus had no build number. Additionally, this update is made despite the fact that the package is marked as insecure, to pull in the small number of accumulated fixes. --- pkgs/development/compilers/openjdk/16.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 4b0874a03a41..12ba5c9c16db 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -11,8 +11,8 @@ let version = { feature = "16"; - interim = "0"; - build = "36"; + interim = ".0.2-ga"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -20,13 +20,14 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44"; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 0611f7c61bc095c3d96777c9ae40c4eaee6c1d47 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:54:52 -0500 Subject: [PATCH 030/163] openjdk: 18+36 -> 18.0.2.1+1 This bump was made to match the last available version of OpenJDK 18, despite the package being marked as insecure due to End of Life. --- pkgs/development/compilers/openjdk/18.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 2c496721be07..5ce4ff8f5467 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -11,7 +11,8 @@ let version = { feature = "18"; - build = "36"; + interim = ".0.2.1"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -19,13 +20,13 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8="; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 25f344d272fd9e73d104cb5a365e85235c568d39 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:06:36 -0500 Subject: [PATCH 031/163] openjdk: 19.0.2+7 -> 19-ga --- pkgs/development/compilers/openjdk/19.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 51fd0d8eb533..187d724b57b5 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -14,8 +14,8 @@ let version = { feature = "19"; - interim = ".0.2"; - build = "7"; + interim = "-ga"; + build = ""; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -23,13 +23,15 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; + version = "${version.feature}${version.interim}"; + # version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; From 9572407ad8550527955fae3afdd21c785963667e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:07:03 -0500 Subject: [PATCH 032/163] openjdk: 20+36 -> 20.0.2+9 --- pkgs/development/compilers/openjdk/20.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix index 2be834a27b58..bdb7d057f263 100644 --- a/pkgs/development/compilers/openjdk/20.nix +++ b/pkgs/development/compilers/openjdk/20.nix @@ -14,8 +14,8 @@ let version = { feature = "20"; - interim = ""; - build = "36"; + interim = ".0.2"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -29,7 +29,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4="; + hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; From 895d63ca56becfe66385cd101891e72d5696fb8f Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 13:36:26 -0500 Subject: [PATCH 033/163] openjfx: 20+19 -> 20.0.2-ga --- pkgs/development/compilers/openjdk/openjfx/20.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e60..1c89800bcab0 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -7,8 +7,8 @@ let major = "20"; - update = ""; - build = "+19"; + update = ".0.2"; + build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { # note: gradle does not yet support running on 19 @@ -30,9 +30,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx20u"; rev = repover; - hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; + hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; From 82ee713858979434baab31f0d6cc2caf86096123 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Mon, 29 Apr 2024 15:22:29 -0400 Subject: [PATCH 034/163] openjfx: 22+30 -> 22.0.1-ga --- pkgs/development/compilers/openjdk/openjfx/22.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf0141..4b5e8ff77933 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -26,8 +26,8 @@ let major = "22"; - update = ""; - build = "+30"; + update = ".0.1"; + build = "-ga"; repover = "${major}${update}${build}"; icuVersionWithSep = s: "73${s}1"; @@ -45,9 +45,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx22u"; rev = repover; - hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; From 307db81bb7a66f450a4db0b375e59e0df7809ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 23 May 2024 09:41:03 +0200 Subject: [PATCH 035/163] bruno: 1.17.0 -> 1.18.0 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 3e9cf6b51fdc..76b895ebbc90 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -27,13 +27,13 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-z4KL6CX1jtuC4lxqYA6Mg1zPSc9/OpRb530jPIQK3Is="; + hash = "sha256-vYN245vMt/NjISaaFSXOkELONVld6knaKbi5FiN/0tA="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json From 1962ef0f77ca770dc1ddb198a58deeae08ef8753 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 02:38:58 -0500 Subject: [PATCH 036/163] openjdk: 8u362-ga -> 8u412-ga --- pkgs/development/compilers/openjdk/8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index aebfceeccb78..093050be5b80 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -20,7 +20,7 @@ let powerpc64le-linux = "ppc64le"; }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); - update = "362"; + update = "412"; build = "ga"; # when building a headless jdk, also bootstrap it with a headless jdk @@ -34,7 +34,7 @@ let owner = "openjdk"; repo = "jdk8u"; rev = "jdk${version}"; - sha256 = "sha256-C5dQwfIIpIrLeO3JWERyFCQHUSgG8gARuc3qXAeLkJ4="; + sha256 = "sha256-o+H5n5p6JG1giJj9OADgMbQPaoKMzLMFquKH536SHhM="; }; outputs = [ "out" "jre" ]; From f6376745deb50a25fbf39474cd4477f7516319ac Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 06:44:43 -0500 Subject: [PATCH 037/163] mysql-workbench: use latest jre --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdb2b6e0f0a9..0065eb6024a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39840,7 +39840,6 @@ with pkgs; }; mysql = mysql; pcre = pcre-cpp; - jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; From ef13f279d1f970b555c31efc84faf2b122973f16 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 23 May 2024 13:26:30 +0200 Subject: [PATCH 038/163] wordpressPackages.themes.proton: init at 1.0.1 --- .../wordpress/packages/thirdparty.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 24836f3ac42c..764408470064 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -10,16 +10,35 @@ }; meta.license = lib.licenses.agpl3Only; }; - themes.geist = stdenv.mkDerivation rec { - pname = "geist"; - version = "2.0.3"; - src = fetchzip { - inherit version; - name = pname; - url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; - hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + themes = { + geist = stdenv.mkDerivation rec { + pname = "geist"; + version = "2.0.3"; + src = fetchzip { + inherit version; + name = pname; + url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; + hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + }; + meta.license = lib.licenses.gpl2Only; + }; + proton = stdenv.mkDerivation rec { + pname = "proton"; + version = "1.0.1"; + src = fetchzip { + inherit version; + name = pname; + url = "https://github.com/christophery/proton/archive/refs/tags/${version}.zip"; + hash = "sha256-JgKyLJ3dRqh1uwlsNuffCOM7LPBigGkLVFqftjFAiP4="; + }; + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r ./* $out/ + runHook postInstall + ''; + meta.license = lib.licenses.mit; }; - meta.license = lib.licenses.gpl2Only; }; } From e8bc21290e0017fef0b189ee5ebd2a9dc7889812 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 23 May 2024 13:55:24 +0200 Subject: [PATCH 039/163] hyprlandPlugins.hy3: 0.39.1 -> 0.40.0 This fixes the compatibility issue with hyprland 0.40 and adds two patches that fixes regressions that were fixed after the latest tag. --- .../hyprwm/hyprland/plugins.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 76754dd5f0d8..9f677165c0c9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -3,6 +3,7 @@ , pkg-config , stdenv , hyprland +, fetchpatch }: let mkHyprlandPlugin = hyprland: @@ -24,15 +25,27 @@ let hy3 = { fetchFromGitHub, cmake, hyprland }: mkHyprlandPlugin hyprland { pluginName = "hy3"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.39.1"; - hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw="; + rev = "hl0.40.0"; + hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; }; + patches = [ + (fetchpatch { + url = "https://github.com/outfoxxed/hy3/commit/33c8d761ff1c1d2264f7549a7bcfc010929d153c.patch"; + hash = "sha256-GcLQ38IVGB6VFMviKqWAM9ayjC2lpWekx3kqrnwsLhk="; + }) + + (fetchpatch { + url = "https://github.com/outfoxxed/hy3/commit/400930e0391a0e13ebbc6a3b9fe162e00aaad89a.patch"; + hash = "sha256-DVrZSkXE4uKrAceGpUZklqrVRzV1CpNRgjpq0uOz0jk="; + }) + ]; + nativeBuildInputs = [ cmake ]; dontStrip = true; From eff2e77eee92395e7486f1f10d10569eeb9ddd51 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 20 May 2024 23:50:54 +0200 Subject: [PATCH 040/163] nvimpager: 0.12.0 -> 0.13.0 --- .../doc/manual/release-notes/rl-2411.section.md | 4 +++- pkgs/tools/misc/nvimpager/default.nix | 17 +++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 530ca68e0c77..2277308d6ba2 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -12,7 +12,9 @@ ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} -- Create the first release note entry in this section! +- `nvimpager` was updated to version 0.13.0, which changes the order of user and + nvimpager settings: user commands in `-c` and `--cmd` now override the + respective default settings because they are executed later. ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index fb10d0ad89c9..80900bf30ae8 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RmpPWS9gnBnR+Atw6uzBmeDSgoTOFSdKzHoJ84O+gyA="; + sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA="; }; buildInputs = [ @@ -25,18 +25,15 @@ stdenv.mkDerivation rec { buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager - substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + substituteInPlace nvimpager --replace-fail ':-nvim' ':-${lib.getExe neovim}' ''; doCheck = true; nativeCheckInputs = [ lua51Packages.busted util-linux neovim ]; - # filter out one test that fails in the sandbox of nix - checkPhase = let - exclude-tags = if stdenv.isDarwin then "nix,mac" else "nix"; - in '' - runHook preCheck - make test BUSTED='busted --output TAP --exclude-tags=${exclude-tags}' - runHook postCheck + # filter out one test that fails in the sandbox of nix or with neovim v0.10 + # or on macOS + preCheck = '' + checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.isDarwin ",mac"}') ''; meta = with lib; { From f221b4f5f5ab5d8608df03ba5566c717a2bb4f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 29 Apr 2024 16:37:49 +0200 Subject: [PATCH 041/163] nixos/oauth2_proxy_nginx: fix proxy_set_header --- .../services/security/oauth2-proxy-nginx.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix index 07192e7287b0..44bf56233e95 100644 --- a/nixos/modules/services/security/oauth2-proxy-nginx.nix +++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -83,6 +83,15 @@ in } ++ (lib.mapAttrsToList (vhost: conf: { virtualHosts.${vhost} = { locations = { + "/".extraConfig = '' + # pass information via X-User and X-Email headers to backend, requires running with --set-xauthrequest flag + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + add_header Set-Cookie $auth_cookie; + ''; + "/oauth2/auth" = let maybeQueryArg = name: value: if value == null then null @@ -102,6 +111,7 @@ in proxy_pass_request_body off; ''; }; + "@redirectToAuth2ProxyLogin" = { return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri"; extraConfig = '' @@ -114,16 +124,10 @@ in auth_request /oauth2/auth; error_page 401 = @redirectToAuth2ProxyLogin; - # pass information via X-User and X-Email headers to backend, - # requires running with --set-xauthrequest flag + # set variables being used in locations."/".extraConfig auth_request_set $user $upstream_http_x_auth_request_user; auth_request_set $email $upstream_http_x_auth_request_email; - proxy_set_header X-User $user; - proxy_set_header X-Email $email; - - # if you enabled --cookie-refresh, this is needed for it to work with auth_request auth_request_set $auth_cookie $upstream_http_set_cookie; - add_header Set-Cookie $auth_cookie; ''; }; }) cfg.virtualHosts))); From f57d95541284634a64704d29ecac6f1593901acb Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Thu, 23 May 2024 11:38:09 +0300 Subject: [PATCH 042/163] pkgs/shells: remove licenses.gpl2 --- pkgs/shells/dash/default.nix | 2 +- pkgs/shells/fish/default.nix | 2 +- pkgs/shells/murex/default.nix | 2 +- pkgs/shells/zsh/grml-zsh-config/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 6bdbd1798e3d..00857a5cd958 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; platforms = platforms.unix; - license = with licenses; [ bsd3 gpl2 ]; + license = with licenses; [ bsd3 gpl2Plus ]; mainProgram = "dash"; }; }) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0013c205f31f..921e0fc6d7fe 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -299,7 +299,7 @@ let description = "Smart and user-friendly command line shell"; homepage = "https://fishshell.com/"; changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ adamcstephens cole-h winter ]; mainProgram = "fish"; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 4e44b6bd7ecf..b6a802b8c8c5 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Bash-like shell and scripting environment with advanced features designed for safety and productivity"; mainProgram = "murex"; homepage = "https://murex.rocks"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index cff5a814bd13..ed7e81fd88d6 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "grml's zsh setup"; homepage = "https://grml.org/zsh/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl2Only ]; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; }; From a5979ef2255447bfd60d043bfc38c70944a31ae1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 May 2024 11:07:39 +0800 Subject: [PATCH 043/163] pantheon.elementary-icon-theme: 7.3.1 -> 8.0.0 https://github.com/elementary/icons/compare/7.3.1...8.0.0 --- .../artwork/elementary-icon-theme/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index ff93bb62379d..8f875620141f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , meson -, python3 , ninja , hicolor-icon-theme , gtk3 @@ -13,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.3.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-3qvbpY1O8E3sX+66yBoZXEOeWQrgyNu2rOT6PPbli58="; + sha256 = "sha256-EPmQgE33+HBI78SlCBV3WlyLCP6AggvqsQa7gZuOMRM="; }; nativeBuildInputs = [ @@ -27,7 +26,6 @@ stdenvNoCC.mkDerivation rec { librsvg meson ninja - python3 xcursorgen ]; @@ -42,11 +40,6 @@ stdenvNoCC.mkDerivation rec { "-Dpalettes=false" # Don't install gimp and inkscape palette files ]; - postPatch = '' - chmod +x meson/symlink.py - patchShebangs meson/symlink.py - ''; - postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; passthru = { From 7a15b0207775ada3fd588d3f215dd97647b4b57d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 00:14:33 +0900 Subject: [PATCH 044/163] pdm: 2.15.2 -> 2.15.3 Changelog: https://github.com/pdm-project/pdm/releases/tag/2.15.3 --- pkgs/tools/package-management/pdm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index f7e39900a98d..3eaddce9e708 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -11,14 +11,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.15.2"; + version = "2.15.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wI6HB4wpwA562WgdxqI0GdxWF9y+bMIFAk70tOfihHU="; + hash = "sha256-wifYH2vxCWJqVkOnu1McX1t3eoUMTqyNCLRywRRr7uU="; }; nativeBuildInputs = [ @@ -50,7 +50,6 @@ buildPythonApplication rec { unearth virtualenv ] ++ httpx.optional-dependencies.socks - ++ pbs-installer.optional-dependencies.install ++ lib.optionals (pythonOlder "3.11") [ tomli ] @@ -81,11 +80,12 @@ buildPythonApplication rec { ''; nativeCheckInputs = [ + first pytestCheckHook pytest-mock pytest-xdist pytest-httpserver - ] ++ lib.optional stdenv.isLinux first; + ]; pytestFlagsArray = [ "-m 'not network'" From cb8e62b899d94611841e30a709af741b03db8d6b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 23:44:31 +0800 Subject: [PATCH 045/163] python3Packages.scikits-samplerate: remove --- .../scikits-samplerate/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 -- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/scikits-samplerate/default.nix diff --git a/pkgs/development/python-modules/scikits-samplerate/default.nix b/pkgs/development/python-modules/scikits-samplerate/default.nix deleted file mode 100644 index b2cd98d477de..000000000000 --- a/pkgs/development/python-modules/scikits-samplerate/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - numpy, - libsamplerate, - fetchFromGitHub, -}: - -buildPythonPackage { - pname = "scikits-samplerate"; - version = "0.3.3"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "cournape"; - repo = "samplerate"; - rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - hash = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; - }; - - buildInputs = [ libsamplerate ]; - - propagatedBuildInputs = [ numpy ]; - - preConfigure = '' - cat > site.cfg << END - [samplerate] - library_dirs=${libsamplerate.out}/lib - include_dirs=${lib.getDev libsamplerate}/include - END - ''; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/cournape/samplerate"; - description = "High quality sampling rate convertion from audio data in numpy arrays"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 53a63162091c..206b08ad509b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -486,6 +486,7 @@ mapAliases ({ sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 + scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6725e7d1a152..6f9ae3db44f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13631,10 +13631,6 @@ self: super: with self; { scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - scikits-samplerate = callPackage ../development/python-modules/scikits-samplerate { - inherit (pkgs) libsamplerate; - }; - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; From d5a6ef09a867abca2f63f389a30d1858b913bec9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 23 May 2024 17:47:21 +0200 Subject: [PATCH 046/163] yaralyzer: 0.9.3 -> 0.9.4 https://github.com/michelcrypt4d4mus/yaralyzer/blob/v0.9.4/CHANGELOG.md https://github.com/michelcrypt4d4mus/yaralyzer/compare/v0.9.3...v0.9.4 --- pkgs/tools/security/yaralyzer/default.nix | 33 +++++++---------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix index ddfc828741e5..47b5576e7bec 100644 --- a/pkgs/tools/security/yaralyzer/default.nix +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -3,31 +3,16 @@ , fetchFromGitHub }: -let - python = python3.override { - packageOverrides = self: super: { - yara-python = super.yara-python.overridePythonAttrs (oldAttrs: rec { - version = "4.2.3"; - src = fetchFromGitHub { - owner = "VirusTotal"; - repo = "yara-python"; - rev = "v${version}"; - hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-KGQNonzAZp8c0a3Rjb1WfsEkx5srgRzZfGR3gfNEdzY="; + hash = "sha256-rDb09XJOGWNARR0hhQQ91KXWepsLyR2a6/o3jagh6nA="; }; pythonRelaxDeps = [ @@ -35,12 +20,12 @@ python.pkgs.buildPythonApplication rec { "rich" ]; - nativeBuildInputs = with python.pkgs; [ + build-system = with python3.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python3.pkgs; [ chardet python-dotenv rich @@ -52,12 +37,12 @@ python.pkgs.buildPythonApplication rec { "yaralyzer" ]; - meta = with lib; { + meta = { description = "Tool to visually inspect and force decode YARA and regex matches"; homepage = "https://github.com/michelcrypt4d4mus/yaralyzer"; - changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "yaralyze"; }; } From 70a5dd01fe53341daa4451fc74eb617d351d5718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 17:52:22 +0200 Subject: [PATCH 047/163] element-{desktop,web}: 1.11.66 -> 1.11.67 Changelog: https://github.com/element-hq/element-web/releases/tag/v1.11.67 --- .../networking/instant-messengers/element/pin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 6c30f9a19bf6..5f86a28e465c 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.66"; + "version" = "1.11.67"; "hashes" = { - "desktopSrcHash" = "sha256-QrFk6NIHvWgQuJz33CEU6rwmgtGZ9w3L9vqj/rdCkE8="; - "desktopYarnHash" = "1kin5z6cjgsljdhh5f4fq2782ld86pza6hz58rq1zwbd187nzbwz"; - "webSrcHash" = "sha256-xWaK2tHsuZmiwp7HExX83zKL8Z0ScRCEOnfxePWk2KI="; - "webYarnHash" = "1ykjpsg4d4kykd6w7c0yjyg8ljpc9czzwjx7ab27i84ys6pknx3q"; + "desktopSrcHash" = "sha256-oM4/PKydmIBp2zVbzJRbVYnklYO2IHH7ZBV4MfLxnQo="; + "desktopYarnHash" = "04dbsacigq5jrh7gpyxj31grwzsg58cy6d4y7k3hmcwd4gj68iid"; + "webSrcHash" = "sha256-faJiuAmEIEkNrwjgU06XT9J2NxJrJNIsPb1K5WXR0Lc="; + "webYarnHash" = "14sy3by840gbxqyvhwaj5k07hvhcsj300s39qjfsg1sx9fnfzck3"; }; } From 632cea095cb962a8633f1cb6d4111b220aa2504d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 16:12:22 +0000 Subject: [PATCH 048/163] git-machete: 3.25.2 -> 3.25.3 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index a6cf657d61d7..14bce57de619 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.25.2"; + version = "3.25.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-uTbDrSR2Aqeq73PI0dghCkOQS7QPFb/I9Yrl3wIH9ZQ="; + hash = "sha256-2XWQK0dXJeQJsB2FUsLoOA4SIoterb1WGXqYi1JHPQY="; }; nativeBuildInputs = [ installShellFiles ]; From a47f6dfa9f4eea4f7fe1b4b0f63369452c8b5e3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 16:29:26 +0000 Subject: [PATCH 049/163] flannel: 0.25.1 -> 0.25.2 --- pkgs/tools/networking/flannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index b4f632722b0b..a2654b90d3e1 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.25.1"; + version = "0.25.2"; rev = "v${version}"; - vendorHash = "sha256-hitYX6Y2ElDhjwgoX5feSNwpTUA6PXqpH70ZnIW9RaM="; + vendorHash = "sha256-Oo5vguQJOV0rh9gjFO9WdDWZFep3tdUg0ItMo8x4Lkk="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-Aa+LPn5fRrv7vzCqqbHzNaVn5nU6/mi09t6y/5nx0+s="; + sha256 = "sha256-OyYZMSQGsJaYvGwMC2JpJDosYSjIP7c4/CgwcmYEr5Q="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; From 14fdf50a3ca0c1ea0218d0ef081883f72c6c9f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:44:52 +0000 Subject: [PATCH 050/163] nuclei-templates: 9.8.6 -> 9.8.7 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 90eb9d35d25e..1d4910c212de 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.6"; + version = "9.8.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k="; + hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg="; }; installPhase = '' From 5799862064c90933efc06b2b4aa6e6f04ea450e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 19:46:36 +0200 Subject: [PATCH 051/163] python312Packages.fastparquet: 2024.2.0 -> 2024.5.0 Diff: https://github.com/dask/fastparquet/compare/refs/tags/2024.2.0...2024.5.0 Changelog: https://github.com/dask/fastparquet/blob/2024.5.0/docs/source/releasenotes.rst --- .../python-modules/fastparquet/default.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 40c841b38536..4add91da0926 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,62 +1,61 @@ { lib, buildPythonPackage, - fetchFromGitHub, - python, - cython, - oldest-supported-numpy, - setuptools, - setuptools-scm, - numpy, - pandas, cramjam, + cython, + fetchFromGitHub, fsspec, - thrift, - python-lzo, - pytestCheckHook, - pythonOlder, + git, + numpy, + oldest-supported-numpy, packaging, + pandas, + pytestCheckHook, + python-lzo, + python, + pythonOlder, + setuptools-scm, + setuptools, wheel, }: buildPythonPackage rec { pname = "fastparquet"; - version = "2024.2.0"; + version = "2024.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; repo = "fastparquet"; rev = "refs/tags/${version}"; - hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; + hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"pytest-runner"' "" - - sed -i \ - -e "/pytest-runner/d" \ - -e '/"git", "status"/d' setup.py + --replace-fail "numpy>=2.0.0rc1" "oldest-supported-numpy" ''; - nativeBuildInputs = [ - cython - oldest-supported-numpy + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython + git + oldest-supported-numpy + ]; + + dependencies = [ cramjam fsspec numpy - pandas - thrift packaging + pandas ]; passthru.optional-dependencies = { @@ -82,7 +81,8 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/dask/fastparquet/blob/${version}/docs/source/releasenotes.rst"; + license = licenses.asl20; maintainers = with maintainers; [ veprbl ]; }; } From 09a78289fc99e0dbdaa4b3e308628dd927e694ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 18:54:04 +0000 Subject: [PATCH 052/163] vault-medusa: 0.7.0 -> 0.7.1 --- pkgs/tools/security/vault-medusa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/tools/security/vault-medusa/default.nix index cd7cf537de58..a0984534f1c8 100644 --- a/pkgs/tools/security/vault-medusa/default.nix +++ b/pkgs/tools/security/vault-medusa/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vault-medusa"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jonasvinther"; repo = "medusa"; rev = "v${version}"; - sha256 = "sha256-8lbaXcu+o+grbFPJxZ6p/LezxDFCUvOQyX49zX4V/v0="; + sha256 = "sha256-4fYtWRWonZC9HSNGMqZZPH3xHi6wPk3vSF+htu34g6A="; }; - vendorHash = "sha256-/8wusZt0BQ//HCokjiSpsgsGb19FggrGrEuhCrwm9L0="; + vendorHash = "sha256-GdQiPeU5SWZlqWkyk8gU9yVTUQxJlurhY3l1xZXKeJY="; meta = with lib; { description = "A cli tool for importing and exporting Hashicorp Vault secrets"; From 576acc733127c223176070e5e70683d58abd22d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 21:17:37 +0200 Subject: [PATCH 053/163] python312Packages.intake-parquet: remove vendorized versioneer.py --- .../python-modules/intake-parquet/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index a1b241f92ce4..fe6fa3b2a656 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pandas, dask, fastparquet, + fetchFromGitHub, + pandas, pyarrow, - setuptools, pythonOlder, + setuptools, + versioneer, }: buildPythonPackage rec { @@ -28,11 +29,17 @@ buildPythonPackage rec { # Break circular dependency substituteInPlace requirements.txt \ --replace-fail "intake" "" + + # Remove vendorized versioneer.py + rm versioneer.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; - propagatedBuildInputs = [ + dependencies = [ pandas dask fastparquet From 8d29d8af024520c61b85d1ca598c71f52f3b1867 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 09:17:04 +0200 Subject: [PATCH 054/163] fcast-client: init at 0.1.0-unstable-2024-05-23 --- pkgs/by-name/fc/fcast-client/package.nix | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/fc/fcast-client/package.nix diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix new file mode 100644 index 000000000000..9f9277fed327 --- /dev/null +++ b/pkgs/by-name/fc/fcast-client/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, +}: + +rustPlatform.buildRustPackage rec { + pname = "fcast-client"; + version = "0.1.0-unstable-2024-05-23"; + + src = fetchFromGitLab { + domain = "gitlab.futo.org"; + owner = "videostreaming"; + repo = "fcast"; + rev = "cc07f95d2315406fcacf67cb3abb98efff5df5d9"; + hash = "sha256-vsD4xgrC5KbnZT6hPX3fi3M/CH39LtoRfa6nYD0iFew="; + }; + + sourceRoot = "${src.name}/clients/terminal"; + cargoHash = "sha256-VVG7AbwbbgCANMcFYNAIF76MQr7Fkmq5HXPxL3MnEhI="; + + meta = { + description = "FCast Client Terminal, a terminal open-source media streaming client"; + homepage = "https://fcast.org/"; + license = lib.licenses.gpl3; + longDescription = '' + FCast is a protocol designed for wireless streaming of audio and video + content between devices. Unlike alternative protocols like Chromecast and + AirPlay, FCast is an open source protocol that allows for custom receiver + implementations, enabling third-party developers to create their own + receiver devices or integrate the FCast protocol into their own apps. + ''; + mainProgram = "fcast-client"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + }; +} From 42d21c614766fe69cac21d1ba4f3e53bef18c040 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 21:36:58 +0200 Subject: [PATCH 055/163] lse: init at 4.14nw Linux enumeration tool with verbosity levels https://github.com/diego-treitos/linux-smart-enumeration --- pkgs/by-name/ls/lse/package.nix | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ls/lse/package.nix diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix new file mode 100644 index 000000000000..52d050e5ba7c --- /dev/null +++ b/pkgs/by-name/ls/lse/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + bash, + fetchFromGitHub, + makeWrapper, +}: + +stdenv.mkDerivation rec { + pname = "lse"; + version = "4.14nw"; + + src = fetchFromGitHub { + owner = "diego-treitos"; + repo = "linux-smart-enumeration"; + rev = "refs/tags/${version}"; + hash = "sha256-qGLmrbyeyhHG6ONs7TJLTm68xpvxB1iAnMUApfTSqEk="; + }; + + buildInputs = [ bash ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp lse.sh $out/bin/lse.sh + wrapProgram $out/bin/lse.sh \ + --prefix PATH : ${lib.makeBinPath [ bash ]} + ''; + + meta = with lib; { + description = "Linux enumeration tool with verbosity levels"; + homepage = "https://github.com/diego-treitos/linux-smart-enumeration"; + changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "lse.sh"; + platforms = platforms.all; + }; +} From c9022ee2635f4b32ebe32747b304000924414fbe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 May 2024 21:49:04 +0200 Subject: [PATCH 056/163] ntirpc: 5.0 -> 5.8 --- pkgs/development/libraries/ntirpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 39acba13d73e..5ae6380849c8 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "5.0"; + version = "5.8"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-xqnfo07EHwendzibIz187vdaenHwxg078D6zJvoyewc="; + sha256 = "sha256-t9InlnlwVts9mlrH8sHaaTYSrjJKlkFlGs1YCmZzjdE="; }; postPatch = '' From 78eff3ce1abd31e775c683c5c7aa03314de3031a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 May 2024 21:49:36 +0200 Subject: [PATCH 057/163] nfs-ganesha: 5.7 -> 5.9 --- pkgs/servers/nfs-ganesha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 54f0cdbd4857..c5d3d97d629f 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.7"; + version = "5.9"; outputs = [ "out" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-4GYte9kPUR4kFHrUzHXtiMGbuRhZ+4iw1hmqi+geljc="; + sha256 = "sha256-YFQcqRZenJUdTnlYM7gPnIxU47dytSHk5ALdbpSf5Ms="; }; preConfigure = "cd src"; From c7dc08dbe10866af172bbf86c52e72c26f1f8787 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 23 May 2024 16:02:15 -0400 Subject: [PATCH 058/163] kubernetes-helm: 3.15.0 -> 3.15.1 Diff: https://github.com/helm/helm/compare/v3.15.0...v3.15.1 --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 18e91c340b34..f005f317debc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.15.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-0YBpxXM/+mU0y1lf/h3xFbF5nfbjk6D9qT10IMR9XUY="; + sha256 = "sha256-DTHohUkL4ophYeXSZ/acle6Ruum9IIHxnu7gvPOOaYY="; }; vendorHash = "sha256-VPahAeeRz3fk1475dlCofiLVAKXMhpvspENmQmlPyPM="; From fa685b27e77dc2ebcc7f1a610859957d45dea8ec Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 23 May 2024 22:06:44 +0200 Subject: [PATCH 059/163] normcap: 0.5.7 -> 0.5.8 Diff: https://github.com/dynobo/normcap/compare/refs/tags/v0.5.7...v0.5.8 --- pkgs/by-name/no/normcap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 98fb6f27e117..a7c349a7a356 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -25,7 +25,7 @@ in ps.buildPythonApplication rec { pname = "normcap"; - version = "0.5.7"; + version = "0.5.8"; format = "pyproject"; disabled = ps.pythonOlder "3.9"; @@ -34,7 +34,7 @@ ps.buildPythonApplication rec { owner = "dynobo"; repo = "normcap"; rev = "refs/tags/v${version}"; - hash = "sha256-JeecX7rxM3T2WqGFwANI5+HQFWCLLA8ESHy8mEKYUmc="; + hash = "sha256-iMlW8oEt4OSipJaQ2XzBZeBVqiZP/C1sM0f5LYjv7/A="; }; postPatch = '' From 3a23a3ac34e89ad5c28f2098c6288aa9ddc0e708 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 23 May 2024 22:06:52 +0200 Subject: [PATCH 060/163] flexget: 3.11.33 -> 3.11.34 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.33...v3.11.34 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.34 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index b2349dff44cf..8f65d33b429f 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.33"; + version = "3.11.34"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-kgTlz3cUztIUKKqmUpUpEwu5qyjE0fCarG/EKJ1PoPc="; + hash = "sha256-g5TmjR3N/21JgXoRy56PN5A+Jbow2DFaAu0ammLtPxw="; }; postPatch = '' From d89c0a9689b34a8e649e13b9a10b8ecf35028190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Myllym=C3=A4ki?= Date: Mon, 25 Mar 2024 19:13:47 +0200 Subject: [PATCH 061/163] gnomeExtensions.ddterm: fix gjs path The new version has #!@GJS_SHEBANG@ which ended up as #!/usr/bin/gjs -> #!/usr/bin//nix/store../bin/gjs. gnomeExtensions.ddterm: add libhandy as dependency libhandy was added as dependency on commit: https://github.com/ddterm/gnome-shell-extension-ddterm/commit/eade14f6f4994f501c5290c6e2318c1e7eaee2d3 --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 373715d357ed..22eff684afc4 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -9,6 +9,7 @@ , hddtemp , libgda , libgtop +, libhandy , liquidctl , lm_sensors , netcat-gnu @@ -47,9 +48,9 @@ super: lib.trivial.pipe super [ (patchExtension "ddterm@amezin.github.com" (old: { nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; - buildInputs = [ vte ]; + buildInputs = [ vte libhandy gjs ]; postFixup = '' - substituteInPlace "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" --replace "gjs" "${gjs}/bin/gjs" + patchShebangs "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" ''; })) From be3292f22d036cc798e4adfd7408a34ab013e4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 14:08:57 +0200 Subject: [PATCH 062/163] fastfetch: 2.13.1 -> 2.13.2 Diff: https://github.com/fastfetch-cli/fastfetch/compare/2.13.1...2.13.2 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 6fcc7c3773ad..e9394ab92267 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-AB7GxeKLD+xdnFEA/STD7CFazsybYGtX10Q/Q4MRTrU="; + hash = "sha256-Wt+HFl+HJKMzC8O0JslVLpHFrmVVSBpac79TsKVpz+k="; }; outputs = [ "out" "man" ]; From 457fb33869bb56a61e8627216ab969eaff9d362f Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 22 May 2024 17:37:42 +0800 Subject: [PATCH 063/163] plattenalbum: 1.11.0 -> 2.1.0; renamed from mpdevil --- pkgs/applications/audio/mpdevil/default.nix | 56 ------------------- pkgs/by-name/pl/plattenalbum/package.nix | 60 +++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 pkgs/applications/audio/mpdevil/default.nix create mode 100644 pkgs/by-name/pl/plattenalbum/package.nix diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix deleted file mode 100644 index 3ca2a0e66152..000000000000 --- a/pkgs/applications/audio/mpdevil/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, fetchFromGitHub -, pkg-config, meson ,ninja -, python3Packages -, gdk-pixbuf, glib, gobject-introspection, gtk3 -, libnotify -, wrapGAppsHook3 }: - -python3Packages.buildPythonApplication rec { - pname = "mpdevil"; - version = "1.11.0"; - - src = fetchFromGitHub { - owner = "SoongNoonien"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-ooNZSsVtIeueqgj9hR9OZp08qm8gGokiq8IU3U/ZV5w="; - }; - - format = "other"; - - nativeBuildInputs = [ - glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook3 - ]; - - buildInputs = [ - gdk-pixbuf glib libnotify - ]; - - propagatedBuildInputs = with python3Packages; [ - beautifulsoup4 distutils-extra mpd2 notify-py pygobject3 requests - ]; - - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - # Prevent double wrapping. - dontWrapGApps = true; - # Otherwise wrapGAppsHook3 do not pick up the dependencies correctly. - strictDeps = false; - # There aren't any checks. - doCheck = false; - - meta = with lib; { - description = "A simple music browser for MPD"; - homepage = "https://github.com/SoongNoonien/mpdevil"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ apfelkuchen6 ]; - mainProgram = "mpdevil"; - }; -} diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix new file mode 100644 index 000000000000..374b15fe0cab --- /dev/null +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -0,0 +1,60 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "plattenalbum"; + version = "2.1.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "SoongNoonien"; + repo = "plattenalbum"; + rev = "v${version}"; + hash = "sha256-vRBlShbNuPpL29huhzYSuUcMJmSLljO4nc6cSAp3NB4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ + pygobject3 + mpd2 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]}) + ''; + + meta = { + description = "A client for the Music Player Daemon (originally named mpdevil)"; + homepage = "https://github.com/SoongNoonien/plattenalbum"; + changelog = "https://github.com/SoongNoonien/plattenalbum/releases/tag/v${version}"; + license = with lib.licenses; [ + gpl3Only + cc0 + ]; + mainProgram = "plattenalbum"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 66114c9995fc..ffbaf10eb743 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -834,6 +834,7 @@ mapAliases ({ mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2907d324cc..806061bc0d61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3930,8 +3930,6 @@ with pkgs; mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { }; - mpdevil = callPackage ../applications/audio/mpdevil { }; - pacparser = callPackage ../tools/networking/pacparser { }; pairdrop = callPackage ../applications/misc/pairdrop { }; From 1db6a2ac05ea0cfe925e85de0b17af4ed2a69420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 20:18:50 +0000 Subject: [PATCH 064/163] protonmail-bridge: 3.11.0 -> 3.11.1 --- pkgs/applications/networking/protonmail-bridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index f811ce742bdf..2b27eef11c32 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-V2PevO9jhtKMrFVlviKPwcApP4ZTRbCLVoPx0gGNosU="; + hash = "sha256-PM162vj1Q336fM5z6KoBgtujz9UgESIxUW3Lw8AEYTw="; }; vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8="; From 8bdc233bb4f79f61e1defada6756c3ba703d4c65 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:22 +1200 Subject: [PATCH 065/163] soju: migrate to pkgs/by-name --- .../networking/soju/default.nix => by-name/so/soju/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/soju/default.nix => by-name/so/soju/package.nix} (100%) diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/by-name/so/soju/package.nix similarity index 100% rename from pkgs/applications/networking/soju/default.nix rename to pkgs/by-name/so/soju/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ec0b320ab5..26059dc282d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6194,8 +6194,6 @@ with pkgs; socklog = callPackage ../tools/system/socklog { }; - soju = callPackage ../applications/networking/soju { }; - spacevim = callPackage ../applications/editors/spacevim { }; srvc = callPackage ../applications/version-management/srvc { }; From ef5f78e7b8d75fbf6ad7c0d93e5253e04cd96064 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:54 +1200 Subject: [PATCH 066/163] soju: adopt --- pkgs/by-name/so/soju/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index f8d6e3044314..8d619ddbed3f 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -50,6 +50,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malte-v ]; + maintainers = with maintainers; [ azahi malte-v jtbx ]; }; } From 274e87e5fdfa1f9c7ec718a5594e2debb2a57c76 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:31:52 +1200 Subject: [PATCH 067/163] soju: 0.7.0 -> 0.8.0 --- pkgs/by-name/so/soju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 8d619ddbed3f..ddc7cd5c2d2d 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "soju"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-nzaYa4h+UZcP6jqFHxVjgQ/F3q9aOeOPgVKFWBy6Fag="; + hash = "sha256-K7Dgc1HQ6+GnjraQNcK9LOFxUIoKKWro1mWKDZFwLiE="; }; - vendorHash = "sha256-JLght6bOrtc/VP3tfQboASa68VL2GGBTdK02DOC5EQk="; + vendorHash = "sha256-4Yl87Gk/HykjIyNpRfgthLf6b+v7kxmONIhYBWVXi0I="; nativeBuildInputs = [ installShellFiles From 5e27d26753f74a6a3f2e48c07c80878017d5bb13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 21:34:29 +0000 Subject: [PATCH 068/163] mdbook-katex: 0.8.1 -> 0.9.0 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index f914dedaf6aa..9dbde52266ed 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-mVgI2lvT4w5+Tpq3Sx7j86LHFnuwI4bAAAqrUkiF1B4="; + hash = "sha256-OTMPf/ZlUtqKz8Lb0uFOhad33N6SaCIZ86I2ajZ19fU="; }; - cargoHash = "sha256-ps31HGsAqWJBTP7HNLjfTz610ihDlvfAvlRHqZR01No="; + cargoHash = "sha256-U8uDcNkEyz7zAqCTthY5SVGshsJRKRaoBLOpBpQ9sho="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 20e4705ed383c38d2703ef99f0f2bb3c3648e0eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 21:42:57 +0000 Subject: [PATCH 069/163] signalbackup-tools: 20240514 -> 20240521 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index f48cea71cb6a..c82907aa0075 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240514"; + version = "20240521"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-3coP4Bia/a2xbeHQBUq2rXPEPzWEX9hJX1kb1wh60FA="; + hash = "sha256-aNiOqY1qRdPQl02Pr+A9OQgh0zHJnk8XaxdapQ/TwmE="; }; postPatch = '' From 8a05b4f8d4bec7d1ae32c836c3cda8265689270b Mon Sep 17 00:00:00 2001 From: Malte Neuss Date: Mon, 20 May 2024 14:54:08 +0200 Subject: [PATCH 070/163] nixos/nextjs-ollama-llm-ui: init module NixOS already has good support for the Ollama backend service. Now we can benefit from having a convenient web frontend as well for it. --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + .../web-apps/nextjs-ollama-llm-ui.nix | 87 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/nextjs-ollama-llm-ui.nix | 22 +++++ .../ne/nextjs-ollama-llm-ui/package.nix | 7 ++ 6 files changed, 120 insertions(+) create mode 100644 nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix create mode 100644 nixos/tests/web-apps/nextjs-ollama-llm-ui.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 484cc4a3b672..a1447620e8bb 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -137,6 +137,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [ollama](https://ollama.ai), server for running large language models locally. +- [nextjs-ollama-llm-ui](https://github.com/jakobhoeg/nextjs-ollama-llm-ui), light-weight frontend server to chat with Ollama models through a web app. + - [ownCloud Infinite Scale Stack](https://owncloud.com/infinite-scale-4-0/), a modern and scalable rewrite of ownCloud. - [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 70482bffed56..97d7095ff12b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1399,6 +1399,7 @@ ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nextcloud-notify_push.nix + ./services/web-apps/nextjs-ollama-llm-ui.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix new file mode 100644 index 000000000000..d58210c8d961 --- /dev/null +++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix @@ -0,0 +1,87 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.nextjs-ollama-llm-ui; + # we have to override the URL to a Ollama service here, because it gets baked into the web app. + nextjs-ollama-llm-ui = cfg.package.override { ollamaUrl = "https://ollama.lambdablob.com"; }; +in +{ + options = { + services.nextjs-ollama-llm-ui = { + enable = lib.mkEnableOption '' + Simple Ollama web UI service; an easy to use web frontend for a Ollama backend service. + Run state-of-the-art AI large language models (LLM) similar to ChatGPT locally with privacy + on your personal computer. + This service is stateless and doesn't store any data on the server; all data is kept + locally in your web browser. + See https://github.com/jakobhoeg/nextjs-ollama-llm-ui. + + Required: You need the Ollama backend service running by having + "services.nextjs-ollama-llm-ui.ollamaUrl" point to the correct url. + You can host such a backend service with NixOS through "services.ollama". + ''; + package = lib.mkPackageOption pkgs "nextjs-ollama-llm-ui" { }; + + hostname = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + example = "ui.example.org"; + description = '' + The hostname under which the Ollama UI interface should be accessible. + By default it uses localhost/127.0.0.1 to be accessible only from the local machine. + Change to "0.0.0.0" to make it directly accessible from the local network. + + Note: You should keep it at 127.0.0.1 and only serve to the local + network or internet from a (home) server behind a reverse-proxy and secured encryption. + See https://wiki.nixos.org/wiki/Nginx for instructions on how to set up a reverse-proxy. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 3000; + example = 3000; + description = '' + The port under which the Ollama UI interface should be accessible. + ''; + }; + + ollamaUrl = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:11434"; + example = "https://ollama.example.org"; + description = '' + The address (including host and port) under which we can access the Ollama backend server. + !Note that if the the UI service is running under a domain "https://ui.example.org", + the Ollama backend service must allow "CORS" requests from this domain, e.g. by adding + "services.ollama.environment.OLLAMA_ORIGINS = [ ... "https://ui.example.org" ];"! + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services = { + + nextjs-ollama-llm-ui = { + wantedBy = [ "multi-user.target" ]; + description = "Nextjs Ollama LLM Ui."; + after = [ "network.target" ]; + environment = { + HOSTNAME = cfg.hostname; + PORT = toString cfg.port; + NEXT_PUBLIC_OLLAMA_URL = cfg.ollamaUrl; + }; + serviceConfig = { + ExecStart = "${lib.getExe nextjs-ollama-llm-ui}"; + DynamicUser = true; + }; + }; + }; + }; + meta.maintainers = with lib.maintainers; [ malteneuss ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8146a9b86026..9876290590fd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -616,6 +616,7 @@ in { # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; nextcloud = handleTest ./nextcloud {}; + nextjs-ollama-llm-ui = runTest ./web-apps/nextjs-ollama-llm-ui.nix; nexus = handleTest ./nexus.nix {}; # TODO: Test nfsv3 + Kerberos nfs3 = handleTest ./nfs { version = 3; }; diff --git a/nixos/tests/web-apps/nextjs-ollama-llm-ui.nix b/nixos/tests/web-apps/nextjs-ollama-llm-ui.nix new file mode 100644 index 000000000000..3bb9d1e62aef --- /dev/null +++ b/nixos/tests/web-apps/nextjs-ollama-llm-ui.nix @@ -0,0 +1,22 @@ +{ lib, ... }: + +{ + name = "nextjs-ollama-llm-ui"; + meta.maintainers = with lib.maintainers; [ malteneuss ]; + + nodes.machine = + { pkgs, ... }: + { + services.nextjs-ollama-llm-ui = { + enable = true; + port = 8080; + }; + }; + + testScript = '' + # Ensure the service is started and reachable + machine.wait_for_unit("nextjs-ollama-llm-ui.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://127.0.0.1:8080") + ''; +} diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix index 381f65593421..db6981a0c240 100644 --- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix @@ -2,6 +2,7 @@ buildNpmPackage, fetchFromGitHub, inter, + nixosTests, lib, # This is a app can only be used in a browser and starts a web server only accessible at # localhost/127.0.0.1 from the local computer at the given port. @@ -82,6 +83,12 @@ buildNpmPackage { doDist = false; ####################### + passthru = { + tests = { + inherit (nixosTests) nextjs-ollama-llm-ui; + }; + }; + meta = { description = "Simple chat web interface for Ollama LLMs."; changelog = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui/releases/tag/v${version}"; From c1c59762eaf961985cf798edf610cd241b8735c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 22:37:46 +0000 Subject: [PATCH 071/163] cnquery: 11.4.3 -> 11.5.0 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index ad09b62e713a..241692b6b2cc 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.4.3"; + version = "11.5.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-j2cBoeUpxZV8NlC0D3e6bF533LVN0eIRqE7PSIWBGEw="; + hash = "sha256-Fp+NYMAOIiw8g4awfSYMvbjThwfGt87q3Nv7O36IkAk="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-kovSP+ru32vxve8tmeTRS1fsWTpyBTWhLp5iexKo0Fk="; + vendorHash = "sha256-MtOqop0FIuNbhG+gL5fRcMZZn5QC6tXzWHxX+NI0CYg="; ldflags = [ "-w" From d249d477da5df4bdc280090b9963f532ca8bde8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 00:36:51 +0000 Subject: [PATCH 072/163] cfspeedtest: 1.2.3 -> 1.2.4 --- pkgs/tools/networking/cfspeedtest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index cb18d9ae1ed3..dd6f3b145710 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xg5jSA3J6QzqiItNV+poVxxXmKKPE7TsEYMGdKv4k+k="; + hash = "sha256-55g3dskYlAJNnoLwjTL0XvpDIk2l53EQ+CZ1MzhuxNI="; }; - cargoHash = "sha256-ZXETP60R2121xTFqsvIFziUtKhL+ODGCpG98Mlt/zlg="; + cargoHash = "sha256-lTYiL5kCm9NClN4YjIlHz6aQlEwrESE25lOdJGkLMDA="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; From cc8120d3ff134c155a0288aee9092fdbfbf4ba2a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:45:55 +0200 Subject: [PATCH 073/163] pkgs/by-name: remove unuseed fetchpatch arguments --- pkgs/by-name/bm/bmake/package.nix | 1 - pkgs/by-name/bp/bpftrace/package.nix | 2 +- pkgs/by-name/co/connman/package.nix | 1 - pkgs/by-name/de/dependabot-cli/package.nix | 1 - pkgs/by-name/dt/dtools/package.nix | 1 - pkgs/by-name/ic/icewm/package.nix | 1 - pkgs/by-name/im/imhex/package.nix | 1 - pkgs/by-name/ki/kikit/solidpython/default.nix | 4 ---- pkgs/by-name/li/libbfio/package.nix | 1 - pkgs/by-name/li/libcpuid/package.nix | 2 +- pkgs/by-name/li/libewf-legacy/package.nix | 1 - pkgs/by-name/li/libiconv-darwin/package.nix | 1 - pkgs/by-name/ml/mlx42/package.nix | 1 - pkgs/by-name/mo/mommy/package.nix | 1 - pkgs/by-name/op/opensnitch/package.nix | 2 -- pkgs/by-name/op/openturns/package.nix | 1 - pkgs/by-name/pe/perf_data_converter/package.nix | 2 -- pkgs/by-name/pe/perl-debug-adapter/package.nix | 1 - pkgs/by-name/rc/rcu/package.nix | 1 - pkgs/by-name/re/reactphysics3d/package.nix | 2 +- pkgs/by-name/re/recoverdm/package.nix | 1 - pkgs/by-name/re/redict/package.nix | 2 +- pkgs/by-name/sc/scion/package.nix | 1 - pkgs/by-name/si/silicon/package.nix | 1 - pkgs/by-name/sw/swaylock/package.nix | 2 +- pkgs/by-name/tp/tpnote/package.nix | 1 - pkgs/by-name/un/undbx/package.nix | 1 - pkgs/by-name/ze/zesarux/package.nix | 1 - 28 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index fe4e8b6ed6dd..f1440556f6f4 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , getopt , ksh , bc diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 6e516c5806ee..bc5aab6a9406 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , llvmPackages, elfutils, bcc , libbpf, libbfd, libopcodes , cereal, asciidoctor diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index a90fb1ffd727..c3bb59b6ab8a 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , dbus , file diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index b5b8eadad45b..13d53ad70442 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -1,7 +1,6 @@ { buildGoModule , dependabot-cli , fetchFromGitHub -, fetchpatch , installShellFiles , lib , testers diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index 9de7ed6b125b..feb4dc740b80 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , ldc , curl }: diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 2d606a0c3aac..c4f7e28c7df7 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , expat , flac diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index d10ffb8a56e9..da3a2b4e20fa 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -3,7 +3,6 @@ , cmake , llvm , fetchFromGitHub -, fetchpatch , mbedtls , gtk3 , pkg-config diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index c03637907a36..2244166bbfea 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -1,15 +1,11 @@ # SolidPython is an unmaintained library with old dependencies. { buildPythonPackage -, callPackage , fetchFromGitHub -, fetchFromGitLab -, fetchpatch , lib , pythonRelaxDepsHook , poetry-core , prettytable -, pypng , ply , setuptools , euclid3 diff --git a/pkgs/by-name/li/libbfio/package.nix b/pkgs/by-name/li/libbfio/package.nix index ccc4c640677c..1695b65272d2 100644 --- a/pkgs/by-name/li/libbfio/package.nix +++ b/pkgs/by-name/li/libbfio/package.nix @@ -1,6 +1,5 @@ { lib , fetchzip -, fetchpatch , stdenv , gettext , libtool diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index cf4afd8df7d5..6cbc2c689cab 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index 536a28eceebe..3d2aee4d2874 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , stdenv , zlib , openssl diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix index bb5291831b65..0cb34224a6c7 100644 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/pkgs/by-name/li/libiconv-darwin/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, atf, libiconvReal, meson, diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 3387dec3378d..31df5cf11e17 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , glfw , darwin diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 8d2187068514..280b8caae996 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -4,7 +4,6 @@ , makeWrapper , writeText , shellspec -, fetchpatch # usage: # pkgs.mommy.override { # mommySettings.sweetie = "catgirl"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index df8647bdeb05..52b8b9ef80b4 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,13 +1,11 @@ { buildGoModule , fetchFromGitHub -, fetchpatch , protobuf , go-protobuf , pkg-config , libnetfilter_queue , libnfnetlink , lib -, coreutils , iptables , makeWrapper , protoc-gen-go-grpc diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 152714133fa7..e6f3fb3a5ff7 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -7,7 +7,6 @@ darwin, dlib, fetchFromGitHub, - fetchpatch, hdf5, hmat-oss, ipopt, diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix index 22f6e5aa9a8d..c8d49ab84c92 100644 --- a/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/pkgs/by-name/pe/perf_data_converter/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildBazelPackage, fetchFromGitHub, - fetchpatch, bazel_6, jdk, elfutils, diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix index 4b1dd4e09ee6..eb9dd371a9b9 100644 --- a/pkgs/by-name/pe/perl-debug-adapter/package.nix +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, fetchpatch , makeWrapper , perl # Needed if you want to use it for a perl script with dependencies. diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 250dda8940e6..4ae6c6894d08 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , requireFile -, fetchpatch , runCommand , rcu , testers diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index 2245eeee4214..a4f8edc823c0 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix index b0de4b7d1cfe..647f50e97a8c 100644 --- a/pkgs/by-name/re/recoverdm/package.nix +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , installShellFiles }: diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index 39133faa9b1b..c64f6b7b63bd 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitea, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchFromGitea, fetchurl, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 9044dc44f2a5..2044b994673b 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch2 , nixosTests }: let diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 57a86a27213d..18edc3b84948 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , cmake , expat diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 0b438df13d28..0ba3b727c949 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index eec1f68f5f44..267b9766abdb 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , cmake , pkg-config diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix index 69db03479e99..269abccdbdf2 100644 --- a/pkgs/by-name/un/undbx/package.nix +++ b/pkgs/by-name/un/undbx/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook }: diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index 096f4bf2b0ec..b75e4ade88eb 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , SDL2 , aalib , alsa-lib From 203a48ad353b4a5ab287e57b5f4958fe9753787a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:43:14 +0200 Subject: [PATCH 074/163] pkgs/development: remove unused fetchpatch arguments --- pkgs/development/ada-modules/gprbuild/default.nix | 2 -- pkgs/development/compilers/ccl/default.nix | 2 +- pkgs/development/compilers/ghc/common-hadrian.nix | 1 - pkgs/development/compilers/ghdl/default.nix | 1 - pkgs/development/compilers/ispc/default.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml.nix | 1 - pkgs/development/compilers/openjdk/openjfx/20.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/21.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/22.nix | 1 - pkgs/development/compilers/solc/default.nix | 1 - pkgs/development/compilers/souffle/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/development/interpreters/lfe/2.1.nix | 2 +- pkgs/development/interpreters/lua-5/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 1 - pkgs/development/libraries/qt-6/default.nix | 1 - pkgs/development/ocaml-modules/bap/default.nix | 2 +- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 2 +- pkgs/development/ocaml-modules/bistro/default.nix | 2 -- pkgs/development/ocaml-modules/git/unix.nix | 4 ++-- pkgs/development/ocaml-modules/httpaf/default.nix | 2 +- pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 2 +- pkgs/development/ocaml-modules/pyml/default.nix | 1 - pkgs/development/ocaml-modules/uring/default.nix | 1 - pkgs/development/perl-modules/Bio-BigFile/default.nix | 2 -- pkgs/development/php-packages/apcu/default.nix | 2 -- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/development/tools/analysis/frama-c/default.nix | 2 +- pkgs/development/tools/analysis/radare2/default.nix | 1 - pkgs/development/tools/analysis/rr/default.nix | 2 +- pkgs/development/tools/build-managers/alire/default.nix | 1 - .../tools/build-managers/bazel/bazel_5/default.nix | 2 +- .../tools/build-managers/bazel/bazel_6/default.nix | 2 +- pkgs/development/tools/build-managers/bear/default.nix | 1 - pkgs/development/tools/build-managers/msbuild/default.nix | 2 +- pkgs/development/tools/capnproto-java/default.nix | 2 +- pkgs/development/tools/esbuild/netlify.nix | 1 - pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/jcli/default.nix | 2 +- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/misc/nix-bisect/default.nix | 1 - pkgs/development/tools/rust/cargo-readme/default.nix | 2 +- pkgs/development/web/nodejs/v18.nix | 2 +- 43 files changed, 26 insertions(+), 48 deletions(-) diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index 00eaa7209767..f1cf28f00af3 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchFromGitHub -, fetchpatch , gprbuild-boot , which , gnat diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 332e0b1bccf4..9fe1a8aa8e56 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5db97cc0d976..55cc96dfd3ed 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -19,7 +19,6 @@ , autoconf , automake , coreutils -, fetchpatch , fetchurl , fetchgit , perl diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 96f1db0e6492..3a28aa03c110 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , callPackage , gnat , zlib diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b7f2ad1228b7..ee162260929b 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 230c911ef68c..5279fc7481b6 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl , ncurses , libX11, xorgproto, buildEnv -, fetchpatch , useX11 ? stdenv.hostPlatform.isx86 }: diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e60..9485498c4f64 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index f49dbe3b0e98..071420100e97 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf0141..2b9db91c0274 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , fetchurl , runCommand , writeText diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0603706164ae..2147d59ffd93 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -3,7 +3,6 @@ , boost , cmake , coreutils -, fetchpatch , jq , ncurses , python3 diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 68ceb1a7d7f6..770d84573dbe 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , bash-completion, perl, ncurses, zlib, sqlite, libffi , mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a7041bfc6a29..1b880b61a05a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala, gobject-introspection }: diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix index f239aa94b78f..2270c0a219d6 100644 --- a/pkgs/development/interpreters/lfe/2.1.nix +++ b/pkgs/development/interpreters/lfe/2.1.nix @@ -1,4 +1,4 @@ -{ fetchpatch, mkDerivation }: +{ mkDerivation }: mkDerivation { version = "2.1.3"; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index bbd93c725f73..a7587dafe392 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,5 +1,5 @@ # similar to interpreters/python/default.nix -{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: +{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, makeBinaryWrapper }: let diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 80621fd9bbb5..79c9c0cdf18b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,7 +7,6 @@ , elfutils , expat , fetchCrate -, fetchpatch , fetchurl , file , flex diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index c4b851207954..c724bd21d11f 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -4,7 +4,6 @@ , generateSplicesForMkScope , makeScopeWithSplicing' , fetchurl -, fetchpatch , fetchpatch2 , makeSetupHook , makeWrapper diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 0d2b4247bd42..a56bce316ef6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis , bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, mmap, lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp , utop, libxml2, ncurses diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 114e638fa6c4..4d01125188dc 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, cmdliner, ppxlib }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }: buildDunePackage rec { pname = "bisect_ppx"; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index fd409b51091d..bb424a5ce9ae 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,6 +1,4 @@ { lib -, ocaml -, fetchpatch , fetchFromGitHub , buildDunePackage , base64 diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 28bfb40cf8cb..adad5dc0792e 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,11 +1,11 @@ -{ buildDunePackage, fetchpatch, git +{ buildDunePackage, git , rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt , mirage-clock, mirage-clock-unix, astring, awa, cmdliner , decompress, domain-name, ipaddr, mtime , tcpip, awa-mirage, mirage-flow, mirage-unix , alcotest, alcotest-lwt, base64, cstruct -, ke, mirage-crypto-rng, ocurl, git-binary +, ke, mirage-crypto-rng, git-binary , ptime, mimic, ca-certs-nss, tls, tls-mirage , cacert, happy-eyeballs-lwt, git-mirage }: diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 6dce28fb2020..336b74f8277b 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , angstrom, faraday, result, alcotest }: diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 39ae5a86c598..ae1efafb2251 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, piqi, stdlib-shims, num }: stdenv.mkDerivation rec { version = "0.7.8"; diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index ed7f2ef559ed..d5840c8af53d 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchFromGitHub -, fetchpatch , utop , python3 , stdcompat diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index 9da63a8cd895..c78e794b8034 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -3,7 +3,6 @@ , cstruct , dune-configurator , fetchurl -, fetchpatch , fmt , optint , mdx diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix index 516b6d014c5a..3c360c2396a8 100644 --- a/pkgs/development/perl-modules/Bio-BigFile/default.nix +++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix @@ -3,14 +3,12 @@ IOString, buildPerlModule, fetchFromGitHub, - fetchpatch, fetchurl, kent, lib, libmysqlclient, libpng, openssl, - perl }: buildPerlModule rec { diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index f8b8ff1d83b7..9cfe9b96cf34 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,6 @@ lib, pcre2, fetchFromGitHub, - php, - fetchpatch, }: let diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 02d014bef899..3a64f7d2fd9d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -28,7 +28,7 @@ , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , cargo, rustc, rustPlatform -, autoSignDarwinBinariesHook, fetchpatch +, autoSignDarwinBinariesHook }@args: let diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 26cd487d9ebe..2467b124170b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText +{ lib, stdenv, fetchurl, writeText , graphviz, doxygen , ocamlPackages, ltl2ba, coq, why3 , gdk-pixbuf, wrapGAppsHook3 diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 61ac7bbfe464..0efbd75773ff 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPackages , pkg-config , meson diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 587bb7758909..3a2ecc4c6d48 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, which, makeWrapper , libpfm, zlib, python3Packages, procps, gdb, capnproto }: diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index b7613fe6e045..6d2e8cce61a8 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gprbuild , gnat }: diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 5ef2a183fa0a..2e1459c16bea 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 186d585d626e..5521fcf0d53d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2b8d3106f3ce..2e0c1d54122b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , pkg-config diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 1f5261649b85..c9d6c19c450e 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: let diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix index fa59a5ad2abf..73c068543fb3 100644 --- a/pkgs/development/tools/capnproto-java/default.nix +++ b/pkgs/development/tools/capnproto-java/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, capnproto, pkg-config }: +{ lib, stdenv, fetchFromGitHub, capnproto, pkg-config }: stdenv.mkDerivation rec { pname = "capnproto-java"; diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix index 1ed35d64f027..0d754060c211 100644 --- a/pkgs/development/tools/esbuild/netlify.nix +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , netlify-cli }: diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e607967a1205..30f824c4e476 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, xz, dejagnu, sourceHighlight, libiconv diff --git a/pkgs/development/tools/misc/jcli/default.nix b/pkgs/development/tools/misc/jcli/default.nix index f5d9d7a85899..2b7f14284f16 100644 --- a/pkgs/development/tools/misc/jcli/default.nix +++ b/pkgs/development/tools/misc/jcli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "jcli"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 50c064cadfd0..259fb2b113c7 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, m4 +{ lib, stdenv, fetchurl, m4 , runtimeShell , file }: diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index 7c9f474ab531..9927be16d36a 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , python3 }: diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index 2b5fb7abc69b..aa4a6cf5ea37 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-readme"; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index c4a97a47a4b6..6b3ca7635e43 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: let # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. From ddde29668ddcd07871667000b944516bc2fd2900 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:02:24 +0000 Subject: [PATCH 075/163] ff2mpv-rust: 1.1.4 -> 1.1.5 --- pkgs/by-name/ff/ff2mpv-rust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix index a0d78cb2c3bc..2ffd89d1ef0b 100644 --- a/pkgs/by-name/ff/ff2mpv-rust/package.nix +++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "ff2mpv-rust"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "ryze312"; repo = "ff2mpv-rust"; rev = version; - hash = "sha256-lQ1VRz/1HYZ3Il/LNNL+Jr6zFvGyxw9rUuzCCA1DZYo="; + hash = "sha256-hAhHfNiHzrzACrijpVkzpXqrqGYKI3HIJZtUuTrRIcQ="; }; - cargoHash = "sha256-cbueToB7zDHV4k9K8RusHjnMR0ElXsPEfuqHYli25nc="; + cargoHash = "sha256-EKmysiq1NTv1aQ1DZGS8bziY4lRr+KssBgXa8MO76Ac="; postInstall = '' $out/bin/ff2mpv-rust manifest > manifest.json From c39ac518440fcd224a34cec2ef5479702b26d91e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:04:24 +0000 Subject: [PATCH 076/163] gfold: 4.4.1 -> 4.5.0 --- pkgs/applications/version-management/gfold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index b60c38fa1d30..fb8cccdda1bd 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -11,7 +11,7 @@ let pname = "gfold"; - version = "4.4.1"; + version = "4.5.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-KKuWPitm7oD2mXPSu2rbOyzwJ9JJ23LBQIIkkPHm1w4="; + sha256 = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY="; }; - cargoHash = "sha256-wDUOYK9e0i600UnJ0w0FPI2GhTa/QTq/2+ICiDWrmEU="; + cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv From 42ddc8213f151fb8728d343db8cb0c1e1637becb Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 24 May 2024 03:07:21 +0200 Subject: [PATCH 077/163] chromedriver: 125.0.6422.76 -> 125.0.6422.112 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e3bf7d7c0944..2c78950e3ff1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-DX0J3xeOK4Dy4BAjbrbu1rnIkmF8nlmy9tMaQhLsFcU="; + hash_darwin = "sha256-1gi+hWrVL+mBB8pHMXnX/8kzRCQqGuut/+wO/9yBABs="; hash_darwin_aarch64 = - "sha256-hRJeaeQS30srO5M1Gi43VYR/KrjNAhH0XozkEzvcbA0="; - hash_linux = "sha256-CcBQhIsK7mL7VNJCs6ynhrQeXPuB793DysyV1nj90mM="; - version = "125.0.6422.76"; + "sha256-skYFjXBvv+2u/K770Dd3uxFYFer6GGx/EgWfAgzE9pI="; + hash_linux = "sha256-67rXlDJeDSpcpEhNQq0rVS2bSWPy3GXVnTo6dwKAnZU="; + version = "125.0.6422.78"; }; deps = { gn = { From fc37fd1ae241815479b438efa0e2369d40ad0405 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 24 May 2024 03:07:51 +0200 Subject: [PATCH 078/163] chromium: 125.0.6422.76 -> 125.0.6422.112 https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_23.html This update includes 1 security fix. Google is aware that an exploit for CVE-2024-5274 exists in the wild. CVEs: CVE-2024-5274 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 2c78950e3ff1..fe0e6ec6c41c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,8 +15,8 @@ version = "2024-04-10"; }; }; - hash = "sha256-m7WeRloS6tGH2AwhkNicpqThUQmS+9w2xFS2dbmu1vw="; - version = "125.0.6422.76"; + hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU="; + version = "125.0.6422.112"; }; ungoogled-chromium = { deps = { From ca514fead12ea6ef2c90f1f9a0dfbdd23f14cea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:15:48 +0000 Subject: [PATCH 079/163] kubestroyer: 0.2 -> 0.3.0 --- pkgs/tools/security/kubestroyer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/tools/security/kubestroyer/default.nix index 8e0922e4dfb0..a3f03e605c42 100644 --- a/pkgs/tools/security/kubestroyer/default.nix +++ b/pkgs/tools/security/kubestroyer/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubestroyer"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Rolix44"; repo = "Kubestroyer"; rev = "refs/tags/v${version}"; - hash = "sha256-M/abb2IT0mXwj8lAitr18VtIgC4NvapPywBwcUWr9i8="; + hash = "sha256-A4kx0Xx3p9rP8OKRLPe9AfX+rqGggtvPb7Hsg+lLkSI="; }; - vendorHash = "sha256-x0lIi4QUuYn0kv0HV4h8k61kRu10LCyELudisqUdTAg="; + vendorHash = "sha256-V6qEvMsX7tdhooW116+0ayT6RYkdjDbz6QwWb8rC4ig="; ldflags = [ "-s" From 9c70938601a0852cfa1d1b726e7f756c3cf96011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:17:36 +0000 Subject: [PATCH 080/163] kubecolor: 0.3.2 -> 0.3.3 --- pkgs/applications/networking/cluster/kubecolor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 589b93cd2f72..ecd24e4afbe8 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-9fL1zuhQ1B8QpJXcGVxg8mqIQoM5ZhwuE000rDcrrw0="; + sha256 = "sha256-VGpyYc6YmRr58OSRQvWTo4f8ku8L1/gn0ilbQSotO2k="; }; vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; From 1b45be7f6aa636b34f1fb18fb16e2d81efa4aecc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:28:34 +0000 Subject: [PATCH 081/163] kubebuilder: 3.15.0 -> 3.15.1 --- pkgs/applications/networking/cluster/kubebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 7885df6af03f..f33da76e58a0 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.15.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-YaISsW+USP9M4Mblluo+SXSwGspiTiiPFA3VvLmhqaQ="; + hash = "sha256-Fc9EzzOULRfzQENHd/7aXWqLeoPjNsseqpZETNGvV6U="; }; vendorHash = "sha256-g9QjalRLc2NUsyd7Do1PWw9oD9ATuJGMRaqSaC6AcD0="; From f0050fd560b8f4fc5e7a7afa2d73f0b9048a311b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:28:49 +0000 Subject: [PATCH 082/163] kor: 0.4.0 -> 0.4.1 --- pkgs/by-name/ko/kor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index a04132f99130..a085106c23a7 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-OZSec1S583jVGqSET0y4WhKxWf9CyLKuhEwu39Zg9vE="; + hash = "sha256-4l19/vIvcgt7g3o6IWGHhIsXurAy6Ts4fJjs8OMZalk="; }; - vendorHash = "sha256-4XcmaW4H+IgZZx3PuG0aimqSG1eUnRtcbebKXuencnQ="; + vendorHash = "sha256-NPmsXS7P+pCF97N8x3nQhCRoHJLMO5plNtcUqxxexVE="; preCheck = '' HOME=$(mktemp -d) From 550060f75ad4e42aab4b91085b01df8c6263247e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:34:15 +0000 Subject: [PATCH 083/163] patch2pr: 0.24.0 -> 0.25.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 488d2f858377..0795adf94f5f 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-ot/PECNRuhJUYX1woektKC6VEV+rLKiSnCVCLIRhSUo="; + hash = "sha256-mS7Yz1RPeA/pms3gGQ1oEjtzH9miIOWlf6YrrIoJk94="; }; - vendorHash = "sha256-K2qYfS0A1gOo2n3pBy00oLbd1/q/p5N8RoId+OP1Jmw="; + vendorHash = "sha256-XJC4rJI+adqiyFfiuyTbrAoWDiTThz7vjDZQrchDEiA="; ldflags = [ "-X main.version=${version}" From d59e86f0af293c2c37ad383141110722c22429d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:04:58 +0000 Subject: [PATCH 084/163] lxd-ui: 0.8 -> 0.8.1 --- pkgs/by-name/lx/lxd-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index 2475a653c3cc..b200b1ea0d90 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-oD/GPm84oFXHcZ8vTUzNgQinrHwNuvpeVjsrp8ibIZY="; + hash = "sha256-XLHLWD7iH4A5+MaFYiMILnjPGN565gBRpimFoOJMRtI="; }; offlineCache = fetchYarnDeps { From 6080bfb6cb054c4fe6df6da3836c7930141be897 Mon Sep 17 00:00:00 2001 From: Rahul Butani Date: Tue, 7 May 2024 09:56:53 -0700 Subject: [PATCH 085/163] ncurses: fix linking with `lld` 17+ Another fix like #309884 for fallout from `lld` 17's `--no-undefined-version` default + hard error. For context: - https://github.com/llvm/llvm-project/commit/241dbd310599e3c1a0f1b0c9ced14c8b8760539e - https://reviews.llvm.org/D135402 - https://github.com/llvm/llvm-project/issues/61208 Error (without this fix): ```console ncurses> x86_64-unknown-linux-gnu-clang -Qunused-arguments -Wno-error=implicit-function-declaration -shared -Wl,--version-script,resulting.map -Wl,-soname,`basename ../lib/libncursesw.so.6.4 .6.4`.6,-stats,-lc -o ../lib/libncursesw.so.6.4 ../obj_s/hardscroll.o ../obj_s/hashmap.o ../obj_s/lib_addch.o ../obj_s/lib_addstr.o ../obj_s/lib_beep.o ../obj_s/lib_bkgd.o ../obj_s/lib_box.o ../obj_s/lib_chgat.o ../obj_s/lib_clear.o ../obj_s/lib_clearok.o ../obj_s/lib_clrbot.o ../obj_s/lib_clreol.o ../obj_s/lib_color.o ../obj_s/lib_colorset.o ../obj_s/lib_delch.o ../obj_s/lib_delwin.o ../obj_s/lib_echo.o ../obj_s/lib_endwin.o ../obj_s/lib_erase.o ../obj_s/lib_flash.o ../obj_s/lib_gen.o ../obj_s/lib_getch.o ../obj_s/lib_getstr.o ../obj_s/lib_hline.o ../obj_s/lib_immedok.o ../obj_s/lib_inchstr.o ../obj_s/lib_initscr.o ../obj_s/lib_insch.o ../obj_s/lib_insdel.o ../obj_s/lib_insnstr.o ../obj_s/lib_instr.o ../obj_s/lib_isendwin.o ../obj_s/lib_leaveok.o ../obj_s/lib_mouse.o ../obj_s/lib_move.o ../obj_s/lib_mvcur.o ../obj_s/lib_mvwin.o ../obj_s/lib_newterm.o ../obj_s/lib_newwin.o ../obj_s/lib_nl.o ../obj_s/lib_overlay.o ../obj_s/lib_pad.o ../obj_s/lib_printw.o ../obj_s/lib_redrawln.o ../obj_s/lib_refresh.o ../obj_s/lib_restart.o ../obj_s/lib_scanw.o ../obj_s/lib_screen.o ../obj_s/lib_scroll.o ../obj_s/lib_scrollok.o ../obj_s/lib_scrreg.o ../obj_s/lib_set_term.o ../obj_s/lib_slk.o ../obj_s/lib_slkatr_set.o ../obj_s/lib_slkatrof.o ../obj_s/lib_slkatron.o ../obj_s/lib_slkatrset.o ../obj_s/lib_slkattr.o ../obj_s/lib_slkclear.o ../obj_s/lib_slkcolor.o ../obj_s/lib_slkinit.o ../obj_s/lib_slklab.o ../obj_s/lib_slkrefr.o ../obj_s/lib_slkset.o ../obj_s/lib_slktouch.o ../obj_s/lib_touch.o ../obj_s/lib_tstp.o ../obj_s/lib_ungetch.o ../obj_s/lib_vidattr.o ../obj_s/lib_vline.o ../obj_s/lib_wattroff.o ../obj_s/lib_wattron.o ../obj_s/lib_winch.o ../obj_s/lib_window.o ../obj_s/nc_panel.o ../obj_s/safe_sprintf.o ../obj_s/tty_update.o ../obj_s/varargs.o ../obj_s/vsscanf.o ../obj_s/lib_freeall.o ../obj_s/charable.o ../obj_s/lib_add_wch.o ../obj_s/lib_box_set.o ../obj_s/lib_cchar.o ../obj_s/lib_erasewchar.o ../obj_s/lib_get_wch.o ../obj_s/lib_get_wstr.o ../obj_s/lib_hline_set.o ../obj_s/lib_in_wch.o ../obj_s/lib_in_wchnstr.o ../obj_s/lib_ins_wch.o ../obj_s/lib_inwstr.o ../obj_s/lib_key_name.o ../obj_s/lib_pecho_wchar.o ../obj_s/lib_slk_wset.o ../obj_s/lib_unget_wch.o ../obj_s/lib_vid_attr.o ../obj_s/lib_vline_set.o ../obj_s/lib_wacs.o ../obj_s/lib_wunctrl.o ../obj_s/expanded.o ../obj_s/legacy_coding.o ../obj_s/lib_dft_fgbg.o ../obj_s/lib_print.o ../obj_s/new_pair.o ../obj_s/resizeterm.o ../obj_s/use_screen.o ../obj_s/use_window.o ../obj_s/wresize.o ../obj_s/access.o ../obj_s/add_tries.o ../obj_s/alloc_ttype.o ../obj_s/codes.o ../obj_s/comp_captab.o ../obj_s/comp_error.o ../obj_s/comp_hash.o ../obj_s/comp_userdefs.o ../obj_s/db_iterator.o ../obj_s/doalloc.o ../obj_s/entries.o ../obj_s/fallback.o ../obj_s/free_ttype.o ../obj_s/getenv_num.o ../obj_s/home_terminfo.o ../obj_s/init_keytry.o ../obj_s/lib_acs.o ../obj_s/lib_baudrate.o ../obj_s/lib_cur_term.o ../obj_s/lib_data.o ../obj_s/lib_has_cap.o ../obj_s/lib_kernel.o ../obj_s/lib_keyname.o ../obj_s/lib_longname.o ../obj_s/lib_napms.o ../obj_s/lib_options.o ../obj_s/lib_raw.o ../obj_s/lib_setup.o ../obj_s/lib_termcap.o ../obj_s/lib_termname.o ../obj_s/lib_tgoto.o ../obj_s/lib_ti.o ../obj_s/lib_tparm.o ../obj_s/lib_tputs.o ../obj_s/lib_trace.o ../obj_s/lib_ttyflags.o ../obj_s/lib_twait.o ../obj_s/name_match.o ../obj_s/names.o ../obj_s/obsolete.o ../obj_s/read_entry.o ../obj_s/read_termcap.o ../obj_s/strings.o ../obj_s/tries.o ../obj_s/trim_sgr0.o ../obj_s/unctrl.o ../obj_s/visbuf.o ../obj_s/alloc_entry.o ../obj_s/captoinfo.o ../obj_s/comp_expand.o ../obj_s/comp_parse.o ../obj_s/comp_scan.o ../obj_s/parse_entry.o ../obj_s/write_entry.o ../obj_s/define_key.o ../obj_s/hashed_db.o ../obj_s/key_defined.o ../obj_s/keybound.o ../obj_s/keyok.o ../obj_s/version.o -L../lib ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.0.19991023' to symbol '_nc_check_termtype' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.0.19991023' to symbol '_nc_resolve_uses' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.5.20051010' to symbol '_nc_alloc_entry_leaks' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.5.20051010' to symbol '_nc_captoinfo_leaks' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.5.20051010' to symbol '_nc_comp_scan_leaks' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TIC_5.7.20081102' to symbol '_nc_free_tic' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_comp_captab_leaks' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_leaks_tic' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TINFO_5.0.19991023' to symbol '_nc_info_hash_table' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TINFO_5.0.19991023' to symbol '_nc_trace_buf' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TINFO_5.0.19991023' to symbol '_tracechar' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TINFO_5.0.19991023' to symbol 'trace' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_cap_hash_table' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_capalias_table' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_infoalias_table' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_key_names' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_read_termcap_entry' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_trace_tries' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'local' to symbol '_nc_tracebits' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: version script assignment of 'NCURSES6_TINFO_5.1.20000708' to symbol '_nc_utf8_outch' failed: symbol not defined ncurses> x86_64-unknown-linux-gnu-ld: error: too many errors emitted, stopping now (use --error-limit=0 to see all errors) ``` Co-authored-by: Bernardo Meurer --- pkgs/development/libraries/ncurses/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2d383c876cba..adf310cef2b7 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -51,7 +51,16 @@ stdenv.mkDerivation (finalAttrs: { ]}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" - ]; + ] ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ + # lld17+ passes `--no-undefined-version` by default and makes this a hard + # error; ncurses' `resulting.map` version script references symbols that + # aren't present. + # + # See: https://lists.gnu.org/archive/html/bug-ncurses/2024-05/msg00086.html + # + # For now we allow this with `--undefined-version`: + "LDFLAGS=-Wl,--undefined-version" + ]); # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; From 0fcdadf73a2acdc4ebc3b49a0470878a4871e93d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:40:49 +0000 Subject: [PATCH 086/163] sherlock: 0-unstable-2024-05-15 -> 0-unstable-2024-05-22 --- pkgs/tools/security/sherlock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sherlock/default.nix b/pkgs/tools/security/sherlock/default.nix index 2a475e13d3d5..17cb861024dc 100644 --- a/pkgs/tools/security/sherlock/default.nix +++ b/pkgs/tools/security/sherlock/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sherlock"; - version = "0-unstable-2024-05-15"; + version = "0-unstable-2024-05-22"; format = "other"; src = fetchFromGitHub { owner = "sherlock-project"; repo = "sherlock"; - rev = "0ecb496ae91bc36476e3e6800aa3928c5dcd82f8"; - hash = "sha256-CikQaQsiwKz0yEk3rA6hi570LIobEaxxgQ5I/B6OxWk="; + rev = "ab5fcbb90f592ea97239ceab5e8ca3a8d3f7f08b"; + hash = "sha256-F793Co7CdpNrMFM7SHy/hrmzPKo5hiSHF3BqGtjmJbc="; }; nativeBuildInputs = [ makeWrapper ]; From 09f2111db53905ca7ea623c3a1c4de06b434c796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:43:23 +0000 Subject: [PATCH 087/163] rng-tools: 6.16 -> 6.17 --- pkgs/tools/security/rng-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index a5470f05613b..ec7fd33b295b 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.16"; + version = "6.17"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - hash = "sha256-9pXQhG2nbu6bq4BnBgEOyyUBNkQTI5RhWmJIoLtFU+c="; + hash = "sha256-wqJvLvxmNG2nb5P525w25Y8byUUJi24QIHNJomCKeG8="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; From 7c2d8b3d1247abd57dffff3d1b01ed360c8b0f57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:43:42 +0000 Subject: [PATCH 088/163] redpanda-client: 24.1.2 -> 24.1.3 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 10e8cd3ed717..cc1496ccb90d 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "24.1.2"; + version = "24.1.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-RkJymtTTIPTPzpoUyWmCKpfQBqGFoR7ZeEWCKKzkn54="; + sha256 = "sha256-LuaUm8FToGJ4//tDFvdHbTCHzhul4ympSznbp1wrLM8="; }; server = callPackage ./server.nix { inherit src version; }; in From 24576e85fa38128bc139e13a16a60fd846399d07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:49:49 +0000 Subject: [PATCH 089/163] rocksdb: 9.1.1 -> 9.2.1 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index f07a43cfbec0..0491ef2e6725 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.1.1"; + version = "9.2.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc="; + hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac="; }; nativeBuildInputs = [ cmake ninja ]; From 754ec45a96a74b669855efc9aeb104aef32f3789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:56:47 +0000 Subject: [PATCH 090/163] sdrangel: 7.20.1 -> 7.21.0 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 639fee520c85..daf5abd644e1 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.20.1"; + version = "7.21.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-8v00JiPRCFqg+6wEZw5BrsHMvUYweigbroBHKQGOlHI="; + hash = "sha256-TbOGuxFFBSjva1dbZxd2oQJs6X43QWYSU6VjlXKlDfk="; }; nativeBuildInputs = [ From 536e6566ffe1edea82d4cdca537d38bd9e4930a0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 10:29:56 +0900 Subject: [PATCH 091/163] python311Packages.langchain-core: add updateScript --- .../python-modules/langchain-community/default.nix | 4 ++++ .../python-modules/langchain-core/default.nix | 14 ++++++++++++++ .../langchain-text-splitters/default.nix | 4 ++++ .../python-modules/langchain/default.nix | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index e8e028570abd..947d23fb21fd 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { # PyPI source does not have tests doCheck = false; + passthru = { + updateScript = langchain-core.updateScript; + }; + meta = with lib; { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 8cfa8cafd9ee..d2ee9ee504cf 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -13,6 +13,7 @@ pyyaml, requests, tenacity, + writeScript, }: buildPythonPackage rec { @@ -53,6 +54,19 @@ buildPythonPackage rec { # PyPI source does not have tests doCheck = false; + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core + nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters + nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain + nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community + ''; + }; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 3f8fa837af7a..6084bbf5ee0b 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_text_splitters" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = with lib; { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 804f63a88e9f..7b085b2cde6f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -166,6 +166,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain" ]; + passthru = { + updateScript = langchain-core.updateScript; + }; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain"; From d33016aecc71f8e6514aab87412aba7e406acf1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:58:26 +0000 Subject: [PATCH 092/163] symengine: 0.11.2 -> 0.12.0 --- pkgs/development/libraries/symengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cc08b7ff3c2e..8bd5b7055a59 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - hash = "sha256-CwVDpDbx00r7Fys+5r1n0m/E86zTx1i4ti5JCcVp20g="; + hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4="; }; nativeBuildInputs = [ cmake ]; From bcbfcb8a177cab0682f5cb3efd91e309a9bea7b4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:32:31 +0000 Subject: [PATCH 093/163] python3Packages.langchain-core: 0.1.52 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/langchain-core==0.1.52...langchain-core==0.2.1 --- .../python-modules/langchain-core/default.nix | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index d2ee9ee504cf..cf919d3404da 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -1,34 +1,43 @@ { lib, - anyio, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + freezegun, + grandalf, jsonpatch, langsmith, + numpy, packaging, poetry-core, pydantic, + pytest-asyncio, + pytest-mock, + pytest-xdist, + pytestCheckHook, pythonOlder, pythonRelaxDepsHook, pyyaml, - requests, + syrupy, tenacity, writeScript, }: buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.52"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "langchain_core"; - inherit version; - hash = "sha256-CEw/xFL1ppZsKKs+xdvIuNJvw/YzeAc5KPTinZC2OT8="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "langchain-core==${version}"; + hash = "sha256-D0y6kW5bWcCKW2TwVPlZcAUxqADgsOm9fWySAjHYYIg="; }; + sourceRoot = "${src.name}/libs/core"; + pythonRelaxDeps = [ "langsmith" "packaging" @@ -39,20 +48,28 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ - anyio jsonpatch langsmith packaging pydantic pyyaml - requests tenacity ]; pythonImportsCheck = [ "langchain_core" ]; - # PyPI source does not have tests - doCheck = false; + nativeCheckInputs = [ + freezegun + grandalf + numpy + pytest-asyncio + pytest-mock + pytest-xdist + pytestCheckHook + syrupy + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { updateScript = writeScript "update.sh" '' @@ -70,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; From 5eba8fa86acf45c7c7791c9c74c246541433a7fd Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:32:54 +0000 Subject: [PATCH 094/163] python3Packages.langchain: 0.1.52 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.1.52...langchain==0.2.1 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.1 --- .../development/python-modules/langchain/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 7b085b2cde6f..94dad83b0f31 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -10,13 +10,10 @@ chardet, clarifai, cohere, - dataclasses-json, esprima, fetchFromGitHub, freezegun, huggingface-hub, - jsonpatch, - langchain-community, langchain-core, langchain-text-splitters, langsmith, @@ -51,7 +48,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.52"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -59,8 +56,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-H8rtysRIwyuJEUFI93vid3MsqReyRCER88xztsuYpOc="; + rev = "refs/tags/langchain==${version}"; + hash = "sha256-cLJhdeft9XNLk5njSBaEBSuP31c2VFCJ1ET+ypo6mNY="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -71,9 +68,6 @@ buildPythonPackage rec { dependencies = [ aiohttp - dataclasses-json - jsonpatch - langchain-community langchain-core langchain-text-splitters langsmith From daec3817ea3182ed7dcf0915bc40c558f3a234df Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:33:13 +0000 Subject: [PATCH 095/163] python3Packages.langchain-community: 0.0.38 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/langchain-community==0.0.38...langchain-community==0.2.1 --- .../langchain-community/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 947d23fb21fd..684591f833eb 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -1,40 +1,55 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, pythonOlder, aiohttp, dataclasses-json, + duckdb-engine, + langchain, langchain-core, langsmith, + lark, numpy, + pandas, + pytest-asyncio, + pytest-mock, + pytestCheckHook, pyyaml, requests, + requests-mock, + responses, sqlalchemy, + syrupy, tenacity, + toml, typer, }: buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.38"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "langchain_community"; - inherit version; - hash = "sha256-En/Et1vGe2L+gnxmwC5xWnMP74/mm9ICPUZrqwa1gQ0="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "langchain-community==${version}"; + hash = "sha256-h8ZJiQYmyvzaRrEVNS7SamJTq4zY7J1IgYdQiVBFh4I="; }; + sourceRoot = "${src.name}/libs/community"; + build-system = [ poetry-core ]; dependencies = [ aiohttp dataclasses-json langchain-core + langchain langsmith numpy pyyaml @@ -49,8 +64,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_community" ]; - # PyPI source does not have tests - doCheck = false; + nativeCheckInputs = [ + duckdb-engine + lark + pandas + pytest-asyncio + pytest-mock + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { updateScript = langchain-core.updateScript; @@ -59,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; From 3f5b5e6ee65a2f122aa0ca74b0eb02c65c525d2c Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 02:24:26 +0000 Subject: [PATCH 096/163] python3Packages.langchain-text-splitters: 0.0.2 -> 0.2.0 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-text-splitters==0.0.2...langchain-text-splitters==0.2.0 --- .../langchain-text-splitters/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 6084bbf5ee0b..73a1e722019a 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -1,38 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, langchain-core, - lxml, + pytest-asyncio, + pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.0.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "langchain_text_splitters"; - inherit version; - hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-text-splitters==${version}"; + hash = "sha256-QrgZ0j/YdOgEgLeQNSKjOIwqdr/Izuw9Gh6eKQ/00tQ="; }; + sourceRoot = "${src.name}/libs/text-splitters"; + build-system = [ poetry-core ]; - dependencies = [ - langchain-core - lxml - ]; - - # PyPI source does not have tests - doCheck = false; + dependencies = [ langchain-core ]; pythonImportsCheck = [ "langchain_text_splitters" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + passthru = { inherit (langchain-core) updateScript; }; @@ -40,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e38cfd5ef4313905e35c89e1e85869fe3442fc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:01:51 +0000 Subject: [PATCH 097/163] stern: 1.29.0 -> 1.30.0 --- pkgs/applications/networking/cluster/stern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index fd4b70de5acd..b2a54862c1ed 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stern"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-8Tvhul7GwVbRJqJenbYID8OY5zGzFhIormUwEtLE0Lw="; + sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18="; }; vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; From fb8cbfbe5e1161813b7bd6580701f493621613cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:08:33 +0000 Subject: [PATCH 098/163] xmake: 2.9.1 -> 2.9.2 --- pkgs/development/tools/build-managers/xmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index f0d48ac331d1..d112ba7094a5 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-ox2++MMDrqEmgGi0sawa7BQqxBJMfLfZx+61fEFPjRU="; + hash = "sha256-H2F7akVox+s+irDzpnwWmJJFrcVH46fR/YYayzCPtbI="; }; nativeBuildInputs = [ From 7db23ccdfb242ab888b131c8556a24319d6e4643 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:25:00 +0000 Subject: [PATCH 099/163] python311Packages.goodwe: 0.4.3 -> 0.4.5 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index d2e8b5495f14..feff5d186fea 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-Hj/iTFGUqvMeFQso6wCbkUmoGOSCEtMsO8HaQ/UQKeM="; + hash = "sha256-xWVYxOc0PibttftZIrnmClPcu4EnJCQ1Zob8Pg+FTBE="; }; postPatch = '' From 0153255785421b5ec4eba4e3d337b3c3a7f1a779 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:44:21 +0000 Subject: [PATCH 100/163] python311Packages.duckdb-engine: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/duckdb-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index eb596f7413ec..5b13f55ebed9 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-cm0vbz0VZ2Ws6FDWJO16q4KZW2obs0CBNrfY9jmR+6A="; + hash = "sha256-+l6sRZHJnLfei1LR8WHqpC+0+91VLYKXn2e0w9+QRyk="; }; nativeBuildInputs = [ poetry-core ]; From b57aa88291910689aeaa83ff40dd02c50ab8199b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 19 May 2024 17:27:59 +1200 Subject: [PATCH 101/163] libXNVCtrl: build shared library The libXNVCtrl library is used by several programs in nixpkgs to get Nvidia GPU stats, and they all load the library dynamically, but the libXNVCtrl package only builds a static library. There is no build flag to enable this, so we have to patch the Makefile to produce a shared library. Based on a patch by @negativo17 for Fedora. https://github.com/negativo17/nvidia-settings/blob/master/nvidia-settings-libXNVCtrl.patch --- .../libxnvctrl-build-shared-3xx.patch | 24 +++++++++++++++++++ .../nvidia-x11/libxnvctrl-build-shared.patch | 21 ++++++++++++++++ .../os-specific/linux/nvidia-x11/settings.nix | 9 +++++++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared-3xx.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared-3xx.patch b/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared-3xx.patch new file mode 100644 index 000000000000..d2e074add754 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared-3xx.patch @@ -0,0 +1,24 @@ +--- a/src/libXNVCtrl/Makefile ++++ b/src/libXNVCtrl/Makefile +@@ -33,6 +33,8 @@ + + LIBXNVCTRL = libXNVCtrl.a + ++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so ++ + LIBXNVCTRL_PROGRAM_NAME = "libXNVCtrl" + + LIBXNVCTRL_VERSION := $(NVIDIA_VERSION) +@@ -62,6 +64,12 @@ + $(LIBXNVCTRL) : $(OBJS) + $(AR) ru $@ $(OBJS) + ++$(LIBXNVCTRL_SHARED): $(LIBXNVCTRL_OBJ) ++ $(RM) $@ $@.* ++ $(CC) -shared -Wl,-soname=$(@F).0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11 ++ ln -s $(@F).0.0.0 $@.0 ++ ln -s $(@F).0 $@ ++ + # define the rule to build each object file + $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src)))) + diff --git a/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared.patch b/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared.patch new file mode 100644 index 000000000000..ad1dc1eae400 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/libxnvctrl-build-shared.patch @@ -0,0 +1,21 @@ +--- a/src/libXNVCtrl/xnvctrl.mk ++++ b/src/libXNVCtrl/xnvctrl.mk +@@ -39,6 +39,8 @@ + + LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a + ++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so ++ + LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c + + LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC)) +@@ -47,3 +49,9 @@ + + $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ) + $(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ) ++ ++$(LIBXNVCTRL_SHARED): $(LIBXNVCTRL_OBJ) ++ $(RM) $@ $@.* ++ $(CC) -shared -Wl,-soname=$(@F).0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11 ++ ln -s $(@F).0.0.0 $@.0 ++ ln -s $(@F).0 $@ diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 2d9dfd81829e..0df0989c123d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -43,6 +43,14 @@ let makeFlags = [ "OUTPUTDIR=." # src/libXNVCtrl + "libXNVCtrl.a" + "libXNVCtrl.so" + ]; + + patches = [ + # Patch the Makefile to also produce a shared library. + (if lib.versionOlder nvidia_x11.settingsVersion "400" then ./libxnvctrl-build-shared-3xx.patch + else ./libxnvctrl-build-shared.patch) ]; installPhase = '' @@ -52,6 +60,7 @@ let cp libXNVCtrl.a $out/lib cp NVCtrl.h $out/include/NVCtrl cp NVCtrlLib.h $out/include/NVCtrl + cp -P libXNVCtrl.so* $out/lib ''; }; From 4e353b67f667766b1c6489f23c20b920ab0c82f5 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 19 May 2024 18:00:51 +1200 Subject: [PATCH 102/163] nixos/nvidia: make libXNVCtrl available on nvidia systems --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 3caec769400c..949b1e346269 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -285,7 +285,7 @@ in KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" ''; hardware.opengl = { - extraPackages = [ nvidia_x11.out ]; + extraPackages = [ nvidia_x11.out nvidia_x11.settings.libXNVCtrl ]; extraPackages32 = [ nvidia_x11.lib32 ]; }; environment.systemPackages = [ nvidia_x11.bin ]; From e8c66dc41dd95c70718ba9f5ab34e9ebe23e49c4 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Mon, 20 May 2024 06:57:07 +1200 Subject: [PATCH 103/163] nvidia-settings: add aidalgol as maintainer --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 0df0989c123d..e13f3a157b64 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -147,6 +147,6 @@ stdenv.mkDerivation { license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; mainProgram = "nvidia-settings"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar aidalgol ]; }; } From f2c6e54b8bb0ce413fc1a192ae7a267a9dacf94c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 17 May 2024 06:09:46 +0200 Subject: [PATCH 104/163] =?UTF-8?q?ocsigen-i18n:=203.7.0=20=E2=86=92=204.0?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/ocsigen-i18n/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index fcb43938112d..bad8dc09a1c1 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,26 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "ocsigen-i18n"; - version = "3.7.0"; + version = "4.0.0"; - strictDeps = true; - - nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; - buildInputs = with ocamlPackages; [ ppx_tools ]; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - make bindir=$out/bin install - ''; + buildInputs = with ocamlPackages; [ ppxlib ]; src = fetchFromGitHub { owner = "besport"; repo = "ocsigen-i18n"; rev = version; - sha256 = "sha256-PmdDyn+MUcNFrZpP/KLGQzdXUFRr+dYRAZjTZxHSeaw="; + hash = "sha256-NIl1YUTws8Ff4nrqdhU7oS/TN0lxVQgrtyEZtpS1ojM="; }; meta = { From 8c03ab65690d22027c85220d6e74ef7b028f9e15 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 May 2024 15:02:26 +0200 Subject: [PATCH 105/163] =?UTF-8?q?coqPackages.graph-theory:=200.9.3=20?= =?UTF-8?q?=E2=86=92=200.9.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/graph-theory/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 0d28bbc0527f..6554b811f4b9 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -8,12 +8,14 @@ mkCoqDerivation { release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU="; release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; + release."0.9.4".sha256 = "sha256-fXTAsRdPisNhg8Umaa7S7gZ1M8zuPGg426KP9fAkmXQ="; releaseRev = v: "v${v}"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (isGe "8.16") (range "2.0.0" "2.1.0") ]; out = "0.9.3"; } + { cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } + { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } { cases = [ (range "8.12" "8.13") (range "1.12.0" "1.14.0") ]; out = "0.9"; } From 74487e0879ac96bd2a46184d5eb0d832d6818ead Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 04:09:44 +0000 Subject: [PATCH 106/163] trealla: 2.52.6 -> 2.52.9 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 64344c770923..d20888a48b1a 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.52.6"; + version = "2.52.9"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-JTyXpaoHpf10fUNxx+qllhS0D9rfOP64BpjLQ9bob8k="; + hash = "sha256-fehgNWCH/c0wbnlTpydA9K8FPnvSFpcwum1ThngikGY="; }; postPatch = '' From e77e8002b3d36672c3f48c31ee2c9d939dfe81b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 04:51:51 +0000 Subject: [PATCH 107/163] python311Packages.griffe: 0.45.1 -> 0.45.2 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 2fd12f938674..eaccbad28682 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.45.1"; + version = "0.45.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-NmCnhImkdo2zAHhl2fLknV0rXXmJ9A+FL1uXUBF4IPk="; + hash = "sha256-mWJNEZPZgpqJ15HuptpjD9e14CYh4TNFbE38zI42wRk="; }; build-system = [ pdm-backend ]; From a3d04db02ba0ee0ea2989d4d4fde3e41f8985dce Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Fri, 24 May 2024 00:23:38 -0400 Subject: [PATCH 108/163] python312Packages.scrapy: 2.11.1 -> 2.11.2 - Update version from 2.11.1 to 2.11.2 - Adds `defusedxml` as a dependency - Remove unnecessary patch; commit is included in new release - Change fetchPypi to fetchFromGitHub - On PyPI they messed up the tarball name, tag names on GitHub should be more reliable - Re-enable tests that were disabled in the past but have since been fixed --- .../python-modules/scrapy/default.nix | 40 +++++-------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 9c688c7445d3..c97b5fc5598a 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -5,8 +5,8 @@ buildPythonPackage, cryptography, cssselect, - fetchPypi, - fetchpatch, + defusedxml, + fetchFromGitHub, glibcLocales, installShellFiles, itemadapter, @@ -28,32 +28,25 @@ testfixtures, tldextract, twisted, + uvloop, w3lib, zope-interface, }: buildPythonPackage rec { pname = "scrapy"; - version = "2.11.1"; + version = "2.11.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version; - pname = "Scrapy"; - hash = "sha256-czoDnHQj5StpvygQtTMgk9TkKoSEYDWcB7Auz/j3Pr4="; + src = fetchFromGitHub { + owner = "scrapy"; + repo = "scrapy"; + rev = "refs/tags/${version}"; + hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ="; }; - patches = [ - # https://github.com/scrapy/scrapy/pull/6316 - # fix test_get_func_args. remove on next update - (fetchpatch { - name = "test_get_func_args.patch"; - url = "https://github.com/scrapy/scrapy/commit/b1fe97dc6c8509d58b29c61cf7801eeee1b409a9.patch"; - hash = "sha256-POlmsuW4SD9baKwZieKfmlp2vtdlb7aKQ62VOmNXsr0="; - }) - ]; nativeBuildInputs = [ installShellFiles @@ -63,6 +56,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography cssselect + defusedxml itemadapter itemloaders lxml @@ -87,6 +81,7 @@ buildPythonPackage rec { pytestCheckHook sybil testfixtures + uvloop ]; LC_ALL = "en_US.UTF-8"; @@ -101,11 +96,6 @@ buildPythonPackage rec { disabledTests = [ - # It's unclear if the failures are related to libxml2, https://github.com/NixOS/nixpkgs/pull/123890 - "test_nested_css" - "test_nested_xpath" - "test_flavor_detection" - "test_follow_whitespace" # Requires network access "AnonymousFTPTestCase" "FTPFeedStorageTest" @@ -119,14 +109,6 @@ buildPythonPackage rec { "test_timeout_download_from_spider_server_hangs" "test_unbounded_response" "CookiesMiddlewareTest" - # Depends on uvloop - "test_asyncio_enabled_reactor_different_loop" - "test_asyncio_enabled_reactor_same_loop" - # Fails with AssertionError - "test_peek_fifo" - "test_peek_one_element" - "test_peek_lifo" - "test_callback_kwargs" # Test fails on Hydra "test_start_requests_laziness" ] From 8317109fc9e44b29971f3c40ed67a94c278c1c97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:18:32 +0000 Subject: [PATCH 109/163] fortls: 3.0.0 -> 3.1.0 --- pkgs/development/tools/language-servers/fortls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index ccb70db0727c..96db58da0076 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "fortls"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "fortran-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kRL4kLX1T2Sontl8f3VO8Hb7uI41JwhZBiH//gdcmNE="; + hash = "sha256-4iOE9OkqSu7enEMx4aAaGZ0KDKCT1377Su728JncIso="; }; nativeBuildInputs = [ setuptools-scm ]; From 08637bb78f3f77a4e0601c7b682d65e2e261dd57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:30:32 +0000 Subject: [PATCH 110/163] drawterm: 0-unstable-2024-04-23 -> 0-unstable-2024-05-23 --- pkgs/tools/admin/drawterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index dacf5155b321..74a951f74acf 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-04-23"; + version = "0-unstable-2024-05-23"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c0951f2a3182d8b70ffe579bfd9da24c2b86e232"; - hash = "sha256-7y2Mte6R4yeayxdFSFGb9Q5M/GQwqyFb+AW/BFsQeZc="; + rev = "8391a9e364622cb7d85e128b427fb96c75e18265"; + hash = "sha256-YHko0lCCn7SydnKbepZpt4Ua6NdvuPD3Y3ZQ1Ysb0+g="; }; enableParallelBuilding = true; From 3259f97ac0d7923096e36411a49c735b41045f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:34:13 +0000 Subject: [PATCH 111/163] wasmer: 4.2.7 -> 4.3.1 --- pkgs/development/interpreters/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index a509107ec163..ed9139af17b8 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.2.7"; + version = "4.3.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jyA1DUouODq9giAWeGOw7VMGwA+FbyqpEU77jtCb5v4="; + hash = "sha256-1bxxy0Dso54cYQIZC9UUjtkgL1eyd3oRbhaYCwI0otw="; }; - cargoHash = "sha256-EpHM8YaT2Ty9IBX/gXEa9n8006A9Y5/fq/ueODxHlnc="; + cargoHash = "sha256-3MwQZdFIWqHvELpIGlqsn/VKyobWki7OcMXQrjbxwKk="; nativeBuildInputs = [ rustPlatform.bindgenHook From 4e65f02c0313162d9bbc3d29690d17d8fee6c94e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:46:27 +0000 Subject: [PATCH 112/163] python311Packages.clickhouse-connect: 0.7.8 -> 0.7.10 --- .../development/python-modules/clickhouse-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index c0cefdb58431..d3763045dd8e 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.8"; + version = "0.7.10"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-tdf9aYKAFpRyaqGGNxXs4bzmY6mdhKZ5toFBJRmD2VY="; + hash = "sha256-joY8T0BrqoysHl3PFmx8BqQjvROAD67O0nDLOOEZ7OI="; }; nativeBuildInputs = [ cython ]; From 37b1593aba55ba88b15efccb73fcdf62168b17af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:49:01 +0000 Subject: [PATCH 113/163] twitch-tui: 2.6.9 -> 2.6.10 --- .../networking/instant-messengers/twitch-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index ab7168a0ed23..48ddc5d952a6 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.9"; + version = "2.6.10"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c5wDneX7p3kOhARaDISHFdPpo4Bs1KbRdShp2cjI6wQ="; + hash = "sha256-RJ/+yXbCS8DkdvblBYlxE4sStpTQcGQZXWAApdL7/2o="; }; - cargoHash = "sha256-4kz8s5cQDSPZEyHB7+A5q+PrvSr/jAyjfLw+uhThFxQ="; + cargoHash = "sha256-lI0HR0iNA2C0kf+oBLxxjcOhsf70wCo3tKPMAC76EZM="; nativeBuildInputs = [ pkg-config From 1641b2402df7928c0309775d2cfd8f32c97ca079 Mon Sep 17 00:00:00 2001 From: Andrey Shaat <104313094+ASHGOLDOFFICIAL@users.noreply.github.com> Date: Fri, 24 May 2024 10:57:41 +0500 Subject: [PATCH 114/163] wildcard: init at 0.3.3 (#312389) * wildcard: init at 0.3.3 * wildcard: fixes * wildcard: fixed cargo hash * wildcard: add aleksana to maintainers --------- Co-authored-by: Aleksana --- pkgs/by-name/wi/wildcard/package.nix | 64 ++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/by-name/wi/wildcard/package.nix diff --git a/pkgs/by-name/wi/wildcard/package.nix b/pkgs/by-name/wi/wildcard/package.nix new file mode 100644 index 000000000000..e263cb721556 --- /dev/null +++ b/pkgs/by-name/wi/wildcard/package.nix @@ -0,0 +1,64 @@ +{ lib +, blueprint-compiler +, cargo +, desktop-file-utils +, fetchFromGitLab +, libadwaita +, meson +, ninja +, pkg-config +, rustPlatform +, rustc +, stdenv +, wrapGAppsHook4 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wildcard"; + version = "0.3.3"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Wildcard"; + rev = "v${finalAttrs.version}"; + hash = "sha256-jOv0l1vnfDePWF7SAbsBFipPAONliPdc47xj79BJ+rc="; + }; + + strictDeps = true; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + hash = "sha256-8jNNCcZRoLyOHdaWmYTOGD7Nf7NkmJ1MIxBXLJGrm5Y="; + name = "wildcard-${finalAttrs.version}"; + }; + + nativeBuildInputs = [ + blueprint-compiler + cargo + desktop-file-utils + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + ]; + + meta = { + description = "Test your regular expressions"; + longDescription = '' + Wildcard gives you a nice and simple to use interface to test/practice regular expressions. + ''; + homepage = "https://gitlab.gnome.org/World/Wildcard"; + downloadPage = "https://gitlab.gnome.org/World/Wildcard/-/releases/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + mainProgram = "wildcard"; + platforms = lib.platforms.linux; + }; +}) From 60147b468a76e2200f84a317c12d03b7ff5edfb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 06:34:40 +0000 Subject: [PATCH 115/163] python311Packages.quantile-forest: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/quantile-forest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantile-forest/default.nix b/pkgs/development/python-modules/quantile-forest/default.nix index 0b6d5df933b1..e38a6175c09d 100644 --- a/pkgs/development/python-modules/quantile-forest/default.nix +++ b/pkgs/development/python-modules/quantile-forest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "quantile-forest"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zillow"; repo = "quantile-forest"; rev = "refs/tags/v${version}"; - hash = "sha256-0zlj9nks5KsgsLSflRW+4uiYlYVQsF0HMkZ3zG3if2E="; + hash = "sha256-cYi4idA6gcUd/aVMlIwlCB/jdKpxZtc6xQEhxNSY08Y="; }; build-system = [ From 42b94fa833ce9a6c7d5b9f561ad6056f49a2c675 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Fri, 24 May 2024 14:48:58 +0800 Subject: [PATCH 116/163] share-preview: init at 0.5.0 (#313676) * share-preview: init at 0.5.0 * share-preview: fix build on darwin --------- Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/by-name/sh/share-preview/package.nix | 66 +++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/sh/share-preview/package.nix diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix new file mode 100644 index 000000000000..093bbaf33270 --- /dev/null +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + meson, + ninja, + pkg-config, + rustc, + cargo, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + openssl, + darwin, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "share-preview"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "rafaelmardojai"; + repo = "share-preview"; + rev = finalAttrs.version; + hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "share-preview-${finalAttrs.version}"; + hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] + ); + + meta = { + description = "Preview and debug websites metadata tags for social media share"; + homepage = "https://apps.gnome.org/SharePreview"; + license = lib.licenses.gpl3Plus; + mainProgram = "share-preview"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) From fcaec6bdf72d92645313340c44ccfddf6cdea0e6 Mon Sep 17 00:00:00 2001 From: diniamo Date: Tue, 7 May 2024 14:59:35 +0200 Subject: [PATCH 117/163] nixos/steam: add protontricks submodule --- nixos/modules/programs/steam.nix | 12 ++++++++++-- .../package-management/protontricks/default.nix | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index d317398495f5..26faf40d5ce1 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -4,6 +4,8 @@ let cfg = config.programs.steam; gamescopeCfg = config.programs.gamescope; + extraCompatPaths = lib.makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + steam-gamescope = let exports = builtins.attrValues (builtins.mapAttrs (n: v: "export ${n}=${v}") cfg.gamescopeSession.env); in @@ -42,7 +44,7 @@ in { ''; apply = steam: steam.override (prev: { extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + STEAM_EXTRA_COMPAT_TOOLS_PATHS = extraCompatPaths; }) // (lib.optionalAttrs cfg.extest.enable { LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so"; }) // (prev.extraEnv or {}); @@ -139,6 +141,11 @@ in { Load the extest library into Steam, to translate X11 input events to uinput events (e.g. for using Steam Input on Wayland) ''; + + protontricks = { + enable = lib.mkEnableOption "protontricks, a simple wrapper for running Winetricks commands for Proton-enabled games"; + package = lib.mkPackageOption pkgs "protontricks" { }; + }; }; config = lib.mkIf cfg.enable { @@ -169,7 +176,8 @@ in { environment.systemPackages = [ cfg.package cfg.package.run - ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope; + ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope + ++ lib.optional cfg.protontricks.enable (cfg.protontricks.package.override { inherit extraCompatPaths; }); networking.firewall = lib.mkMerge [ (lib.mkIf (cfg.remotePlay.openFirewall || cfg.localNetworkGameTransfers.openFirewall) { diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index c3c43163c671..a3ba1f112fb8 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -12,6 +12,7 @@ , yad , pytestCheckHook , nix-update-script +, extraCompatPaths ? "" }: buildPythonApplication rec { @@ -51,7 +52,7 @@ buildPythonApplication rec { ]}" # Steam Runtime does not work outside of steam-run, so don't use it "--set STEAM_RUNTIME 0" - ]; + ] ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}"; nativeCheckInputs = [ pytestCheckHook ]; From c0dfedf8b4ee475cee6f320f6f40c3e09b11e99d Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Fri, 24 May 2024 16:07:49 +0900 Subject: [PATCH 118/163] perlPackages.FinanceQuote: 1.61 -> 1.62 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1650193caccd..fcf4837d4429 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10397,10 +10397,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.61"; + version = "1.62"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-Qw7p3yLcqjLrYwpNf7V6KFQvn+UHsmawo39nVLTzWgg="; + hash = "sha256-DTEzsL89d5WCxWaFDVd/K76OGsvRFJeDHNQ9jzFgZII="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; From ea1a1c5b7588835e02b056f014f7c6eb169751a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 09:25:48 +0200 Subject: [PATCH 119/163] python312Packages.tencentcloud-sdk-python: 3.0.1153 -> 3.0.1154 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1153...3.0.1154 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1154/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index de66abd7a2c2..0325b42e111e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1153"; + version = "3.0.1154"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-BDBRE7AKT5rKWW62Sx5M5jtF+ANU//Z9AUt1Jh1wFpo="; + hash = "sha256-rVNmNnLRtW7ZhJgNUoZvYlbU9dkiXXOv7/vBAvaQ18w="; }; build-system = [ setuptools ]; From c4d884c4c19530ccb069b8c7b4673e6ce545f3b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 09:26:08 +0200 Subject: [PATCH 120/163] python312Packages.boto3-stubs: 1.34.111 -> 1.34.112 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 185c8f6a80c8..24bf921cbe94 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.111"; + version = "1.34.112"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-6uJopdcNK4gLgHoVOWAvLInUCQ3m3bAuP+wURmC8H9E="; + hash = "sha256-70UVtT3M5NhRaPoYXcgDU3xMiC1bDas+XDSJPIPI26o="; }; build-system = [ setuptools ]; From 02581f637cf05da1c237ebc055c57e8d350dd460 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 09:27:05 +0200 Subject: [PATCH 121/163] python312Packages.langsmith: 0.1.60 -> 0.1.63 Diff: https://github.com/langchain-ai/langsmith-sdk/compare/refs/tags/v0.1.60...v0.1.63 Changelog: https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.1.63 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 2685a5260c16..c02aae4844a3 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.60"; + version = "0.1.63"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-YoJ9rdbc4lcQ0ZxE0bYCa+VMKO2kqJRTpxZz4QGPzzM="; + hash = "sha256-zIrSQubYB5AuwAF0hktT/wY5/ktwQJ4Z/3F6po2wC3o="; }; sourceRoot = "${src.name}/python"; From 48c51e606179fb0d2f7e352b81be179f8304afd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 21:07:55 +0200 Subject: [PATCH 122/163] python312Packages.fido2: refactor - migrate to pytestCheckHook - clean-up inputs - update disabled - add optional-dependencies --- .../python-modules/fido2/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 5ce442d56bd2..8b5a06c4a1fc 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -3,38 +3,33 @@ buildPythonPackage, cryptography, fetchPypi, - mock, poetry-core, - pyfakefs, + pyscard, pythonOlder, - six, - unittestCheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "fido2"; version = "1.1.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-JhAPIm0SztYhymGYUozhft9nt430KHruEoX+481aqfw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - cryptography - six - ]; + dependencies = [ cryptography ]; - nativeCheckInputs = [ - unittestCheckHook - mock - pyfakefs - ]; + passthru.optional-dependencies = { + pcsc = [ pyscard ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; unittestFlagsArray = [ "-v" ]; From d2f2ba01b33f3255a8c2248af5394d54a3c2695b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 23 May 2024 12:08:53 +0200 Subject: [PATCH 123/163] stirling-pdf: 0.23.1 -> 0.24.6 --- pkgs/by-name/st/stirling-pdf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index dcd4f61d8102..9a7ef232c01f 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.23.1"; + version = "0.24.6"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-71caSM4J0sNMqWX0ok8aO3wdpVcjfrn/yVGLWeO5fOk="; + hash = "sha256-QYoQaRerXLjF3D4S+HSTeaLz12Kxo2emBxSEpWVXUS0="; }; patches = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-8suWAX1+GGMvMUaymZnze7cBL701P/381dGqnyfha7s="; + outputHash = "sha256-w1H1YgMyVjd/9lSRt8zZCRgcYDXarr/C+KBrsjI/jYY="; }; nativeBuildInputs = [ From 1478fde15ff8950d7bca60f1a0d2a857baad55fb Mon Sep 17 00:00:00 2001 From: DamitusThyYeetus123 <108782125+DamitusThyYeetus123@users.noreply.github.com> Date: Fri, 24 May 2024 17:46:32 +1000 Subject: [PATCH 124/163] openttd: 13.4 -> 14.1 (#303969) * openttd: 13.4 -> 14.0 openttd: switch fetchurl to fetchzip openttd: remove fetchurl from input args * openttd: 14.0 -> 14.1 --- pkgs/games/openttd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 69a2c75fa463..268cead62dc4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, cmake, pkg-config +{ lib, stdenv, fetchzip, cmake, pkg-config , SDL2, libpng, zlib, xz, freetype, fontconfig , nlohmann_json, curl, icu, harfbuzz, expat, glib, pcre2 , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "13.4"; + version = "14.1"; - src = fetchurl { + src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8="; + hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; From f90996a6df21f237e11fc772b8e0e0a850f39f6d Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 24 May 2024 10:10:54 +0200 Subject: [PATCH 125/163] CoinMP: backport build fixes for musl-libc (#313603) --- ...terpret_cast-from-NULL-to-C-cast-see.patch | 95 +++++++++++++++++++ ...tatic_cast-for-static-cast-fixes-319.patch | 25 +++++ ...et_cast-of-NULL-to-C-style-case-fixe.patch | 26 +++++ pkgs/development/libraries/CoinMP/default.nix | 18 +++- 4 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch create mode 100644 pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch create mode 100644 pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch diff --git a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch b/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch new file mode 100644 index 000000000000..fccba169df49 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch @@ -0,0 +1,95 @@ +From 0259f2b936ee0d9288ff39c509c69a66f5b13b80 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 11 Mar 2019 16:34:25 +0000 +Subject: [PATCH 1/2] change more reinterpret_cast from NULL to C-cast, see + also #93 + +--- + Clp/src/AbcSimplex.cpp | 48 +++++++++++++++++++++--------------------- + Clp/src/ClpModel.cpp | 2 +- + 2 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/Clp/src/AbcSimplex.cpp b/Clp/src/AbcSimplex.cpp +index 0eacd91e..1715e6d8 100644 +--- a/Clp/src/AbcSimplex.cpp ++++ b/Clp/src/AbcSimplex.cpp +@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberRows,int numberColumns,bool doMore) + // say Steepest pricing + abcDualRowPivot_ = new AbcDualRowSteepest(); + abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest(); +- internalStatus_ = newArray(reinterpret_cast(NULL), ++ internalStatus_ = newArray((unsigned char *)NULL, + sizeArray+maximumNumberTotal_); +- abcLower_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcUpper_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcCost_ = newArray(reinterpret_cast(NULL),sizeArray+maximumNumberTotal_); +- abcDj_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcSolution_ = newArray(reinterpret_cast(NULL),sizeArray+maximumNumberTotal_); +- //fromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- //toExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- scaleFromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- offset_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcPerturbation_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcPivotVariable_ = newArray(reinterpret_cast(NULL),maximumAbcNumberRows_); ++ abcLower_ = newArray((double *)NULL,sizeArray); ++ abcUpper_ = newArray((double *)NULL,sizeArray); ++ abcCost_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_); ++ abcDj_ = newArray((double *)NULL,sizeArray); ++ abcSolution_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_); ++ //fromExternal_ = newArray((int *)NULL,sizeArray); ++ //toExternal_ = newArray((int *)NULL,sizeArray); ++ scaleFromExternal_ = newArray((double *)NULL,sizeArray); ++ offset_ = newArray((double *)NULL,sizeArray); ++ abcPerturbation_ = newArray((double *)NULL,sizeArray); ++ abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_); + // Fill perturbation array + setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_); + fillPerturbation(0,maximumNumberTotal_); +@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberColumns,const int * whichColumn) + subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns; + subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_; + int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_; +- subProblem->internalStatus_ = newArray(reinterpret_cast(NULL), ++ subProblem->internalStatus_ = newArray((unsigned char *)NULL, + sizeArray+subProblem->maximumNumberTotal_); +- subProblem->abcLower_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcUpper_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcCost_ = newArray(reinterpret_cast(NULL),sizeArray+subProblem->maximumNumberTotal_); +- subProblem->abcDj_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcSolution_ = newArray(reinterpret_cast(NULL),sizeArray+subProblem->maximumNumberTotal_); +- //fromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- //toExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->scaleFromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->offset_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcPerturbation_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcPivotVariable_ = newArray(reinterpret_cast(NULL),maximumAbcNumberRows_); ++ subProblem->abcLower_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcUpper_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcCost_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_); ++ subProblem->abcDj_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcSolution_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_); ++ //fromExternal_ = newArray((int *)NULL,sizeArray); ++ //toExternal_ = newArray((int *)NULL,sizeArray); ++ subProblem->scaleFromExternal_ = newArray((double *)NULL,sizeArray); ++ subProblem->offset_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcPerturbation_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_); + subProblem->setupPointers(maximumAbcNumberRows_,numberColumns); + // could use arrays - but for now be safe + int * backward = new int [numberFullColumns+numberRows_]; +diff --git a/Clp/src/ClpModel.cpp b/Clp/src/ClpModel.cpp +index 1fc905c4..83aa3b63 100644 +--- a/Clp/src/ClpModel.cpp ++++ b/Clp/src/ClpModel.cpp +@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename, + writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, + getColLower(), getColUpper(), + objective, +- reinterpret_cast (NULL) /*integrality*/, ++ (const char*)NULL /*integrality*/, + getRowLower(), getRowUpper(), + columnNames, rowNames); + // Pass in array saying if each variable integer +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch b/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch new file mode 100644 index 000000000000..3f1790bd50c3 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch @@ -0,0 +1,25 @@ +From b36a5bd502fbf6b8ad31b6bc35c7bab4aff24313 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 20 Jul 2020 18:39:20 +0200 +Subject: [PATCH] use static_cast for static cast, fixes #319 + +--- + Cbc/src/CbcModel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cbc/src/CbcModel.cpp b/Cbc/src/CbcModel.cpp +index 8603942b..239bf0b4 100644 +--- a/Cbc/src/CbcModel.cpp ++++ b/Cbc/src/CbcModel.cpp +@@ -5357,7 +5357,7 @@ void CbcModel::branchAndBound(int doStatistics) + OsiClpSolverInterface * clpSolver + = dynamic_cast (solver_); + if (clpSolver) +- clpSolver->setFakeObjective(reinterpret_cast (NULL)); ++ clpSolver->setFakeObjective(static_cast (NULL)); + } + #endif + moreSpecialOptions_ = saveMoreSpecialOptions; +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch b/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch new file mode 100644 index 000000000000..b1ca1806b5a9 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch @@ -0,0 +1,26 @@ +From 4571de031e528bc145590d6a1be5ceb87bd8cdb5 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 11 Mar 2019 16:29:20 +0000 +Subject: [PATCH 2/2] change reinterpret_cast of NULL to C-style case, fixes + #93 + +--- + Clp/src/OsiClp/OsiClpSolverInterface.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Clp/src/OsiClp/OsiClpSolverInterface.cpp b/Clp/src/OsiClp/OsiClpSolverInterface.cpp +index 55dd4dcd..a0217d42 100644 +--- a/Clp/src/OsiClp/OsiClpSolverInterface.cpp ++++ b/Clp/src/OsiClp/OsiClpSolverInterface.cpp +@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOfAdventure, int printOut) + if (stopPrinting) { + CoinMessages * messagesPointer = modelPtr_->messagesPointer(); + // won't even build messages +- messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ++ messagesPointer->setDetailMessages(100,10000,(int*)NULL); + } + #endif + } +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 0a2954f4a7dd..7b829305b031 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "CoinMP"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; + patches = [ + # backport build fixes for pkgsMusl.CoinMP + (fetchpatch { + url = "https://github.com/coin-or/Cgl/commit/57d8c71cd50dc27a89eaeb4672499bca55f1fd72.patch"; + extraPrefix = "Cgl/"; + stripLen = 1; + hash = "sha256-NdwXpIL1w6kHVfhBFscTlpriQOfUXx860/4x7pK+698="; + }) + # https://github.com/coin-or/Clp/commit/b637e1d633425ae21ec041bf7f9e06f56b741de0 + ./0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch + # https://github.com/coin-or/Clp/commit/e749fe6b11a90006d744af2ca2691220862e3a59 + ./0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch + # https://github.com/coin-or/Cbc/commit/584fd12fba6a562d49864f44bedd13ee32d06999 + ./0001-use-static_cast-for-static-cast-fixes-319.patch + ]; + enableParallelBuilding = true; env = lib.optionalAttrs stdenv.cc.isClang { From e81da2ef9d893370153bcdc327ff032c9b8e8c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 08:16:52 +0000 Subject: [PATCH 126/163] git-delete-merged-branches: 7.4.0 -> 7.4.1 --- .../version-management/git-delete-merged-branches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix index 08d93bcf69e7..423dc72d24ff 100644 --- a/pkgs/applications/version-management/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-17uFV3pjklqVW5ofeR54mgMh+q3uUCdqZG00Cc+4zFQ="; + sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q="; }; propagatedBuildInputs = with python3Packages; [ From 477f540b11daf72e4ce5565f632a8e9d092f21a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:17:14 +0200 Subject: [PATCH 127/163] python311Packages.weatherflow4py: init at 0.2.20 Module to interact with the WeatherFlow REST API https://github.com/jeeftor/weatherflow4py --- .../python-modules/weatherflow4py/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/weatherflow4py/default.nix diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix new file mode 100644 index 000000000000..d3dd7c8fd6fb --- /dev/null +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -0,0 +1,54 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + marshmallow, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + websockets, +}: + +buildPythonPackage rec { + pname = "weatherflow4py"; + version = "0.2.20"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "jeeftor"; + repo = "weatherflow4py"; + rev = "refs/tags/v${version}"; + hash = "sha256-kkNGhFhciOfhrbjxLM01YC2IRmkdKEbk4EUyDJZJuxU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + dataclasses-json + marshmallow + websockets + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "weatherflow4py" ]; + + meta = with lib; { + description = "Module to interact with the WeatherFlow REST API"; + homepage = "https://github.com/jeeftor/weatherflow4py"; + changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 377d5e2587d1..88c1b07e09e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16378,6 +16378,8 @@ self: super: with self; { weasyprint = callPackage ../development/python-modules/weasyprint { }; + weatherflow4py = callPackage ../development/python-modules/weatherflow4py { }; + weaviate-client = callPackage ../development/python-modules/weaviate-client { }; web3 = callPackage ../development/python-modules/web3 { }; From a6340441a8158671ad01fa6c47415b8ea659934b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:17:39 +0200 Subject: [PATCH 128/163] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b9fc857f211c..5af7ec264860 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5510,7 +5510,8 @@ pyweatherflowudp ]; "weatherflow_cloud" = ps: with ps; [ - ]; # missing inputs: weatherflow4py + weatherflow4py + ]; "weatherkit" = ps: with ps; [ apple-weatherkit ]; @@ -6623,6 +6624,7 @@ "waze_travel_time" "weather" "weatherflow" + "weatherflow_cloud" "weatherkit" "webhook" "webostv" From 6033cd12606fab23a30539bf2da7d98ed6d82506 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 08:21:57 +0000 Subject: [PATCH 129/163] python311Packages.panel: 1.4.1 -> 1.4.3 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 30c6c52c6780..b497d6de4cd7 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.4.1"; + version = "1.4.3"; format = "wheel"; @@ -26,7 +26,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-x7ywbO2uY1r06bDXV/+X/7cs9f6jFawyDHeo8pLWZVE="; + hash = "sha256-iIBQ9UEcmO6q3bS2faFK7tY4mPVaoIWS7bMzKLzkfWw="; dist = "py3"; python = "py3"; }; From 0eb6ab0e62443e52be4f55159538a78c60205abd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:24:19 +0200 Subject: [PATCH 130/163] python312Packages.pyswitchbot: 0.45.0 -> 0.46.1 Diff: https://github.com/Danielhiversen/pySwitchbot/compare/refs/tags/0.45.0...0.46.1 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.46.1 --- .../development/python-modules/pyswitchbot/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 335f0b8239a7..ce0b59dcfa86 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,21 +15,21 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.45.0"; + version = "0.46.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-lQVUHZvAZ4J0DLlUl30dSz2wwXKb9MK5prkXvub0yNI="; + hash = "sha256-fiWjChr7NATkO6jNBlt5kqxaLSSZWcdd7TjQwMP6klY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bleak bleak-retry-connector boto3 From aec8c8fc095a6046584408cf41037130300dc5e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:42:03 +0200 Subject: [PATCH 131/163] python312Packages.requests-file: 2.0.0 -> 2.1.0 Diff: https://github.com/dashea/requests-file/compare/refs/tags/2.0.0...2.1.0 Changelog: https://github.com/dashea/requests-file/blob/2.1.0/CHANGES.rst --- .../python-modules/requests-file/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index 2c57e46c5696..d76cdfbdaefb 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -1,21 +1,26 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, setuptools, setuptools-scm, pytestCheckHook, + pythonOlder, requests, }: buildPythonPackage rec { pname = "requests-file"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-IMWTFinFWP2lZsrMEM/izVAkM+Yo9WjDTIDZagzJWXI="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dashea"; + repo = "requests-file"; + rev = "refs/tags/${version}"; + hash = "sha256-JtdtE44yiw2mLMZ0bJv0QiGWb7f8ywPLF7+BUufh/g4="; }; build-system = [ @@ -23,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Transport adapter for fetching file:// URLs with the requests python library"; homepage = "https://github.com/dashea/requests-file"; + changelog = "https://github.com/dashea/requests-file/blob/${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 0a5686ddce5e14c6642cb19580bf50c4b911c492 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:45:21 +0200 Subject: [PATCH 132/163] python312Packages.asteval: 0.9.32 -> 0.9.33 Diff: https://github.com/lmfit/asteval/compare/refs/tags/0.9.32...0.9.33 Changelog: https://github.com/lmfit/asteval/releases/tag/0.9.33 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index d625dfe3448e..e9eed2ac38e0 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.32"; + version = "0.9.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-3eML5lEKEUlp3Fwdgvk31an83x8no5ichskKvzYJDsE="; + hash = "sha256-j07HH84cn2AA5DyMcM7sXiBubCjZP67RJXVcErMPyBk="; }; postPatch = '' From e296c3df5bed4f62b5a1180b5b0b8109b37b94ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:48:07 +0200 Subject: [PATCH 133/163] python312Packages.deezer-python: 6.1.1 -> 6.2.0 Diff: https://github.com/browniebroke/deezer-python/compare/refs/tags/v6.1.1...v6.2.0 Changelog: https://github.com/browniebroke/deezer-python/releases/tag/v6.2.0 --- .../python-modules/deezer-python/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 812f9eba2469..0bd136e6fceb 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "6.1.1"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,15 +23,20 @@ buildPythonPackage rec { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-pzEXiWKMP2Wqme/pqfTMHxWH/4YcCS6u865wslHrUqI="; + hash = "sha256-Y1y8FBxpGpNIWCZbel9fdGLGC9VM9h1BvHtUxCZxp/A="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=deezer" "" + --replace-fail " --cov=deezer" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; + + dependencies = [ + requests + tornado + ]; nativeCheckInputs = [ environs @@ -40,11 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = [ - requests - tornado - ]; - pythonImportsCheck = [ "deezer" ]; disabledTests = [ From 05e3b4fa4d4f347355a7489366f77afa46c82f34 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 24 May 2024 12:55:30 +0800 Subject: [PATCH 134/163] uv: build with python builder to include python module --- pkgs/by-name/uv/uv/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 7b2b589ac5db..ad7c4d67698d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -3,16 +3,19 @@ , darwin , fetchFromGitHub , installShellFiles +, libiconv , openssl , pkg-config +, python3Packages , rustPlatform , stdenv , nix-update-script }: -rustPlatform.buildRustPackage rec { +python3Packages.buildPythonApplication rec { pname = "uv"; version = "0.1.45"; + pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; @@ -21,7 +24,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PJeUndpD7jHcpM66dMIyXpDx95Boc01rzovS0Y7io7w="; }; - cargoLock = { + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; @@ -33,14 +36,19 @@ rustPlatform.buildRustPackage rec { cmake installShellFiles pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook ]; buildInputs = [ + libiconv openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + dontUseCmakeConfigure = true; + cargoBuildFlags = [ "--package" "uv" ]; # Tests require network access @@ -58,6 +66,10 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/uv --generate-shell-completion zsh) ''; + pythonImportsCheck = [ + "uv" + ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { From 9d1625dd1bd85bd4aaa98fda5e2c052acaf4723d Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 24 May 2024 12:57:38 +0800 Subject: [PATCH 135/163] python3Packages.uv: init --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 150965f1d205..b76852344036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16564,6 +16564,10 @@ self: super: with self; { utils = callPackage ../development/python-modules/utils { }; + uv = toPythonModule (pkgs.uv.override { + python3Packages = self; + }); + uvcclient = callPackage ../development/python-modules/uvcclient { }; uvicorn = callPackage ../development/python-modules/uvicorn { }; From 99763fa5ad5825def5fe1e16e306fe0d8f0ba3ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 09:15:40 +0000 Subject: [PATCH 136/163] xray: 1.8.11 -> 1.8.13 --- pkgs/tools/networking/xray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 56803c3dc312..5c87d770313e 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.11"; + version = "1.8.13"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-uOE+Gp42WsqSA5/kQRjk+BKq9igmZCrq/9v1BJMXwFc="; + hash = "sha256-+npmj8Cz3/XTabAXL+J02EmyvPwtwz9TKazd9z9emwI="; }; - vendorHash = "sha256-7E/H8ctv9BU59wPmywNeDhx1R4mqrjpM9E+Hz+AaPlk="; + vendorHash = "sha256-55mNCD3p6Xy6S1w8WzJwxKttjEkEjJZcGTLQdWl1bQQ="; nativeBuildInputs = [ makeWrapper ]; From 5dad550b1ff3621bfcba3bf4024cce1066773a72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 09:15:50 +0000 Subject: [PATCH 137/163] libui-ng: 4.1-unstable-2024-05-03 -> 4.1-unstable-2024-05-19 --- pkgs/by-name/li/libui-ng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 80e0589ac2c1..51f73ecb6956 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libui-ng"; - version = "4.1-unstable-2024-05-03"; + version = "4.1-unstable-2024-05-19"; src = fetchFromGitHub { owner = "libui-ng"; repo = "libui-ng"; - rev = "56f1ad65f0f32bb1eb67a268cca4658fbe4567c1"; - hash = "sha256-wo4iS/a1ErdipFDPYKvaGpO/JGtk6eU/qMLC4eUoHnA="; + rev = "49b04c4cf8ae4d3e38e389f446ef75170eb62762"; + hash = "sha256-W9LnUBUKwx1x3+BEeUanisBGR2Q4dnbcMM5k8mCondM="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' From e976b8f9ae89df713ccf7a21bcc421b9c51be799 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 09:49:13 +0000 Subject: [PATCH 138/163] blackfire: 2.28.2 -> 2.28.3 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index de6894f6ebe3..eacae2aed8f7 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.2"; + version = "2.28.3"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "ECUWjBlWr2QSvYvzep7MVOrufCRTgLibkmOHAEhg36w="; + sha256 = "nku9F29PjoPZL/PppK6HuC5Mk7TEWv4iAUVgoiYmaG8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "cU9WpD+mIcAn1eYc9n6rGi/jML5F7g6BoXtfWAI4P+Y="; + sha256 = "xZfjCn0HXqw0fBrZEKc4X2m8aTEiXOFjSEpSdFq9Wvc="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "Ej2uFxl8gIW6V7hEGauRWhfdevxoAb5s+yyQi1TYQWQ="; + sha256 = "05aI2Ao0++bTiwt6TygY/yvLkmByH604t8EX8T2bGZs="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "brcOya9uqicGXGVRggYP6yiOriho7zrbO5b3F1XMW+M="; + sha256 = "ICG0SGBzpSQoug+5kl7kQ05Q0+0BAKdhRdUUwxgPEb4="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "M90t91STPtLnW3yd5gvhNC0RQ8aDLPmdXV7dZ03gp/4="; + sha256 = "qbhFK8Oe7565sOQMGE68TlyYN1B56kk2ibiBiDWw7VE="; }; }; From f16a0602c438ba568b386cac088df3d6e441a8ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 10:41:22 +0000 Subject: [PATCH 139/163] wdt: 1.27.1612021-unstable-2024-02-05 -> 1.27.1612021-unstable-2024-05-21 --- pkgs/applications/networking/sync/wdt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 34eef64b9f79..ccf3e05138f7 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2024-02-05"; + version = "1.27.1612021-unstable-2024-05-21"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "d94b2d5df6f1c803f9f3b8ed9247b752fa853865"; - sha256 = "sha256-9TeJbZZq9uQ6KaEBFGDyIGcXgxi2y1aj55vxv5dAIzw="; + rev = "6263fee3bebc8bb0012e095723170f70b99ff67d"; + sha256 = "sha256-CxwRfjPkR7d+Poe+8+TbBGcsK90EwupCyLqUkxUlITs="; }; nativeBuildInputs = [ cmake ]; From 80ecf81052f876de0bee462283e3a7002211b145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 18:53:46 +0000 Subject: [PATCH 140/163] matrix-sliding-sync: 0.99.17 -> 0.99.18 --- pkgs/servers/matrix-synapse/sliding-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index b0fc3c27f9c2..eaaa3f2292d1 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.17"; + version = "0.99.18"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-tzhz2Jlhvn2blO5jdWNS++V28kNXmmg+a2BU7g5zTx0="; + hash = "sha256-zqqCgmzea25H1wcvgIb4hIV3maReL9tmNxvo9JsSlZk="; }; vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; From 9b88df27e86e765eef6c258f48d89784e0af5bc0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 24 May 2024 19:05:50 +0800 Subject: [PATCH 141/163] pantheon.elementary-calculator: 2.0.3 -> 8.0.0 https://github.com/elementary/calculator/compare/2.0.3...8.0.0 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index dda264380dbc..12857b8946a7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-VPxCW2lVA/nS2aJsjLgkuEM9wnAzyEr864XY8tfLQAY="; + sha256 = "sha256-QEs83hSv9Kupj2p/OTnuPZsC8tdm+IqgpeObBVrPRas="; }; nativeBuildInputs = [ From 0e1da012ded69bf20ef78fff9486a0cc16f21a34 Mon Sep 17 00:00:00 2001 From: ErrorNoInternet Date: Fri, 24 May 2024 19:08:29 +0800 Subject: [PATCH 142/163] nordic: 2.2.0-unstable-2024-02-20 -> 2.2.0-unstable-2024-05-24 --- pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index ce17fd9ffd8d..13d352c6b3e1 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -10,70 +10,70 @@ stdenvNoCC.mkDerivation rec { pname = "nordic"; - version = "2.2.0-unstable-2024-02-20"; + version = "2.2.0-unstable-2024-05-24"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "58d5a8e10ae068b98a63e6de2791e289f417842d"; - hash = "sha256-Z3e7DoakK6f+UMBr78gZ+NJPb5vuJCfDgPRYywFDYeg="; + rev = "2f6b72b7b6d7112bb147a5adeca307631dd698cb"; + hash = "sha256-4GNEJTAS6EAPYyaNOZS1lGu67nobGmMOHoq8I5WaPcA="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "cb7d95bd5438728f30f361a888dfb33b7f6ad28c"; - hash = "sha256-ZWGmDiXjEt0UuALyw7cjTYgdw9kdJJKc0vkclbZkBvo="; + rev = "d92b503cdabb4cf263de4c3fd9afba889c65aad1"; + hash = "sha256-foCWcKNdk9S1MijJOuw8jFV4gnDSNWmTjgSCU9GefzE="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "37b86a30ad3e048f87a689f2813aa28644035fa8"; - hash = "sha256-+O8+30H6humVQTwgFL3uQkeo5gPYrokpAKbT56PX6YQ="; + rev = "b76c48252c9dc6171cccf63c0c412b9afe7fa89c"; + hash = "sha256-q/duyEin377J1cxD5+uXlEbPN/S27ht2es/02wKoiEY="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "926b215d14394ff043f2d2969e730759af7acd86"; - hash = "sha256-yR0DfmUW1rr38Zbwtr7TUYL6z8vTNyoj0vEhphbZieU="; + rev = "b8b16b451bf5fcfada98a92682a6ff97d93fc36f"; + hash = "sha256-959P2xdpCLhNRedoakMiHXzj+H4SWX1Lb9w6yYRzGds="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "1ae59d40ba8342fc14f3a55a2fb37446a8d10880"; - hash = "sha256-tFIXPP5Ohw8atNIqvMtB7sLka+/tw+aSbjMdzKfI9r0="; + rev = "c45681eca7fce4c129063a0aae727d42b570fcfd"; + hash = "sha256-8a4pMkyGt+WIVXLSsLKbxCP9i4RdZKX5lvwZB+BemSY="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "aaaa5dab0517f182a85a75d457da70d22e577b26"; - hash = "sha256-J/nti2jxQ0VfTbp5WfrE0CN6Pvfg1edplL6/QPKUBzc="; + rev = "b07b6450ff2389f88ef5ad980a1ead47071b1d63"; + hash = "sha256-+o46apK051UH6GbG/ugSgxI212MWEnYaVlDK9rWqPMU="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "733d5ea57c6ecd8209ec0a928029e28b3f54f83d"; - hash = "sha256-y3ge0DF0SdKFjH+mZdHDpK3YG7Ng3rN0y0Er2WBC6Sc="; + rev = "bc3e7554ab8e8d94e978691054b1b062696eb688"; + hash = "sha256-tJX/oTEp/9pmzrINBWrnhS9n8JR40T1C0A4LhRLWU9A="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "667dfe4f6e8157f30a4e0ea5dc1d17438520d6cf"; - hash = "sha256-p7bY1r8Ik+jsIyjR75UFHw8XuiGz5LmT09txBLyZpx4="; + rev = "26b44080c2dbd1a9b576a24d1b14ae01b98519d0"; + hash = "sha256-5gGiBL7ZKFSPZtnikfrdvrWKG9RkIHdPyWdHYnmSTvg="; name = "Nordic-Polar-standard-buttons"; }) ]; From 07fd54a4a230b6a52b86b3b6775cfcf1fd91d94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 24 May 2024 12:59:53 +0200 Subject: [PATCH 143/163] dbeaver-bin: add update script --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 ++ pkgs/by-name/db/dbeaver-bin/update.sh | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100755 pkgs/by-name/db/dbeaver-bin/update.sh diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index ddf67faca43c..65aaff55a7a4 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -61,6 +61,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://dbeaver.io/"; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh new file mode 100755 index 000000000000..ad09144f9a4b --- /dev/null +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq + +latestVersion=$(curl "https://api.github.com/repos/dbeaver/dbeaver/tags" | jq -r '.[0].name') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; dbeaver-bin.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for i in \ + "x86_64-linux linux.gtk.x86_64-nojdk.tar.gz" \ + "aarch64-linux linux.gtk.aarch64-nojdk.tar.gz" +do + set -- $i + prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") + hash=$(nix-hash --type sha256 --to-sri $prefetch) + + update-source-version dbeaver-bin 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=$1 + update-source-version dbeaver-bin $latestVersion $hash --system=$1 +done From 237485a9dbef337fc08f9a3297bb2d1b58342749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 24 May 2024 12:59:12 +0200 Subject: [PATCH 144/163] dbeaver-bin: fix aarch64 hash mismatch --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 65aaff55a7a4..c4998ec7ce90 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; hash = selectSystem { x86_64-linux = "sha256-q6VIr55hXn47kZrE2i6McEOfp2FBOvwB0CcUnRHFMZs="; - aarch64-linux = "sha256-CQg2+p1P+Bg1uFM1PMTWtweS0TNElXTP7tI7D5WxixM="; + aarch64-linux = "sha256-Xn3X1C31UALBAsZIGyMWdp0HNhJEm5N+7Go7nMs8W64="; }; in fetchurl { From 6a289d26e070713b866efed5b5f249ac11673467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 May 2024 12:24:13 +0100 Subject: [PATCH 145/163] cachix: 1.7.3 -> 1.7.4 --- .../haskell-modules/configuration-common.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e99af26502f..552e5309cdb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -423,22 +423,22 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.3"; + version = "1.7.4"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.3"; - sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460="; + rev = "v1.7.4"; + sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.3"; + version = "1.7.4"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.3"; - sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460="; + rev = "v1.7.4"; + sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe @@ -448,13 +448,6 @@ self: super: { [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.buildPackages.pkg-config) - (addBuildDepend self.immortal) - # should be removed once hackage packages catch up - (addBuildDepend self.crypton) - (addBuildDepend self.generic-lens) - (addBuildDepend self.amazonka) - (addBuildDepend self.amazonka-core) - (addBuildDepend self.amazonka-s3) ] )); From aa84310b9b356760b4d3b0a7387cdaf2d2ca22c7 Mon Sep 17 00:00:00 2001 From: Andrey Shaat <104313094+ASHGOLDOFFICIAL@users.noreply.github.com> Date: Fri, 24 May 2024 17:12:23 +0500 Subject: [PATCH 146/163] maintainers: add ashgoldofficial (#314241) * maintainers: add ashgoldofficial * maintainers: add ashgoldofficial --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1f164f5b9fac..2dd8f636e90b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1787,6 +1787,12 @@ githubId = 816777; name = "Ashley Gillman"; }; + ashgoldofficial = { + email = "ashley.goldwater@gmail.com"; + github = "ASHGOLDOFFICIAL"; + githubId = 104313094; + name = "Andrey Shaat"; + }; ashkitten = { email = "ashlea@protonmail.com"; github = "ashkitten"; From cc8f786c3b399c37442a562df17f6bfa8401ed20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 12:06:06 +0000 Subject: [PATCH 147/163] python311Packages.scikit-hep-testdata: 0.4.44 -> 0.4.45 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index c3c76512492b..0fe761ac660c 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.44"; + version = "0.4.45"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7a1F7180mnbMiEwRWzDQt2EhRsleSoVhWtTc+5DR/2o="; + hash = "sha256-Kpn7Z+LJPZ9rNxQLXFtACJvfpRdDs58cy+1QlbbODLA="; }; nativeBuildInputs = [ setuptools-scm ]; From ccd107e02da6a87a7ac53d69e40d7df22008625a Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 24 May 2024 20:57:53 +0800 Subject: [PATCH 148/163] python3Packages.tokenlib: 0.3.1 -> 2.0.0 --- .../python-modules/tokenlib/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 1b0641574eec..59a19b81a3f9 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -4,25 +4,40 @@ fetchFromGitHub, requests, webob, + fetchpatch, + setuptools, }: buildPythonPackage rec { pname = "tokenlib"; - version = "0.3.1"; - format = "setuptools"; + version = "2.0.0"; + + pyproject = true; + build-system = [ setuptools ]; src = fetchFromGitHub { owner = "mozilla-services"; - repo = pname; - rev = "refs/tags/${version}"; - sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; + repo = "tokenlib"; + rev = "${version}"; + hash = "sha256-+KybaLb4XAcuBARJUhL5gK71jfNMb8YL8dV5Vzf7yXI="; }; - propagatedBuildInputs = [ + patches = [ + # fix wrong function name in tests + # See https://github.com/mozilla-services/tokenlib/pull/9 + (fetchpatch { + url = "https://github.com/mozilla-services/tokenlib/pull/9/commits/cb7ef761f82f36e40069bd1b8684eec05af3b8a3.patch"; + hash = "sha256-hc+iydxZu9bFqBD0EQDWMkRs2ibqNAhx6Qxjh6ppKNw="; + }) + ]; + + dependencies = [ requests webob ]; + pythonImportsCheck = [ "tokenlib" ]; + meta = with lib; { homepage = "https://github.com/mozilla-services/tokenlib"; description = "Generic support library for signed-token-based auth schemes"; From 3c9d14bdabc35aab53fb93de49a28566a14723a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 14:46:44 +0000 Subject: [PATCH 149/163] licensure: 0.3.2 -> 0.4.0 --- pkgs/by-name/li/licensure/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 476b5c18629d..c569e8e66d2c 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "licensure"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "chasinglogic"; repo = "licensure"; rev = version; - hash = "sha256-rOD2H9TEoZ8JCjlg6feNQiAjvroVGqrlOkDHNZKXDoE="; + hash = "sha256-y72+k3AaR6iT99JJpGs6WZAEyG6CrOZHLqKRj19gLs0="; }; - cargoHash = "sha256-ku0SI14pZmbhzE7RnK5kJY6tSMjRVKEMssC9e0Hq6hc="; + cargoHash = "sha256-75UNzC+8qjm0A82N63i8YY92wCNQccrS3kIqDlR8pkc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl git gitls ]; From 3e8ec09e4a37707b323043968675747233109016 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Thu, 2 May 2024 12:40:51 +0200 Subject: [PATCH 150/163] basedpyright: init at 1.12.3 use nix-update basedpyright: 1.11.0 -> 1.12.1 basedpyright: 1.12.2 -> 1.12.2 Diff: https://github.com/detachhead/basedpyright/compare/v1.12.2...v1.12.2 Changelog: https://github.com/detachhead/basedpyright/releases/tag/1.12.2 basedpyright: 1.12.2 -> 1.12.3 Changelog: https://github.com/DetachHead/basedpyright/compare/v1.12.2...v1.12.3 --- .../by-name/ba/basedpyright/package-lock.json | 193 ++++++++++++++++++ pkgs/by-name/ba/basedpyright/package.nix | 89 ++++++++ 2 files changed, 282 insertions(+) create mode 100644 pkgs/by-name/ba/basedpyright/package-lock.json create mode 100644 pkgs/by-name/ba/basedpyright/package.nix diff --git a/pkgs/by-name/ba/basedpyright/package-lock.json b/pkgs/by-name/ba/basedpyright/package-lock.json new file mode 100644 index 000000000000..dee0ab51a521 --- /dev/null +++ b/pkgs/by-name/ba/basedpyright/package-lock.json @@ -0,0 +1,193 @@ +{ + "name": "pyright-root", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "pyright-root", + "hasInstallScript": true, + "dependencies": { + "glob": "^7.2.3", + "jsonc-parser": "^3.2.1" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + }, + "dependencies": { + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + } +} diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix new file mode 100644 index 000000000000..b22acd3544ff --- /dev/null +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -0,0 +1,89 @@ +{ + lib, + nix-update-script, + buildNpmPackage, + fetchFromGitHub, + runCommand, + jq, +}: + +let + version = "1.12.3"; + + src = fetchFromGitHub { + owner = "detachhead"; + repo = "basedpyright"; + rev = "v${version}"; + hash = "sha256-n4jiKxkXGCKJkuXSsUktsiJQuCcZ+D/RJH/ippnOVw8="; + }; + + patchedPackageJSON = runCommand "package.json" { } '' + ${jq}/bin/jq ' + .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) + | .scripts = { } + ' ${src}/package.json > $out + ''; + + pyright-root = buildNpmPackage { + pname = "pyright-root"; + inherit version src; + npmDepsHash = "sha256-63kUhKrxtJhwGCRBnxBfOFXs2ARCNn+OOGu6+fSJey4="; + dontNpmBuild = true; + postPatch = '' + cp ${patchedPackageJSON} ./package.json + cp ${./package-lock.json} ./package-lock.json + ''; + installPhase = '' + runHook preInstall + cp -r . "$out" + runHook postInstall + ''; + }; + + pyright-internal = buildNpmPackage { + pname = "pyright-internal"; + inherit version src; + sourceRoot = "${src.name}/packages/pyright-internal"; + npmDepsHash = "sha256-ba7GzkKrXps4W1ptv+j9fMMXwpi30ymbqgIJ64PaZ1g="; + dontNpmBuild = true; + # FIXME: Remove this flag when TypeScript 5.5 is released + npmFlags = [ "--legacy-peer-deps" ]; + installPhase = '' + runHook preInstall + cp -r . "$out" + runHook postInstall + ''; + }; +in +buildNpmPackage rec { + pname = "basedpyright"; + inherit version src; + + sourceRoot = "${src.name}/packages/pyright"; + npmDepsHash = "sha256-9V1T6w1G1SZi19dgRaFmv+Vy71hmQR+L6cDjQZJrGy8="; + + postPatch = '' + chmod +w ../../ + ln -s ${pyright-root}/node_modules ../../node_modules + chmod +w ../pyright-internal + ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules + ''; + + postInstall = '' + mv "$out/bin/pyright" "$out/bin/basedpyright" + mv "$out/bin/pyright-langserver" "$out/bin/basedpyright-langserver" + ''; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}"; + description = "Type checker for the Python language"; + homepage = "https://github.com/detachhead/basedpyright"; + license = lib.licenses.mit; + mainProgram = "basedpyright"; + maintainers = with lib.maintainers; [ kiike ]; + }; +} From 2198797b30b3d251d37a2d12c44f5e6c61dd4418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 24 May 2024 16:59:27 +0200 Subject: [PATCH 151/163] codeberg-cli: fix darwin build --- pkgs/by-name/co/codeberg-cli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 074d7bc2c8eb..d058e72b4e80 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { [ d.CoreServices d.Security + d.SystemConfiguration ] ); From 02f2a4b372e172ab02e6d2d53fa605f156cc4a47 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 24 May 2024 17:00:54 +0200 Subject: [PATCH 152/163] python311Packages.bambi: mark as broken --- pkgs/development/python-modules/bambi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index 9f051f511c4d..f2447b2c9d12 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -87,5 +87,7 @@ buildPythonPackage rec { changelog = "https://github.com/bambinos/bambi/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; + # https://github.com/NixOS/nixpkgs/issues/310940 + broken = true; }; } From ee9bda4d6bce4c395df0b078a078f4e047baee7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 15:31:09 +0000 Subject: [PATCH 153/163] phpdocumentor: 3.4.3 -> 3.5.0 --- pkgs/by-name/ph/phpdocumentor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index e0eeef5935a3..710a0cf4dce3 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpdocumentor"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; rev = "v${finalAttrs.version}"; - hash = "sha256-NCBCwQ8im6ttFuQBaG+bzmtinf+rqNnbogcK8r60dCM="; + hash = "sha256-//erxY9ryJne/HZLB1l4SwF3EsQ1vmgSe4pZ5xSieIU="; }; - vendorHash = "sha256-/TJ/CahmOWcRBlAsJDzWcfhlDd+ypRapruFT0Dvlb1w="; + vendorHash = "sha256-VNlAzWueF7ZXBpr9RrJghMPrAUof7f1DCh1osFIwFfs="; # Needed because of the unbound version constraint on phpdocumentor/json-path composerStrictValidation = false; From 538efc87547170559e722d5ba39e0aafd8a95230 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 15:51:14 +0000 Subject: [PATCH 154/163] php81Packages.phpstan: 1.11.1 -> 1.11.2 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 1016e27d8322..dc44afc3bc97 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-CMIWxxryDDA38uyGl3SIooliU0ElAY1iAqnexn2Uq58="; + hash = "sha256-g1YIFqNo1UTmNrgS+lAkDXSnKsmhLj+Itoi3tgxdx4Y="; }; - vendorHash = "sha256-CSkwBBV6b2inpQu4TKBR23Du11mzr3rV6GtprzHAOgQ="; + vendorHash = "sha256-sFV22B5ohbDvclb1nuvpMhhfKjEe7FAFCqWfIguAY8M="; composerStrictValidation = false; meta = { From 07cf69ee5732e1a95e0e915e8ccef02469bb1ba3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 16:14:20 +0000 Subject: [PATCH 155/163] qovery-cli: 0.92.8 -> 0.93.1 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index d51b0e716c97..6db291f236d5 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.92.8"; + version = "0.93.1"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-8QDuYb6NzoX9c+gROR5ECqAp/pfwFtPPNMaNiWGPtD4="; + hash = "sha256-wJivWE0B2u3xNhD9mAbHFCxl3aKv6YfWxJ/8UOV4E70="; }; - vendorHash = "sha256-6gjYnDv4L2AO47uWcp/MySX9i3IDMIWQUvgglxPCvGo="; + vendorHash = "sha256-wGgzVtQc4e0thiM9fJb7BxJl348wCDZvPCx0+Qlw0mQ="; nativeBuildInputs = [ installShellFiles ]; From f41e387c26089989ab31d68210f9ba217e0ad4ae Mon Sep 17 00:00:00 2001 From: Vladimir Timofeenko <9886026+VTimofeenko@users.noreply.github.com> Date: Fri, 24 May 2024 09:24:56 -0700 Subject: [PATCH 156/163] nixos/frigate: drop BindPaths from systemd service (#309341) Migrations have been working well even with misconfigured BindPaths => removing --- nixos/modules/services/video/frigate.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 0e6bde447c03..c3ec4a3c76c3 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -427,10 +427,6 @@ in PrivateTmp = true; CacheDirectory = "frigate"; CacheDirectoryMode = "0750"; - - BindPaths = [ - "/migrations:${cfg.package}/share/frigate/migrations:ro" - ]; }; }; }; From e597be5687be815ecb9616eec76ff63200b3b03b Mon Sep 17 00:00:00 2001 From: a-kenji Date: Fri, 24 May 2024 19:02:02 +0200 Subject: [PATCH 157/163] gh-dash: 3.14.0 -> 4.0.0 --- pkgs/tools/misc/gh-dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 82201e0bd53d..a5435c2991fb 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.14.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-6YPUGOQ2KBfu+3XAgub9Cpz0QBrU2kV+gq13tUtzY+w="; + hash = "sha256-mF7n4nrsKyp46U4jar+ioUKwpaETiDt4Ol/5DZrjvCs="; }; vendorHash = "sha256-jCf9FWAhZK5hTzyy8N4r5dfUYTgESmsn8iKxCccgWiM="; From 30fc5f18f4036c88f69b0df4709a74d148602784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 17:34:06 +0000 Subject: [PATCH 158/163] warp-terminal: 0.2024.05.14.08.01.stable_04 -> 0.2024.05.21.16.09.stable_02 --- pkgs/by-name/wa/warp-terminal/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 9940ba44c08d..5fc74e0d01d0 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-XRwnT73kCv4mO2DKkuFQ8qwpIIH9iyRTrJEZUi6tscU=", - "version": "0.2024.05.14.08.01.stable_04" + "hash": "sha256-cK82M7vOjtDdfWbaYzbHHkcqwF8L3crVA9jJotnPpX4=", + "version": "0.2024.05.21.16.09.stable_02" }, "linux": { - "hash": "sha256-16ZMzvdkAAf9xSiL7TCaiJwEMd+jbOYIL/xiF2Todbw=", - "version": "0.2024.05.14.08.01.stable_04" + "hash": "sha256-chIrRzsxjFYS4UFYCTy04cdwSyCq/+/WiKBAmV9OdLs=", + "version": "0.2024.05.21.16.09.stable_02" } } From ceb8e1aaaeecd9f7722ad08d97f74c3c12d8ee90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 18:22:55 +0000 Subject: [PATCH 159/163] morgen: 3.4.2 -> 3.4.3 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5f6c9ea5c119..4bd45374ece2 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-N9G9yfUhKZd3dcsyBKODL6vnMqQgLk2DRQ+YZAYdPks="; + hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; }; nativeBuildInputs = [ From 0fc86c4a7a9f7f2180db471583aad9ac725508ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 24 May 2024 21:05:13 +0200 Subject: [PATCH 160/163] lemmy-server: fix darwin build --- pkgs/servers/web-apps/lemmy/server.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 4f605b0b2dbd..d4d44c473f5c 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -6,6 +6,7 @@ , postgresql , libiconv , Security +, SystemConfiguration , protobuf , rustfmt , nixosTests @@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec { cargoHash = pinData.serverCargoHash; buildInputs = [ postgresql ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; # Using OPENSSL_NO_VENDOR is not an option on darwin # As of version 0.10.35 rust-openssl looks for openssl on darwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8126fabe5d66..33735423c67a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25837,7 +25837,7 @@ with pkgs; leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { From 0e20d12d8c6c217a3a00e6df08a240851f1177a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 19:43:17 +0000 Subject: [PATCH 161/163] python311Packages.life360: 7.0.0 -> 7.0.1 --- pkgs/development/python-modules/life360/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index d8774ff34453..7e001e79b5f5 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "life360"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = "life360"; rev = "refs/tags/v${version}"; - hash = "sha256-+fvzZ1IsPsXLTcfR7vrE4n1nF7CdvoL4BzDJMsDBZVY="; + hash = "sha256-GkCs479lXcnCvb5guxyc+ZuZdiH4n8uD2VbkC+yijgg="; }; build-system = [ setuptools ]; From 8d5bbaab45abab9a11eab10797a695507c72a249 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 24 May 2024 22:20:22 +0200 Subject: [PATCH 162/163] ungoogled-chromium: 125.0.6422.76-1 -> 125.0.6422.112-1 https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_23.html This update includes 1 security fix. Google is aware that an exploit for CVE-2024-5274 exists in the wild. CVEs: CVE-2024-5274 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index fe0e6ec6c41c..facc0227abd0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-04-10"; }; ungoogled-patches = { - hash = "sha256-bGc8hQnuiGot0kThSAi4AFAwmvrNPs1bR7oZx2XoAGo="; - rev = "125.0.6422.76-1"; + hash = "sha256-vHnXIrDdHGIe8byb41CiEWq3FPTecKg006dU7+iESKA="; + rev = "125.0.6422.112-1"; }; }; - hash = "sha256-m7WeRloS6tGH2AwhkNicpqThUQmS+9w2xFS2dbmu1vw="; - version = "125.0.6422.76"; + hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU="; + version = "125.0.6422.112"; }; } From 7d5ac5ce9553372a445be60bf310709ef64c8b99 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 24 May 2024 21:47:33 +0000 Subject: [PATCH 163/163] miniupnpc: add free.fr source mirror this is verified by internet archive: for at least 24h the miniupnp.tuxfamily.org mirror has been unreachable. --- pkgs/tools/networking/miniupnpc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index f9b8f0c536fa..0b766ea87227 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { version = "2.2.7"; src = fetchurl { - url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; + urls = [ + "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz" + "http://miniupnp.free.fr/files/${pname}-${version}.tar.gz" + ]; sha256 = "sha256-sMOicFaED9DskyilqbrD3F4OxtLoczNJz1d7CqHnCsE="; };