From f582ed985baa49c970a0b823567263cc08e6007c Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Wed, 29 Nov 2023 09:15:48 -0800 Subject: [PATCH 01/35] argocd-vault-plugin: fix version output --- .../security/argocd-vault-plugin/default.nix | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index bd6e4c15fa27..934be7d09942 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -1,4 +1,9 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, argocd-vault-plugin +}: buildGoModule rec { pname = "argocd-vault-plugin"; @@ -13,9 +18,23 @@ buildGoModule rec { vendorHash = "sha256-0PrGrcS8Gx0cVImGrlmXlycFgWCTLjg2ISi0OhYoPpw="; + ldflags = [ + "-X=github.com/argoproj-labs/argocd-vault-plugin/version.Version=v${version}" + "-X=github.com/argoproj-labs/argocd-vault-plugin/version.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/argoproj-labs/argocd-vault-plugin/version.CommitSHA=unknown" + ]; + # integration tests require filesystem and network access for credentials doCheck = false; + doInstallCheck = true; + + passthru.tests.version = testers.testVersion { + package = argocd-vault-plugin; + command = "argocd-vault-plugin version"; + version = "argocd-vault-plugin v${version} (unknown) BuildDate: 1970-01-01T00:00:00Z"; + }; + meta = with lib; { homepage = "https://argocd-vault-plugin.readthedocs.io"; changelog = "https://github.com/argoproj-labs/argocd-vault-plugin/releases/tag/v${version}"; From 066e25aed02d7dee703584c8044c4b67f2d805fc Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sun, 17 Dec 2023 17:51:43 +0100 Subject: [PATCH 02/35] dual-function-keys: 1.4.0 -> 1.5.0 --- .../inputmethods/interception-tools/dual-function-keys.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 34dde4dc7429..707abf9ec9c7 100644 --- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dual-function-keys"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { group = "interception"; owner = "linux/plugins"; repo = pname; rev = version; - sha256 = "sha256-xlplbkeptXMBlRnSsc5NgGJfT8aoZxTRgTwTOd7aiWg="; + hash = "sha256-m/oEczUNKqj0gs/zMOIBxoQaffNg+YyPINMXArkATJ4="; }; nativeBuildInputs = [ pkg-config ]; From 51d29a4759a278d7d9b7edac7764b2836b4e4a6e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 00:37:28 +0000 Subject: [PATCH 03/35] nixosTests.nixops: Revert "tests.nixops: fix broken eval" to fix eval This reverts commit c946245c7a595c0834d3787ce4215419fc3df73b. Without the change test eval fail at top level of `nixpkgs` as: $ nix build --no-link -f. nixosTests.nixops error: function 'anonymous lambda' called without required argument 'testers' --- nixos/tests/nixops/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index f7a26f2461c4..b8f747b2a19f 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -1,6 +1,4 @@ -{ pkgs -, testers -, ... }: +{ pkgs, ... }: let inherit (pkgs) lib; @@ -21,7 +19,7 @@ let passthru.override = args': testsForPackage (args // args'); }; - testLegacyNetwork = { nixopsPkg, ... }: testers.nixosTest ({ + testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({ name = "nixops-legacy-network"; nodes = { deployer = { config, lib, nodes, pkgs, ... }: { From 8f809e4630bfb2fa80499258b45ad428f0b29c71 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 31 Dec 2023 20:42:24 +0000 Subject: [PATCH 04/35] nixops_unstable: fix `tests` eval with `allowAliases = false;` Without the change `tests` eval fails as: $ nix build --no-link -f. nixops_unstable.tests --arg config '{ allowAliases = false; }' error: error: attribute 'nixosTest' missing 22| testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({ | ^ 23| name = "nixops-legacy-network"; Did you mean nixosTests? The alias is defined as: pkgs/top-level/aliases.nix: nixosTest = testers.nixosTest; # Added 2022-05-05 --- nixos/tests/nixops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index b8f747b2a19f..6501d13a2ed3 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -19,7 +19,7 @@ let passthru.override = args': testsForPackage (args // args'); }; - testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({ + testLegacyNetwork = { nixopsPkg, ... }: pkgs.testers.nixosTest ({ name = "nixops-legacy-network"; nodes = { deployer = { config, lib, nodes, pkgs, ... }: { From 291aa2109e5cdceeba795eafbb9df5cacb4c9ed5 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Tue, 2 Jan 2024 23:45:24 +0100 Subject: [PATCH 05/35] regripper: init at unstable-2023-07-23 Update package.nix --- pkgs/by-name/re/regripper/package.nix | 55 +++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/re/regripper/package.nix diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix new file mode 100644 index 000000000000..ba1d2f741def --- /dev/null +++ b/pkgs/by-name/re/regripper/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, perl +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "regripper"; + version = "unstable-2023-07-23"; + + src = fetchFromGitHub { + owner = "keydet89"; + repo = "RegRipper3.0"; + rev = "cee174fb6f137b14c426e97d17945ddee0d31051"; + sha256 = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ="; + }; + + buildInputs = [ perl ]; + + postPatch = '' + substituteInPlace rip.pl rr.pl \ + --replace \"plugins/\" \"$out/share/regripper/plugins/\" + substituteInPlace rip.pl rr.pl \ + --replace \"plugins\" \"$out/share/regripper/plugins\" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + + rm -r *.md *.exe *.bat *.dll + + cp -aR . "$out/share/regripper/" + + cat > "$out/bin/${pname}" << EOF + #!${runtimeShell} + exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@" + EOF + + chmod u+x "$out/bin/${pname}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source forensic software used as a Windows Registry data extraction command line"; + mainProgram = "regripper"; + homepage = "https://github.com/keydet89/RegRipper3.0"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = with platforms; linux ++ darwin; + license = licenses.mit; + }; +} From 402663dc19c3961bf52063bb720c58087b567675 Mon Sep 17 00:00:00 2001 From: Greaka Date: Wed, 10 Jan 2024 21:04:22 +0100 Subject: [PATCH 06/35] factorio: 1.1.100 -> 1.1.101 --- pkgs/games/factorio/versions.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 583d3ae3cbed..9e5f6d3e6533 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.101" }, "stable": { - "name": "factorio_alpha_x64-1.1.100.tar.xz", + "name": "factorio_alpha_x64-1.1.101.tar.xz", "needsAuth": true, - "sha256": "0ylr1x39x6x9d4zx5h0j4isgz5m56kznadf984bcvsl51plhh5wc", + "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.100/alpha/linux64", - "version": "1.1.100" + "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", + "version": "1.1.101" } }, "demo": { @@ -28,12 +28,12 @@ "version": "1.1.101" }, "stable": { - "name": "factorio_demo_x64-1.1.100.tar.xz", + "name": "factorio_demo_x64-1.1.101.tar.xz", "needsAuth": false, - "sha256": "08xrmik7z7p0pgrnscriqhssv2chrpp42gi2dw8fgjb4wf76wqc4", + "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.100/demo/linux64", - "version": "1.1.100" + "url": "https://factorio.com/get-download/1.1.101/demo/linux64", + "version": "1.1.101" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.101" }, "stable": { - "name": "factorio_headless_x64-1.1.100.tar.xz", + "name": "factorio_headless_x64-1.1.101.tar.xz", "needsAuth": false, - "sha256": "0d6qphx6kpdmvyf40j45ih2s8q48i28nac86pal4vvlkdwadsl4q", + "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.100/headless/linux64", - "version": "1.1.100" + "url": "https://factorio.com/get-download/1.1.101/headless/linux64", + "version": "1.1.101" } } } From 1291a81e4cfb1e511e58e7a978d42499a68a5edb Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Tue, 16 Jan 2024 09:11:45 +0100 Subject: [PATCH 07/35] upscayl: 2.9.5 -> 2.9.8 --- pkgs/applications/graphics/upscayl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 5981a3037493..24b8bc1483b2 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.5"; + version = "2.9.8"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-zEqdHWfMbxdOoZ3NfvOPZL0osrFVMxFN32gXfEjbKLs="; + hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w="; }; appimageContents = appimageTools.extractType2 { From 72a63781f6e7d36022392a6d19a635f1315199c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 11:26:49 +0000 Subject: [PATCH 08/35] legit: 1.2.0 -> 1.2.0.post0 --- pkgs/applications/version-management/legit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index c42f6eecfeea..93d274ecaf2f 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "legit"; - version = "1.2.0"; + version = "1.2.0.post0"; src = fetchPypi { inherit pname version; - sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; + sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; }; propagatedBuildInputs = with python3Packages; [ From 869635565236eee11380a508e1ada53d541be899 Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Thu, 14 Dec 2023 17:20:46 -0800 Subject: [PATCH 09/35] obs-studio: patch to fix libobs.po on arm64 --- pkgs/applications/video/obs-studio/default.nix | 3 +++ .../video/obs-studio/fix-arm64-cmake.patch | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/fix-arm64-cmake.patch diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 74b19296dbdf..0fd2f11900fd 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -94,6 +94,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch"; hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70="; }) + + # Fix libobs.pc for plugins on non-x86 systems + ./fix-arm64-cmake.patch ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch b/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch new file mode 100644 index 000000000000..5f5a0553a0e1 --- /dev/null +++ b/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch @@ -0,0 +1,17 @@ +Workaround for https://github.com/obsproject/obs-studio/issues/7972 +Based on https://git.alpinelinux.org/aports/tree/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b + +diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake +index 41c56da..0535724 100644 +--- a/cmake/Modules/CompilerConfig.cmake ++++ b/cmake/Modules/CompilerConfig.cmake +@@ -163,8 +163,7 @@ else() + check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD) + check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD) + set(ARCH_SIMD_FLAGS +- -DSIMDE_ENABLE_OPENMP "$<$,$>:-fopenmp-simd>" +- "$<$,$>:-fopenmp-simd>") ++ -DSIMDE_ENABLE_OPENMP -fopenmp-simd) + endif() + endif() + From 8e2d1382115204a8896f296e69d602cefe805021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 19:39:08 +0000 Subject: [PATCH 10/35] cargo-make: 0.37.5 -> 0.37.7 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index ad01bae6f9d2..0c35fb9ccb6b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.5"; + version = "0.37.7"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-2kJdj1Ye6o/GQSWRIi/SvSEz0Yvdx9xDzsYdJm4I0GQ="; + hash = "sha256-1WITPilqdJeOPWleEGP4ApHE0pIOQZabeY8x2joq6N4="; }; - cargoHash = "sha256-3Xo1JqqaEIEA18bsrLFOD4HMd/evdSEHL0DdqNNjJL8="; + cargoHash = "sha256-kT7IbknQ/TF4l/X7GIpX1btHCp10Z15GHd6GjPMCpJs="; nativeBuildInputs = [ pkg-config ]; From 9e0c900ce9ab1c2c68a40b9a9591d43de9503c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 08:53:23 +0000 Subject: [PATCH 11/35] publii: 0.44.2 -> 0.44.4 --- pkgs/development/web/publii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index 0a87fffbdd1d..5c5d776516ee 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.44.2"; + version = "0.44.4"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-L54Aa/LiGtOEZ/ks62KckOnH042TfprOl+35AE1FwTM="; + hash = "sha256-Qk7Ix8VLfrgT4VbSIQFwB5oVfjgeSi8nttQWovptliw="; }; dontConfigure = true; From d838162cfbe8934cea730c165e2e47eda1849175 Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Sat, 20 Jan 2024 09:10:54 -0800 Subject: [PATCH 12/35] obs-studio: use fetchpatch to fix arm64 cmake --- pkgs/applications/video/obs-studio/default.nix | 7 ++++++- .../video/obs-studio/fix-arm64-cmake.patch | 17 ----------------- 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/video/obs-studio/fix-arm64-cmake.patch diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0fd2f11900fd..29bb90a9dd8d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -96,7 +96,12 @@ stdenv.mkDerivation (finalAttrs: { }) # Fix libobs.pc for plugins on non-x86 systems - ./fix-arm64-cmake.patch + (fetchpatch { + name = "fix-arm64-cmake.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b"; + hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI="; + includes = [ "*/CompilerConfig.cmake" ]; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch b/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch deleted file mode 100644 index 5f5a0553a0e1..000000000000 --- a/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch +++ /dev/null @@ -1,17 +0,0 @@ -Workaround for https://github.com/obsproject/obs-studio/issues/7972 -Based on https://git.alpinelinux.org/aports/tree/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b - -diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake -index 41c56da..0535724 100644 ---- a/cmake/Modules/CompilerConfig.cmake -+++ b/cmake/Modules/CompilerConfig.cmake -@@ -163,8 +163,7 @@ else() - check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD) - check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD) - set(ARCH_SIMD_FLAGS -- -DSIMDE_ENABLE_OPENMP "$<$,$>:-fopenmp-simd>" -- "$<$,$>:-fopenmp-simd>") -+ -DSIMDE_ENABLE_OPENMP -fopenmp-simd) - endif() - endif() - From 84b60551ce0fc4dc76342c15078edac2bdff7572 Mon Sep 17 00:00:00 2001 From: Jan Tebernum Date: Sat, 20 Jan 2024 21:43:45 +0100 Subject: [PATCH 13/35] carapace: 0.29.0 -> 0.29.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 744e6d8e6a48..d4c5d0a3e444 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-eLdS3PIJYmG/U2LEU7C3vYoJsP6bpgSFUK8TH/HWekk="; + hash = "sha256-6q6CUZS6blWTwBqpVthsn+wSRd0UJDpweWmvx3RGbgc="; }; - vendorHash = "sha256-16dzHcX6EZhV1wV4lhrJXNNT1ThR5RK47Y4FJr8kcXE="; + vendorHash = "sha256-iMrAapJxipeGyJki8ijtrLKFETi0jEBYnJowgPbBGPg="; ldflags = [ "-s" From 45335dbb49803f5dded31eba913f29108aaa5f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 06:32:40 +0000 Subject: [PATCH 14/35] fanficfare: 4.29.0 -> 4.30.0 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index f60832e29bc2..1fd4988bb39e 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "4.29.0"; + version = "4.30.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dfPb/PWguUIUAR3EdriPygs5sozc69WZmN9bcqrNPFM="; + hash = "sha256-bUJWpl0sBN7ljr1tPDW2a346NsgLhWexl/kzdXTki1o="; }; nativeBuildInputs = with python3Packages; [ From 6c815377c3b0a5a29f05adc54b41243737da8a20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 10:50:27 +0000 Subject: [PATCH 15/35] ironbar: 0.13.0 -> 0.14.0 --- pkgs/by-name/ir/ironbar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index cbc4a7678f5b..bcd28e4ee581 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-e79eJGc/kxQjRwa1HnF7V/pCbrMTstJsBOl1Luo6i0g="; + hash = "sha256-NRQAR412m14SHozYjJmlnb/TJyCroiWdqY0NLvCOQSE="; }; - cargoHash = "sha256-N8uAisQ50W/9zCr9bRX6tZ0slEoe1zCEMDXuvmoWEs4="; + cargoHash = "sha256-EzLcmOppzUtTg1dOdZcx2rweiELPXv2Mt/we7hMr4m4="; buildInputs = [ gtk3 From a563b20aad7f7c41653355ce12a691ad23453550 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Tue, 2 Jan 2024 23:53:19 +0100 Subject: [PATCH 16/35] perlPackages.ParseWin32Registry: init at 1.1 --- pkgs/by-name/re/regripper/package.nix | 10 +++++----- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix index ba1d2f741def..a8dc3d9828f7 100644 --- a/pkgs/by-name/re/regripper/package.nix +++ b/pkgs/by-name/re/regripper/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , perl +, perlPackages , runtimeShell }: @@ -13,15 +14,14 @@ stdenv.mkDerivation rec { owner = "keydet89"; repo = "RegRipper3.0"; rev = "cee174fb6f137b14c426e97d17945ddee0d31051"; - sha256 = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ="; + hash = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ="; }; - buildInputs = [ perl ]; + propagatedBuildInputs = [ perl perlPackages.ParseWin32Registry ]; postPatch = '' substituteInPlace rip.pl rr.pl \ - --replace \"plugins/\" \"$out/share/regripper/plugins/\" - substituteInPlace rip.pl rr.pl \ + --replace \"plugins/\" \"$out/share/regripper/plugins/\" \ --replace \"plugins\" \"$out/share/regripper/plugins\" ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mainProgram = "regripper"; homepage = "https://github.com/keydet89/RegRipper3.0"; maintainers = with maintainers; [ d3vil0p3r ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c2464cb071c..5502717ea582 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19969,6 +19969,19 @@ with self; { }; }; + ParseWin32Registry = buildPerlPackage { + pname = "ParseWin32Registry"; + version = "1.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMACFARLA/Parse-Win32Registry-1.1.tar.gz"; + hash = "sha256-wWOyAr5q17WPSEZJT/crjJqXloPKmU5DgOmsZWTcBbo="; + }; + meta = with lib; { + description = "Module for parsing Windows Registry files"; + license = with licenses; [ artistic1 gpl1Only ]; + }; + }; + ParseEDID = buildPerlPackage { pname = "Parse-Edid"; version = "1.0.7"; From 469a52c941056ee69fbe01a5a66211132029e278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jan 2024 20:46:36 +0000 Subject: [PATCH 17/35] devspace: 6.3.8 -> 6.3.9 --- pkgs/development/tools/misc/devspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index af538e31f4fd..f2f31d00e6b2 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.8"; + version = "6.3.9"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-hB5foVVWVANX+Nmdl8layK5B08NQ11nIqt/d2du4bkQ="; + hash = "sha256-Jy2e1bCCO3YeigQM9qSbbgqrZppXlUq+2oXIiotMKtI="; }; vendorHash = null; From 67b79832dd3afe47b7ef69e06774000048e5b16d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 03:10:53 +0000 Subject: [PATCH 18/35] python311Packages.pot: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/pot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 663c0427a5ab..321ad2e2dba7 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "PythonOT"; repo = "POT"; rev = "refs/tags/${version}"; - hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo="; + hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8="; }; nativeBuildInputs = [ From 05a498ce32dbba47afe35e587ff8bd6f99bbbec7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 22 Jan 2024 04:20:00 +0000 Subject: [PATCH 19/35] reviewdog: 0.16.0 -> 0.17.0 Diff: https://github.com/reviewdog/reviewdog/compare/v0.16.0...v0.17.0 Changelog: https://github.com/reviewdog/reviewdog/blob/v0.17.0/CHANGELOG.md --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 42455639bb57..f3e6a8e8d67e 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aHxK1Wu6AHTYhhbW67e4Yb/uOArwsiZnW8qHXHFCu2w="; + hash = "sha256-zr98hzWU27d+HCKvzTch7FkpUOWkHvpuMIq2cfWNRHQ="; }; - vendorHash = "sha256-htBy+ie1RjlWkr5z3BA9us5z5VxLtl4q1pyiESsyMFY="; + vendorHash = "sha256-S5SEM6EFXI2Vig8ze5kGOCIL5bLF6CMy/TKV+/3zAjI="; doCheck = false; From a5d5961b09deb6602ad0af26ffe0c97f10ceeeaa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 22 Jan 2024 04:20:00 +0000 Subject: [PATCH 20/35] python311Packages.pglast: 5.8 -> 6.1 Changelog: https://github.com/lelit/pglast/blob/v6.1/CHANGES.rst --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 883def3b068b..f3d86a0cac92 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.8"; + version = "6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+3ysQuGrAH5xCBKaP0T/PLfbmLuxiKHPB+76D32GG9E="; + hash = "sha256-XdQQsknvZ4Nlmlsh/Lnp0bGjaduqaoH8IKPTOqBWhrU="; }; propagatedBuildInputs = [ From 4eead0f5ef488b1b2b60ec6fe3d7384983c42789 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 22 Jan 2024 11:12:25 +0000 Subject: [PATCH 21/35] bsnes-hd: pull upstream `gcc-13` fix Without the change the build fails as https://hydra.nixos.org/build/246737851: ../nall/arithmetic/natural.hpp: In function 'void nall::div(const uint256_t&, const uint256_t&, uint256_t&, uint256_t&)': ../nall/arithmetic/natural.hpp:239:23: error: 'runtime_error' is not a member of 'std' 239 | if(!rhs) throw std::runtime_error("division by zero"); | ^~~~~~~~~~~~~ --- pkgs/applications/emulators/bsnes/bsnes-hd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index b6d158a7a7c8..5ac210042538 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config , wrapGAppsHook , libX11, libXv @@ -36,6 +36,14 @@ stdenv.mkDerivation { # be set to $out, so this will result in the .app ending up in the # Applications directory in the current nix profile. ./macos-copy-app-to-prefix.patch + + # Fix build against gcc-13: + # https://github.com/DerKoun/bsnes-hd/pull/124 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/DerKoun/bsnes-hd/commit/587e496f667970d60b6ea29976c171da1681388e.patch"; + hash = "sha256-7KBXh8b4xGTzgV2Pt8B1eFZHOaXcCKXKzqGOf0rFG0c="; + }) ]; nativeBuildInputs = [ pkg-config ] From 3cc1080ae795ffcb0ee87146703aed2ecb65aa07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 12:54:09 +0000 Subject: [PATCH 22/35] files-cli: 2.12.22 -> 2.12.24 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index e18913b0afbe..bc7a004d4675 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.12.22"; + version = "2.12.24"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-xjHPlZenkxZCJ9KwjyWsrAd1LiQRRuS9Z2fsRdHV7eA="; + hash = "sha256-Ne386WK0icQcsW2tqfkiW5udI7Umq10v+954bfjQiHM="; }; - vendorHash = "sha256-JzIafJOSlZUWwewp6sJaM7x3U+vZMdY4gBx/NfI7p5I="; + vendorHash = "sha256-en2gLeYZr7MwZnz47qAxQo48ZIsDZPXoCkMV2c4LHSU="; ldflags = [ "-s" From 7e5ed397206fe7675321f1bb2341050ca528e5a7 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 22 Jan 2024 14:54:51 +0000 Subject: [PATCH 23/35] cargo-deny: 0.14.3 -> 0.14.7 Diff: https://github.com/EmbarkStudios/cargo-deny/compare/0.14.3...0.14.7 Changelog: https://github.com/EmbarkStudios/cargo-deny/blob/0.14.7/CHANGELOG.md --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 915ae7a148c2..6dd9eb589631 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.3"; + version = "0.14.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-syBf90xPcwp86xJDHtLMZXCsqh4P0mcaAcNnvjYudn8="; + hash = "sha256-Ods0uibPrvrFW9HRHm4k9xhmOmvW8zJfVjMYEX7H0UA="; }; - cargoHash = "sha256-YmHHuFubac0j0ptFGOr7GI1PYR4KhShrEwdqikG4RlQ="; + cargoHash = "sha256-/wHXKzHl00q+8e4A9YFAGqhoCqVwkFhMtWTuzdmZIHc="; nativeBuildInputs = [ pkg-config From 97b2b4452e5139c21af21daa8140d9bb78d8e750 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 16:42:02 +0000 Subject: [PATCH 24/35] microsoft-edge: 120.0.2210.77 -> 120.0.2210.144 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d9dea8f312ec..ae312d92368c 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "120.0.2210.77"; + version = "120.0.2210.144"; revision = "1"; - hash = "sha256-mSIx/aYutmA/hGycNapvm8/BnADtXA6NRlMmns+yM5k="; + hash = "sha256-O/7LdopcMfSYx8cg9BNDU6KxbPfnF9rYXD7Q6jugBLU="; }; beta = import ./browser.nix { channel = "beta"; - version = "121.0.2277.4"; + version = "121.0.2277.71"; revision = "1"; - hash = "sha256-Qn0H5JUMZUASqfaJfM1cpKj9E6XHjArvZ3jE+GpREOs="; + hash = "sha256-PsfUZJ5ftHxSFGaXjzFMEff7Czfq88yL31mqNkFilNM="; }; dev = import ./browser.nix { channel = "dev"; - version = "121.0.2277.4"; + version = "122.0.2348.0"; revision = "1"; - hash = "sha256-41hOoZANy5hWrHAzxZGLX69apNMoAn7PiarWl6wicPA="; + hash = "sha256-Vsnrc43d70fLDncMeQeYhZJhnYex2LsIV1U2KPlkP9U="; }; } From 95ca2cc04ead0607fecfee46f5f0f5ca8ae3dd74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 19:58:20 +0000 Subject: [PATCH 25/35] ugrep: 4.5.1 -> 4.5.2 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index a13a7965d5b2..0293f2770a62 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-unryRXGuxQXCwzpQW6AJAYQEL3Xvs2u4DH2E3LATQaU="; + hash = "sha256-aQJU4SuGJy+TyxBgaHimxc0HtW9ZJIB2b6jxcGIoqo4="; }; buildInputs = [ From 4d7af4fce26cc3ec2b5261346d18df92eac2f442 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 20:22:17 +0000 Subject: [PATCH 26/35] mautrix-discord: 0.6.4 -> 0.6.5 --- pkgs/servers/mautrix-discord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index 4ddb9abe9ecd..6ede276ec2b0 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-p2DQD2E9RmP6yZGD88Y15eTz06euhNDaxCnnrWzqaB4="; + hash = "sha256-kjIBjkRI0BrbMNkb1Tdv7d+ZFOKRkUL9KxtQMtvxpIM="; }; - vendorHash = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg="; + vendorHash = "sha256-qRIgdkDp1pd/bA/AIU4PvoXcvrQam0kmr0hu4yAl+IY="; ldflags = [ "-s" "-w" ]; From 242faeffee2b2baad68c18b472d7999a13d52701 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Tue, 23 Jan 2024 00:25:36 +0100 Subject: [PATCH 27/35] iotop-c: add meta.mainProgram --- pkgs/os-specific/linux/iotop-c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 1d7dc9e4d112..2003cc21d57b 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "iotop identifies processes that use high amount of input/output requests on your machine"; homepage = "https://github.com/Tomas-M/iotop"; maintainers = [ maintainers.arezvov ]; + mainProgram = "iotop-c"; license = licenses.gpl2Plus; platforms = platforms.linux; }; From 9b89267338b9616aeb6b8b421f1680d5b143ab37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 03:38:22 +0000 Subject: [PATCH 28/35] python310Packages.pyradios: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/pyradios/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyradios/default.nix b/pkgs/development/python-modules/pyradios/default.nix index 8f9b96e5d12a..42b46720fca2 100644 --- a/pkgs/development/python-modules/pyradios/default.nix +++ b/pkgs/development/python-modules/pyradios/default.nix @@ -2,26 +2,26 @@ , buildPythonPackage , fetchPypi , appdirs -, requests +, httpx , setuptools , pythonOlder }: buildPythonPackage rec { pname = "pyradios"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Uqg/owmf2popAhyanAUIdSWpXAGCWkQja4P944BpNhc="; + hash = "sha256-XTpw8bgFZo35PJngr9oweU6fY3KAphJsrEhkKzWHLIA="; }; propagatedBuildInputs = [ appdirs - requests + httpx setuptools ]; From a0f64838742007baf781df782593a2477df3f33b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 00:26:16 +0000 Subject: [PATCH 29/35] python311Packages.posthog: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 704a1f7ebf03..8606a9834a25 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.3.1"; + version = "3.3.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-aF2Q3ztoFV7j47edtHiLddw+PZyMz6EHj3Zu55rOcF8="; + hash = "sha256-7Bs0KDa799qt8sKwmj6oO0L/nWzczI+UXGWNXGv7B7s="; }; propagatedBuildInputs = [ From de87abd74ba2e318c49762863cf2ab63f9bccb63 Mon Sep 17 00:00:00 2001 From: Robbie Buxton Date: Tue, 9 Jan 2024 19:21:42 +0000 Subject: [PATCH 30/35] changed dlib to actually use cuda properly and switched back to default blas and added lapack to make it easier to override, removed fftw because dlib hasn't supported it since 2015 Signed-off-by: Robbie Buxton --- pkgs/development/libraries/dlib/default.nix | 60 ++++++++++++++----- .../face-recognition/default.nix | 11 +++- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 32356fd9ccab..50709cae8c0b 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,28 +3,27 @@ , fetchFromGitHub , cmake , pkg-config -, fftw , libpng , libjpeg , libwebp -, openblas +, blas +, lapack +, config , guiSupport ? false , libX11 - - # see http://dlib.net/compile.html , sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport -, cudaSupport ? true -}: - -stdenv.mkDerivation rec { +, cudaSupport ? config.cudaSupport +, cudaPackages +}@inputs: +(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; version = "19.24.2"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; - rev ="v${version}"; + rev = "v${version}"; sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; }; @@ -33,20 +32,53 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - (lib.cmakeBool "USE_DLIB_USE_CUDA" cudaSupport) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) + (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) + ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities))) ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); buildInputs = [ - fftw libpng libjpeg libwebp - openblas - ] ++ lib.optional guiSupport libX11; + blas + lapack + ] + ++ lib.optionals guiSupport [ libX11 ] + ++ lib.optionals config.cudaSupport (with cudaPackages; [ + cuda_cudart.dev + cuda_cudart.lib + cuda_cudart.static + cuda_nvcc.dev + libcublas.dev + libcublas.lib + libcublas.static + libcurand.dev + libcurand.lib + libcurand.static + libcusolver.dev + libcusolver.lib + libcusolver.static + cudnn.dev + cudnn.lib + cudnn.static + cuda_cccl.dev + ]); + + passthru = { + inherit + cudaSupport cudaPackages + sse4Support avxSupport; + }; meta = with lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix index 8b06c83cf5aa..ef1d57e3eb67 100644 --- a/pkgs/development/python-modules/face-recognition/default.nix +++ b/pkgs/development/python-modules/face-recognition/default.nix @@ -2,15 +2,17 @@ , fetchPypi , lib -# propagates + # propagates , click , dlib , face-recognition-models , numpy , pillow -# tests + # tests , pytestCheckHook +, config +, cudaSupport ? config.cudaSupport }: buildPythonPackage rec { @@ -18,7 +20,7 @@ buildPythonPackage rec { version = "1.3.0"; format = "setuptools"; - src = fetchPypi { + src = fetchPypi { pname = "face_recognition"; inherit version; hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew="; @@ -36,6 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disables tests when running with cuda due to https://github.com/NixOS/nixpkgs/issues/225912 + doCheck = !config.cudaSupport; + meta = with lib; { license = licenses.mit; homepage = "https://github.com/ageitgey/face_recognition"; From 651865ce9432f7050c0e62edee6d5a375ff06bd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 00:47:06 +0000 Subject: [PATCH 31/35] assemblyscript: 0.27.22 -> 0.27.23 --- pkgs/development/compilers/assemblyscript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/development/compilers/assemblyscript/default.nix index c297ad56c557..b0fd15d47941 100644 --- a/pkgs/development/compilers/assemblyscript/default.nix +++ b/pkgs/development/compilers/assemblyscript/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.22"; + version = "0.27.23"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8j012eAM+tl8AH5vNhg9xKDRJt5pZKV9KNwJFmUgXMY="; + sha256 = "sha256-pKb46AfL5MGKiH1AjyPeHw7ZeLnIiPYmf8b2bOkuRe0="; }; - npmDepsHash = "sha256-y7gY9VhbR+xfXf3OvKvpcohk2mwfa0uOQO7Nmg+L6ug="; + npmDepsHash = "sha256-io/3T0LE1kupjtMg8rpQlRmIn048X0jqhKKj/W7Ilo0="; meta = with lib; { homepage = "https://github.com/AssemblyScript/${pname}"; From 77f691c8bb9b19a4f28149a65f9db98d18fc461e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 22 Jan 2024 20:02:12 -0500 Subject: [PATCH 32/35] nodejs_21: 21.6.0 -> 21.6.1 Changelog: https://github.com/nodejs/node/releases/tag/v21.6.1 --- pkgs/development/web/nodejs/v21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 5747ad87b6b3..1a34a5c9cc75 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.6.0"; - sha256 = "sha256-ICZb/PpzyLRrMjeGQdOLAJ38mA6ygZLD1at/aYb9seM="; + version = "21.6.1"; + sha256 = "sha256-eoLzVtHcul12bw4dTHUOLhjWKQtxC30ZqHJSQeevH2A="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch From fac5d654556d977e53ebf3905eb1a5345e78632f Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Fri, 12 Jan 2024 11:18:18 -0800 Subject: [PATCH 33/35] keepass-keepassrpc: 1.14.0 -> 1.16.0 --- pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index cbcb88b9d1a8..f233f005bfc1 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, buildEnv, fetchurl, mono }: let - version = "1.14.0"; + version = "1.16.0"; drv = stdenv.mkDerivation { pname = "keepassrpc"; inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; - sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24"; + hash = "sha256-p5dYluCrXAKhBhlm6sQ3QQE3gLMJzEZsHXwGnVeXFos="; }; meta = with lib; { From 87dc5782747be7f21a3cee89b452dd78d929480d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 00:16:44 +0000 Subject: [PATCH 34/35] python311Packages.scikit-hep-testdata: 0.4.35 -> 0.4.37 --- .../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 de78e1dc9360..aadcf0b6b577 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.35"; + version = "0.4.37"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1SROsrl7zBaZRDju1M6wlKLZypk9OswA8kromiJGeqw="; + hash = "sha256-/zg6B1vBDaHXRSMo+Wy+CuQaBXP7v1hX2X2cK/7Djlk="; }; nativeBuildInputs = [ From 9a3de614d10160f7a726028b04e3319186b6722d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 00:55:59 +0000 Subject: [PATCH 35/35] python311Packages.snakemake-interface-executor-plugins: 8.1.3 -> 8.2.0 --- .../snakemake-interface-executor-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index 358fdd614163..38b42fc9d1e8 100644 --- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "8.1.3"; + version = "8.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QBLdqhR6WrO/zT0Ux5xcUtr5HbrDy91qiWuSjAA5c3E="; + hash = "sha256-ZkhayXWy83/INRH7FYwFkhgHL+nSj7ReYC9I97SEeTM="; }; nativeBuildInputs = [