From a6a8bdf09c1eb14b25a9b1efb8c67e30a2a07200 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 6 Feb 2024 11:25:46 -0800 Subject: [PATCH 01/16] nfs-utils: optional LDAP support --- pkgs/os-specific/linux/nfs-utils/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 89f4ae7c97f2..74f560992ade 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, libxml2 +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, cyrus_sasl, libxml2 , enablePython ? true, enableLdap ? true }: @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers libxml2 ] ++ lib.optional enablePython python3 - ++ lib.optional enableLdap openldap; + ++ lib.optionals enableLdap [ + openldap + cyrus_sasl + ]; enableParallelBuilding = true; @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ] ++ lib.optional enableLdap "--with-ldap"; + ] ++ lib.optional enableLdap "--enable-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 From 5b64b4072a5cb63438a72edc81c91442e336e550 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 19 Sep 2024 11:55:09 +0200 Subject: [PATCH 02/16] nixos/davis: fix nginx conf's well-known redirect We mistakenly used a non-existing nginx variable for the X-Forwarded-Proto causing the well-known redirect to return erroneous Location headers like: Location: ://dav.example/dav instead of the correct: Location: https://dav.example/dav --- nixos/modules/services/web-apps/davis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index d9b28020dc2d..621f2ff20e2b 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -493,7 +493,7 @@ in }; "~* ^/.well-known/(caldav|carddav)$" = { extraConfig = '' - return 302 $http_x_forwarded_proto://$host/dav/; + return 302 https://$host/dav/; ''; }; "~ ^(.+\.php)(.*)$" = { @@ -505,7 +505,7 @@ in fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_param X-Forwarded-Proto $http_x_forwarded_proto; + fastcgi_param X-Forwarded-Proto https; fastcgi_param X-Forwarded-Port $http_x_forwarded_port; ''; }; From 3af6010640572729fd4a85f6444ce5d176b2b62a Mon Sep 17 00:00:00 2001 From: LuoChen Date: Fri, 20 Sep 2024 09:36:42 +0800 Subject: [PATCH 03/16] gimpPlugins.farbfeld: tidy up to fix nixd warnings --- pkgs/applications/graphics/gimp/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 667a1d505751..f5c9266b571d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -155,7 +155,7 @@ in }; }; - farbfeld = pluginDerivation rec { + farbfeld = pluginDerivation { pname = "farbfeld"; version = "unstable-2019-08-12"; @@ -309,7 +309,7 @@ in variant = "gimp"; }; - gimplensfun = pluginDerivation rec { + gimplensfun = pluginDerivation { version = "unstable-2018-10-21"; pname = "gimplensfun"; From 9756225984443721de35d645dd4e2035c7a9cc96 Mon Sep 17 00:00:00 2001 From: LuoChen Date: Fri, 20 Sep 2024 09:56:58 +0800 Subject: [PATCH 04/16] haskell-modules: tidy up to fix nixd warnings --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 23139af6fda2..3abbd578e5c4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -12,8 +12,8 @@ { pkgs, haskellLib }: let - inherit (pkgs) fetchpatch fetchpatch2 lib; - inherit (lib) throwIfNot versionOlder versions; + inherit (pkgs) fetchpatch lib; + inherit (lib) throwIfNot versionOlder; in with haskellLib; @@ -2649,7 +2649,7 @@ self: super: { purescript = lib.pipe (super.purescript.overrideScope purescriptOverlay) - ([ + [ # https://github.com/purescript/purescript/pull/4547 (appendPatches [ (pkgs.fetchpatch { @@ -2668,7 +2668,7 @@ self: super: { doJailbreak # Generate shell completions (self.generateOptparseApplicativeCompletions [ "purs" ]) - ]); + ]; purenix = lib.pipe From 25341f2a5032a5d32a1299b23502d0684570e22b Mon Sep 17 00:00:00 2001 From: LuoChen Date: Fri, 20 Sep 2024 10:02:12 +0800 Subject: [PATCH 05/16] top-level: tidy up to fix nixd warnings --- pkgs/top-level/aliases.nix | 4 ++-- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98a997e614bf..8aab8785220e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -55,7 +55,7 @@ let aliases; in -mapAliases ({ +mapAliases { # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs. forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); @@ -1777,4 +1777,4 @@ mapAliases ({ purple-facebook ; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eb3e18594de..f5d963ab8360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3579,7 +3579,7 @@ with pkgs; ecdsautils = callPackage ../tools/security/ecdsautils { }; - echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); + echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { }); sedutil = callPackage ../tools/security/sedutil { }; @@ -7714,9 +7714,9 @@ with pkgs; fingerprintx = callPackage ../tools/security/fingerprintx { }; - bsd-fingerd = bsd-finger.override({ + bsd-fingerd = bsd-finger.override { buildProduct = "daemon"; - }); + }; iprange = callPackage ../applications/networking/firehol/iprange.nix { }; @@ -8669,9 +8669,9 @@ with pkgs; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ + highlight = callPackage ../tools/text/highlight { lua = lua5; - }); + }; hockeypuck = callPackage ../servers/hockeypuck/server.nix { }; @@ -15640,12 +15640,12 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; - })); + }); inherit (rec { llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { }); @@ -38359,7 +38359,7 @@ with pkgs; /* A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. */ - pkgsModule = { lib, options, ... }: { + pkgsModule = { options, ... }: { config = if options?nixpkgs.pkgs then { # legacy / nixpkgs.nix style From 9ed482813fd0241e1eea237b577c48455b37b9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 15:39:51 +0000 Subject: [PATCH 06/16] riffdiff: 3.2.1 -> 3.3.0 --- pkgs/tools/text/riffdiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index 1356dc64d79b..6dcf1d84af14 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-UjuJTA+MP5EItLD2z/THeh+6dJ2byIrOBqQfUiAWSvk="; + hash = "sha256-Vbze2WSrZOboLFcsnRYbfsWz6gbMEszDWEMQUNZAzLY="; }; - cargoHash = "sha256-2J+7uwDzoviytbPQ+B36/oJwysBtbiJXKU7zW5vCCEU="; + cargoHash = "sha256-/R2RSsNRpCI/LTXlF0UtdIjWrBDJaEOASTeAtyNwS0M="; meta = with lib; { description = "Diff filter highlighting which line parts have changed"; From 253688541aa3bd6033d68e83c22cfc3b353fe53e Mon Sep 17 00:00:00 2001 From: Valter Nazianzeno Date: Sat, 21 Sep 2024 20:54:21 +0000 Subject: [PATCH 07/16] emiluaPlugins.botan: init at 1.1.0 --- .../emilua-plugins/botan/default.nix | 62 +++++++++++++++++++ pkgs/top-level/emilua-plugins.nix | 3 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/emilua-plugins/botan/default.nix diff --git a/pkgs/development/emilua-plugins/botan/default.nix b/pkgs/development/emilua-plugins/botan/default.nix new file mode 100644 index 000000000000..895e40028198 --- /dev/null +++ b/pkgs/development/emilua-plugins/botan/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + botan3, +}: + +stdenv.mkDerivation rec { + pname = "emilua-botan"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "botan"; + rev = "v${version}"; + hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY="; + }; + + buildInputs = [ + emilua + liburing + fmt + botan3 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Securely clears secrets from memory in Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/emilua-plugins.nix b/pkgs/top-level/emilua-plugins.nix index eb220d4b3ab7..34c74f89c175 100644 --- a/pkgs/top-level/emilua-plugins.nix +++ b/pkgs/top-level/emilua-plugins.nix @@ -9,6 +9,9 @@ emilua: (lib.makeScope newScope (self: { inherit emilua; beast = self.callPackage ../development/emilua-plugins/beast { }; + botan = self.callPackage ../development/emilua-plugins/botan { + inherit (pkgs) botan3; + }; qt5 = self.callPackage ../development/emilua-plugins/qt5 { }; qt6 = self.callPackage ../development/emilua-plugins/qt6 { }; })) From 7308690e9aa549c841b184dc5c4bd99c23cde3f1 Mon Sep 17 00:00:00 2001 From: Valter Nazianzeno Date: Sat, 21 Sep 2024 21:04:35 +0000 Subject: [PATCH 08/16] emiluaPlugins.secp256k1: init at 0.5.0 --- .../emilua-plugins/secp256k1/default.nix | 62 +++++++++++++++++++ pkgs/top-level/emilua-plugins.nix | 3 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/emilua-plugins/secp256k1/default.nix diff --git a/pkgs/development/emilua-plugins/secp256k1/default.nix b/pkgs/development/emilua-plugins/secp256k1/default.nix new file mode 100644 index 000000000000..6b83ed573dc1 --- /dev/null +++ b/pkgs/development/emilua-plugins/secp256k1/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + secp256k1, +}: + +stdenv.mkDerivation rec { + pname = "emilua-secp256k1"; + version = "0.5.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "secp256k1"; + rev = "v${version}"; + hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw="; + }; + + buildInputs = [ + emilua + liburing + fmt + secp256k1 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Emilua bindings to libsecp256k1"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/emilua-plugins.nix b/pkgs/top-level/emilua-plugins.nix index 34c74f89c175..9706ef5ce9a8 100644 --- a/pkgs/top-level/emilua-plugins.nix +++ b/pkgs/top-level/emilua-plugins.nix @@ -14,4 +14,7 @@ emilua: }; qt5 = self.callPackage ../development/emilua-plugins/qt5 { }; qt6 = self.callPackage ../development/emilua-plugins/qt6 { }; + secp256k1 = self.callPackage ../development/emilua-plugins/secp256k1 { + inherit (pkgs) secp256k1; + }; })) From 4951e27030dcfd167248c6175e17acd15c21cf4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 22:36:48 +0000 Subject: [PATCH 09/16] dumbpipe: 0.16.0 -> 0.17.0 --- pkgs/by-name/du/dumbpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index bf2c3632b21c..9dc1e12cbac9 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-gv6V5I9LPNfXyuopo8BaYRELxzTfNhTG1EBWoZ/4cpc="; + hash = "sha256-7OHghotSibkGRrcsh7CqZBp94FY6RKZvcn8QW+dTH1I="; }; - cargoHash = "sha256-t6w2XrMSm5g6dmYQ5gX+w8M3pPzWDytGY9uSuXYgnDA="; + cargoHash = "sha256-rlhfGw/b0HnV1Xl9VWIqEuyM9pq29O6bpaawk2hnG+o="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From ada3a5db4caf47bcbe179b13751192e1883e8abf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 22:36:50 +0000 Subject: [PATCH 10/16] doctl: 1.112.0 -> 1.114.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index b278c4d6807a..bfc3b39c158c 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.112.0"; + version = "1.114.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-+s5kxP79ZWpJsm6yk26jLGSPJ3GkToPXfl2tX+a1A1U="; + sha256 = "sha256-E+/rfOpUDBvHaVVN7xhhcFd1W1X6cSEWpxjqoKoQR80="; }; meta = with lib; { From 31982d2430e45daacd09f7eb826d68c2f212e594 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 22:49:43 +0000 Subject: [PATCH 11/16] capslock: 0.2.4 -> 0.2.5 --- pkgs/by-name/ca/capslock/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index b9290fed59f8..06746e1b654e 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "capslock"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-xeezGU9bI1MwonSGv+XimSfboMQr/1TPMTduDQ+MP1g="; + hash = "sha256-w2dB8DUCjbuzdEfX4nmaGbf9TZH58t+NZtyMoBHVG8I="; }; - vendorHash = "sha256-Z4oj+af8jqqhgHQrTb+lkbIMMa/yOnvkMti/s+wiQsI="; + vendorHash = "sha256-ZRDoKB3/oxJhVFNWT71sKu8WbvIUyvXNKY1hD8ljo5U="; subPackages = [ "cmd/capslock" ]; From 275b4299fa2dff3c472234c330a4c273a467222e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 00:26:33 +0000 Subject: [PATCH 12/16] python312Packages.nbdev: 2.3.29 -> 2.3.31 --- pkgs/development/python-modules/nbdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 9263ed7b0419..f3b766f086c5 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.29"; + version = "2.3.31"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N5oO77DiLMzybQiE45mIIfu5DoT3/nR0iejB/SPpWLQ="; + hash = "sha256-a0BOBwzlZ1HFvpamqQHn8rtgghdkTfr9778wW84q7Xo="; }; From 4ff0c74a539543271aacbebfa577a0f45aa28956 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 02:40:18 +0000 Subject: [PATCH 13/16] sslscan: 2.1.4 -> 2.1.5 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ab699f8f02b7..6c12b20a613f 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM="; + hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY="; }; buildInputs = [ openssl ]; From 78eb428c85ebe8d85758ffd113b84079ed2eae26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 03:25:28 +0000 Subject: [PATCH 14/16] dotenvx: 1.14.0 -> 1.14.1 --- pkgs/by-name/do/dotenvx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index ca2c269d728b..f43fd1cf4266 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-UVev21LZ2y0C8BCSm6I8BTQziSDZUXP3A/ThOpKtsrQ="; + hash = "sha256-PdX8picIFqeZZCMP0ABoWpySERSy0leAvp0XyjTW1Rc="; }; - npmDepsHash = "sha256-ehWHIKYkSAkdTLGpBOU7lJoWNa5uv9Zy0+2qwnCv0m8="; + npmDepsHash = "sha256-lo+R0YP50FIN+syj6VqCeEBFr7EZ6NSVXAhafG5JsI0="; dontNpmBuild = true; From 712b3d7c8ccc5f23f3c7e4ba41039492b08501dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 12:20:00 +0000 Subject: [PATCH 15/16] renovate: 38.73.5 -> 38.93.1 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 8dbf447958d3..e7f615aba604 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -21,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.73.5"; + version = "38.93.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-+kracgelM8VOIgEtDfaXWokNZgiwl+s/k1yx6RxQk0c="; + hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-J61fOjANS7WKd3HLaqJZE1m2jFrMTknW6SGdy/yVIKg="; + hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk="; }; env.COREPACK_ENABLE_STRICT = 0; From 8999c869a860674baf6ddd81716f81ebc616a21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Sep 2024 14:22:24 +0200 Subject: [PATCH 16/16] nix: update nix-fallback-paths --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index f9ea7eb39597..5e23e8dda432 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5"; - i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5"; - aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5"; - x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5"; - aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5"; + x86_64-linux = "/nix/store/mczjdfprd67mdn90488854bf6b3nkp8j-nix-2.18.7"; + i686-linux = "/nix/store/qqll8zrx7ibdx34ry1ijanqdpdpnibbc-nix-2.18.7"; + aarch64-linux = "/nix/store/lwysvjn745fwsz8nv13zzsfq0dhiyxlp-nix-2.18.7"; + x86_64-darwin = "/nix/store/frzvlvzzj7hwvg8p0y0ivl27430nxhfy-nix-2.18.7"; + aarch64-darwin = "/nix/store/43dp3pl3k95gszp1hl9sjm22gly65sxi-nix-2.18.7"; }