From d65c4445a9842de6759719b131227293df1b5549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 10 Dec 2023 07:40:28 +0100 Subject: [PATCH 01/36] Add hardware.sane.backends-package option. Allows overriding `sane-backends` drivers without rebuilding many packages. --- nixos/modules/services/hardware/sane.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 8408844c4f94..8f64afe60734 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -4,7 +4,7 @@ with lib; let - pkg = pkgs.sane-backends.override { + pkg = config.hardware.sane.backends-package.override { scanSnapDriversUnfree = config.hardware.sane.drivers.scanSnap.enable; scanSnapDriversPackage = config.hardware.sane.drivers.scanSnap.package; }; @@ -57,6 +57,13 @@ in ''; }; + hardware.sane.backends-package = mkOption { + type = types.package; + default = pkgs.sane-backends; + defaultText = literalExpression "pkgs.sane-backends"; + description = lib.mdDoc "Backends driver package to use."; + }; + hardware.sane.snapshot = mkOption { type = types.bool; default = false; From 5496357ba4b05b66625fc41b900e7f5ee4839548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 14:17:32 +0000 Subject: [PATCH 02/36] stress-ng: 0.17.02 -> 0.17.03 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index ecef593219d3..757dd3387dd4 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.02"; + version = "0.17.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk="; + hash = "sha256-ecYVcLtpcHlUFKdfwWBq2bwQqCp1g9zJp/maZAeKT+k="; }; postPatch = '' From 26c2ed1c95f3967de6c3c217b8b13a31b187b16e Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Sun, 24 Dec 2023 09:44:46 +0000 Subject: [PATCH 03/36] nixos/tailscale: fix after and wants --- nixos/modules/services/networking/tailscale.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 3822df81063d..1070e4e25296 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -100,8 +100,8 @@ in { }; systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) { - after = ["tailscale.service"]; - wants = ["tailscale.service"]; + after = ["tailscaled.service"]; + wants = ["tailscaled.service"]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; From 2fc02c0831e07ad464f9a304dfc147be3f0f21eb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 3 Dec 2023 14:20:24 +0100 Subject: [PATCH 04/36] slurm: 23.02.7.1 -> 23.11.0.1 --- pkgs/servers/computing/slurm/common-env-echo.patch | 8 ++++---- pkgs/servers/computing/slurm/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/servers/computing/slurm/common-env-echo.patch index 4236421a63d2..cff52116d145 100644 --- a/pkgs/servers/computing/slurm/common-env-echo.patch +++ b/pkgs/servers/computing/slurm/common-env-echo.patch @@ -1,13 +1,13 @@ diff --git a/src/common/env.c b/src/common/env.c -index 987846d..73d3b3b 100644 +index 4dad18fef1..730f28af96 100644 --- a/src/common/env.c +++ b/src/common/env.c -@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, +@@ -2073,7 +2073,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, char **env = NULL; char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX"; char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX"; - char cmdstr[256], *env_loc = NULL; -+ char cmdstr[MAXPATHLEN], *env_loc = NULL; ++ char cmdstr[PATH_MAX], *env_loc = NULL; char *stepd_path = NULL; - int fd1, fd2, fildes[2], found, fval, len, rc, timeleft; + int fildes[2], found, fval, len, rc, timeleft; int buf_read, buf_rem, config_timeout; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 21fd28f29923..6b0621681585 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.7.1"; + version = "23.11.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-0u96KnEahx7noA8vQEkC1f+hv4d3NGPmnof9G7bA7Oc="; + hash = "sha256-+8oDNfNg9WGET1iWarhZbQEOdjHjSshIB/otdYvl18c="; }; outputs = [ "out" "dev" ]; From 0998641159f86503713812d847d42e7300908990 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 15:09:37 +0100 Subject: [PATCH 05/36] slurm-spank-stunnel: add patch for slurm-23.11 --- .../computing/slurm-spank-stunnel/default.nix | 2 ++ .../computing/slurm-spank-stunnel/hostlist.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix index 9fdd5625f78f..3d87055d53bf 100644 --- a/pkgs/servers/computing/slurm-spank-stunnel/default.nix +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; }; + patches = [ ./hostlist.patch ]; + buildPhase = '' gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c ''; diff --git a/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch new file mode 100644 index 000000000000..0fc1d0626aab --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch @@ -0,0 +1,13 @@ +diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c +index 81fb4fd..dbe69f6 100644 +--- a/slurm-spank-stunnel.c ++++ b/slurm-spank-stunnel.c +@@ -278,7 +278,7 @@ int _stunnel_connect_nodes (char* nodes) + { + + char* host; +- hostlist_t hlist; ++ hostlist_t *hlist; + + // Connect to the first host in the list + hlist = slurm_hostlist_create(nodes); From d272adb1b89b0eb1caa81a7f8a01ba6d35deee3f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 15:10:06 +0100 Subject: [PATCH 06/36] slurm-spank-x11: add patch for slurm-23.11 --- pkgs/servers/computing/slurm-spank-x11/default.nix | 2 ++ .../computing/slurm-spank-x11/hostlist.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/servers/computing/slurm-spank-x11/hostlist.patch diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 8a8aa34fdb2d..dd13750ee9d2 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; }; + patches = [ ./hostlist.patch ]; + buildPhase = '' gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ -g -o slurm-spank-x11 slurm-spank-x11.c diff --git a/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/pkgs/servers/computing/slurm-spank-x11/hostlist.patch new file mode 100644 index 000000000000..c60bab236cea --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-x11/hostlist.patch @@ -0,0 +1,13 @@ +diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c +index bef6c14..7cb77c4 100644 +--- a/slurm-spank-x11-plug.c ++++ b/slurm-spank-x11-plug.c +@@ -608,7 +608,7 @@ int _connect_node (char* node,uint32_t jobid,uint32_t stepid) + int _x11_connect_nodes (char* nodes,uint32_t jobid,uint32_t stepid) + { + char* host; +- hostlist_t hlist; ++ hostlist_t *hlist; + int n=0; + int i; + From 5c023641e966a26614604c1df92910b46b9fa2a2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 15:12:18 +0100 Subject: [PATCH 07/36] slurm-spank-stunnel: use getDev --- pkgs/servers/computing/slurm-spank-stunnel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix index 3d87055d53bf..3534c8981a26 100644 --- a/pkgs/servers/computing/slurm-spank-stunnel/default.nix +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./hostlist.patch ]; buildPhase = '' - gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c ''; installPhase = '' From 8df326098bacf6f1c4e10be48f959a7d0d6657dd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 15:12:42 +0100 Subject: [PATCH 08/36] slurm-spank-x11: use getDev --- pkgs/servers/computing/slurm-spank-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index dd13750ee9d2..4a5e2d52b2f5 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ -g -o slurm-spank-x11 slurm-spank-x11.c - gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ + gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ -g -o x11.so slurm-spank-x11-plug.c ''; From 1c32f80b883e1b566ccd4dd8e4d8210ce3a09811 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 18:08:30 +0100 Subject: [PATCH 09/36] slurm: use getDev --- pkgs/servers/computing/slurm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6b0621681585..7308623b16f7 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -60,12 +60,12 @@ stdenv.mkDerivation rec { configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-http-parser=${http-parser}" - "--with-hwloc=${hwloc.dev}" - "--with-json=${json_c.dev}" + "--with-hwloc=${lib.getDev hwloc}" + "--with-json=${lib.getDev json_c}" "--with-jwt=${libjwt}" - "--with-lz4=${lz4.dev}" + "--with-lz4=${lib.getDev lz4}" "--with-munge=${munge}" - "--with-yaml=${libyaml.dev}" + "--with-yaml=${lib.getDev libyaml}" "--with-ofed=${lib.getDev rdma-core}" "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" From f2e94c25e54cfe4b2dbfaf2b051a63f5c667dfe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 00:46:33 +0000 Subject: [PATCH 10/36] valeronoi: 0.2.0 -> 0.2.1 --- pkgs/tools/misc/valeronoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/valeronoi/default.nix b/pkgs/tools/misc/valeronoi/default.nix index c7321b301520..9826ce510bfc 100644 --- a/pkgs/tools/misc/valeronoi/default.nix +++ b/pkgs/tools/misc/valeronoi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "valeronoi"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ccoors"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-4BTBF6h/BEVr0E3E0EvvKOQGHZ4wCtdXgKBWLSfOcOI="; + sha256 = "sha256-7z967y1hWpitZfXNlHHM8qEBdyuBQSFlJElS4ldsAaE="; }; buildInputs = [ From b0b9f0df249534c6193fa7d19830513108d2903b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 08:26:03 +0000 Subject: [PATCH 11/36] monetdb: 11.47.17 -> 11.49.1 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 437ce3fc1dc6..abb442bcaa79 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.17"; + version = "11.49.1"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-2bMzIlvSShNZMVKzBl5T/T33l0PPcBFH35gJs0qlD4E="; + hash = "sha256-ahZegA9wVWx5TZI23eDvqnGS2Uhnbhoq9Jx8sw9yNko="; }; nativeBuildInputs = [ bison cmake python3 ]; From 0929716b020676b5bf337c13db3ae51cfbf46134 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Sat, 23 Dec 2023 01:42:19 +0300 Subject: [PATCH 12/36] nixos/tor: fix transport plugin exe name --- nixos/modules/services/security/tor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 4ff941251c99..dea20dec1ab4 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -854,7 +854,7 @@ in BridgeRelay = true; ExtORPort.port = mkDefault "auto"; ServerTransportPlugin.transports = mkDefault ["obfs4"]; - ServerTransportPlugin.exec = mkDefault "${pkgs.obfs4}/bin/obfs4proxy managed"; + ServerTransportPlugin.exec = mkDefault "${lib.getExe pkgs.obfs4} managed"; } // optionalAttrs (cfg.relay.role == "private-bridge") { ExtraInfoStatistics = false; PublishServerDescriptor = false; From e8a4189be09cfba3b30e97b2ebf7fde4d2a90dd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 22:36:21 +0000 Subject: [PATCH 13/36] vivaldi: 6.5.3206.39 -> 6.5.3206.48 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a734a4a3b56e..881bd35bbd28 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.5.3206.39"; + version = "6.5.3206.48"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-7f3JRkkBGF+7EFGbzosUcKUUFswmKhpacbcd0AaY8fw="; - x86_64-linux = "sha256-louqE7Icf8qEiegzoVd/1jzA+wLFTrQyN3V8g64uQT8="; + aarch64-linux = "sha256-laerVZWB9kNozy0MxYAPXbTjcfgvr+jL18NMP5u7ST0="; + x86_64-linux = "sha256-3gRvPSSyJapqay6nePlMA1R/tfFI75mHi+mx3f+wfjQ="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 17d6576d856306cf710e430cd408980d8e905aa4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 30 Dec 2023 20:11:57 -0300 Subject: [PATCH 14/36] tree-sitter-grammars: add bitbake Signed-off-by: Otavio Salvador --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-bitbake.json | 12 ++++++++++++ .../development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 32ace9924d15..e3dde6251b1c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -3,6 +3,7 @@ tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json; tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json; tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json; + tree-sitter-bitbake = lib.importJSON ./tree-sitter-bitbake.json; tree-sitter-c = lib.importJSON ./tree-sitter-c.json; tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json; tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json new file mode 100644 index 000000000000..61aeba0fec66 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/amaanq/tree-sitter-bitbake", + "rev": "ffe6c2f3dbf30224479a28ca5d50df594b2486a9", + "date": "2023-11-08T10:34:03-05:00", + "path": "/nix/store/zzckcglck1cr32cmp14i95r7q0qkgajf-tree-sitter-bitbake", + "sha256": "1g547sq2xsfn7xmdmz1ny4lvk75akwi7k1vrrq6bdfkcg7gzkp1b", + "hash": "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index b5068b30cf24..bd4074f933ba 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -84,6 +84,10 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-bitbake" = { + orga = "amaanq"; + repo = "tree-sitter-bitbake"; + }; "tree-sitter-beancount" = { orga = "polarmutex"; repo = "tree-sitter-beancount"; From 84ab5674ddccd8853535f00c77ae7946d7a83b2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 08:12:25 +0000 Subject: [PATCH 15/36] ccache: 4.8.3 -> 4.9 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 218444d1a810..fe6e49dfad0e 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.8.3"; + version = "4.9"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-fcstTjwwOh5SAe6+VT5MpBaD+AEFoQtHop99dOMr7/A="; + sha256 = "sha256-/R9ReX1l3okUuVD93IdomoaBTYdKvuIuggyk0sJoYmg="; }; outputs = [ "out" "man" ]; From 5dfd885ff0e1a4b94b716d712ec55575b3b05e1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 31 Dec 2023 14:42:02 +0100 Subject: [PATCH 16/36] python311Packages.botocore-stubs: 1.34.8 -> 1.34.11 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 418af2721b7f..5c1bcd0a32d8 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.8"; + version = "1.34.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-1smqKxGai3dv6ofisZbGSLdOGYw0DbXAb43De6LWKvc="; + hash = "sha256-wLuHI8jm11bh4yFYTRGP3SGDtdHRnw6RC4ZYwBEPB6Y="; }; nativeBuildInputs = [ From fe40478617e57befb064f42de8e14e62f9bcb95f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 20:56:54 +0000 Subject: [PATCH 17/36] erlang_25: 25.3.2.7 -> 25.3.2.8 --- pkgs/development/interpreters/erlang/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index dc129ecdecef..c2bde2b97f9d 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.7"; - sha256 = "sha256-JMHfnnvjAIrJ2YhSzk1qVeS7qGx2HDf2J+8+WFD5Bv8="; + version = "25.3.2.8"; + sha256 = "sha256-pS96jO1VBqTGWzaZO4XpXI9V+Whse4PjGnJRunFC98s="; } From 2a2c4edd4f587c7b74b4401236f49e9adbc56c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 21:01:46 +0000 Subject: [PATCH 18/36] erlang_24: 24.3.4.14 -> 24.3.4.15 --- pkgs/development/interpreters/erlang/24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index c66d829433b0..175640601e9a 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.14"; - sha256 = "sha256-+OEA7bVomZox/iHhkRQPt91WayyxZQDkDI92B5Ez24Q="; + version = "24.3.4.15"; + sha256 = "sha256-1a/5jxTLDWlQHEMfKZoAO3wrg1U0wYBf+xXhyO/EnXA="; } From 592a779f3c5e7bce1a02027abe11b7996816223f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 21:20:13 +0000 Subject: [PATCH 19/36] erlang_26: 26.2 -> 26.2.1 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index 502983438df5..29eaeeb11700 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2"; - sha256 = "sha256-mk8vPgWFTMo4oPY/OIdboYMTyxG/22Ow4EYs1b+nHuM="; + version = "26.2.1"; + sha256 = "sha256-4aQ4YTeiT32lZ9ZFi7/vV7O4fARYVLbGLtHm5alSDyw="; } From b0291f7e32d028fd251e340e536b7b955da8e09b Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 31 Dec 2023 17:41:53 -0500 Subject: [PATCH 20/36] audiobookshelf: 2.7.0 -> 2.7.1 Diff: https://github.com/advplyr/audiobookshelf/compare/v2.7.0...v2.7.1 Changelog: https://github.com/advplyr/audiobookshelf/releases/tag/v2.7.1 --- pkgs/servers/audiobookshelf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 127abe161a64..52775068fba2 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -16,13 +16,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bRQ/GbUe+vsgYjSVf3jssoxGzgNeKG4BCDIhNJovAN8="; + sha256 = "sha256-ROxVAevnxCyND/h1yyXfUeK9v5SEULL8gkR3flTmmW8="; }; client = buildNpmPackage { @@ -36,7 +36,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-2E7Qy3Yew+j+eKKYJMV0SQ/LlJaIfOGm4MpxwP5Dn3Q="; + npmDepsHash = "sha256-2t/+IpmgTZglh3SSuYZNUvT1RZCDZGVT2gS57KU1mqA="; }; wrapper = import ./wrapper.nix { @@ -51,7 +51,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-BZSRa/27oKm2rJoHFq8TpPzkX2CDO9zk5twtcMeo0cQ="; + npmDepsHash = "sha256-1VVFGc4RPE0FHQX1PeRnvU3cAq9eRYGfJ/0GzMy7Fh4="; installPhase = '' mkdir -p $out/opt/client From 7c70bf8082afea729ddeaf620279b002315233b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 05:55:07 +0000 Subject: [PATCH 21/36] arping: 2.23 -> 2.24 --- pkgs/tools/networking/arping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 10765befd4dd..672ccc2bcdb1 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "arping"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-Yn0EFb23VJvcVluQhwGHg9cdnZ8LKlBEds7cq8Irftc="; + hash = "sha256-rME4IDzwYHOURbyuG7G5gnXvUIVoQH2WIeLWacHyoBA="; }; nativeBuildInputs = [ From 695eb35d6d220f76b344fe3484cc6b776cd8cf1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Jan 2024 10:45:17 +0100 Subject: [PATCH 22/36] python311Packages.plugwise: 0.35.4 -> 0.36.2 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.35.4...v0.36.2 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.36.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 7eb310c93008..fb1d00d2e65a 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.35.4"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-5clHLE8QavccxAhBEa6W2yOtWYmQ5oa9ZcctEIKXru4="; + hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; }; propagatedBuildInputs = [ From 1418371835e49be9cb191ccc92cdd541672ee9b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Jan 2024 10:52:11 +0100 Subject: [PATCH 23/36] python311Packages.plugwise: refactor --- .../python-modules/plugwise/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index fb1d00d2e65a..e6ef993bbd8e 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -14,24 +14,35 @@ , pytestCheckHook , python-dateutil , pythonOlder -, pytz , semver +, setuptools +, wheel }: buildPythonPackage rec { pname = "plugwise"; version = "0.36.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { - owner = pname; + owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "wheel~=0.40.0" "wheel" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp async-timeout @@ -40,7 +51,6 @@ buildPythonPackage rec { munch pyserial python-dateutil - pytz semver ]; From 9d21cb87393ba0d70ad7ca1abec2a9e34c280905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 12:47:19 +0000 Subject: [PATCH 24/36] mainsail: 2.9.0 -> 2.9.1 --- pkgs/applications/misc/mainsail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index f372e0a5b0b1..cb9ce043e9ce 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.9.0"; + version = "2.9.1"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-7GnPdnBoK0lErUgnG3dw644ASb0/1pwGqqvxfn/81T0="; + hash = "sha256-OrCS+0zfXs72vJbrqjvEaHJWD0ndozfCcHs1N9Gqios="; stripRoot = false; }; From 309913ce73327a0e2e424efd08b050c544adbd10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 15:24:15 +0000 Subject: [PATCH 25/36] templ: 0.2.476 -> 0.2.501 --- pkgs/development/tools/templ/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/templ/default.nix b/pkgs/development/tools/templ/default.nix index c457c502ef72..cd30c9a45c3f 100644 --- a/pkgs/development/tools/templ/default.nix +++ b/pkgs/development/tools/templ/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "templ"; - version = "0.2.476"; + version = "0.2.501"; subPackages = [ "cmd/templ" ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "a-h"; repo = "templ"; rev = "refs/tags/v${version}"; - hash = "sha256-lgeVfe+9kUxN4XXL7ANiFxtmupZwDaiRFABJIAclyd8="; + hash = "sha256-MkSGQZo2Zv6aCVANh2ETXoCXETkp+xk8jWAW4Wj+y2s="; }; - vendorHash = "sha256-hbXKWWwrlv0w3SxMgPtDBpluvrbjDRGiJ/9QnRKlwCE="; + vendorHash = "sha256-buJArvaaKGRg3yS7BdcVY0ydyi4zah57ABeo+CHkZQU="; meta = with lib; { description = "A language for writing HTML user interfaces in Go"; From 4f9e98905e1ba032cd0fa76145994448d86f107f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 1 Jan 2024 17:26:38 +0100 Subject: [PATCH 26/36] nixos/auditd: fix typo Would otherwise fail with ``` error: A definition for option `systemd.services.auditd.conflicts."[definition 1-entry 1]"' is not of type `string matching the pattern [a-zA-Z0-9@%:_.\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)'. Definition values: - In `/nix/store/x2khl2yx0vz2i357x7mz5xm1kagql8ag-source/nixos/modules/security/auditd.nix': "shutdown.target " ``` --- nixos/modules/security/auditd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index 12d5831619ad..253ee1d4dd0e 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -14,7 +14,7 @@ with lib; description = "Linux Audit daemon"; wantedBy = [ "basic.target" ]; before = [ "shutdown.target" ]; - conflicts = [ "shutdown.target "]; + conflicts = [ "shutdown.target" ]; unitConfig = { ConditionVirtualization = "!container"; From ca53b82688e52bcb1600646b10a0802696bf6281 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 1 Jan 2024 17:37:27 +0100 Subject: [PATCH 27/36] fzf-make: 0.13.0 -> 0.14.0 --- pkgs/development/tools/misc/fzf-make/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix index 6e8f7ff45070..c88f0380f29e 100644 --- a/pkgs/development/tools/misc/fzf-make/default.nix +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,20 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-M7xoHYbBvMVipw19WOQ1f8knqob7+eS4eBNTMvPZhDI="; + hash = "sha256-2Q/rqSJJbjLSN+63oRi9ouW4A7Hb0oyyhOdA/DeCTyE="; }; - cargoHash = "sha256-JKxq4AIezuBsnrIIjqEIywZeq/GzAy1tPbzjlxpvvGQ="; + cargoHash = "sha256-DKxDWar8g71uvAZ9KzN14xRwpvIa1dD7iFACb6nio+8="; - nativeBuildInputs = [ - makeBinaryWrapper - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/fzf-make \ From 823ca129c50a150505d6485de1ed23e32c7b1f70 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 31 Dec 2023 13:02:02 -0300 Subject: [PATCH 28/36] cockpit: 306 -> 307 Signed-off-by: lucasew --- pkgs/by-name/co/cockpit/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 94ecb85b3357..0b8f7b8931ee 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -30,7 +30,6 @@ , pkg-config , polkit , python3Packages -, ripgrep , runtimeShell , systemd , udev @@ -45,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "306"; + version = "307"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-RB5RpwFTi//XNIIm/86JR4Jo3q5nuoW6ruH05JSfMSk="; + hash = "sha256-6z3IAEc+qzh02g1uTaO6LdLD09eYE/5P8Gg7KW3jlvY="; fetchSubmodules = true; }; @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { pythonWithGobject.python python3Packages.setuptools systemd - ripgrep xmlto ]; @@ -197,7 +195,6 @@ stdenv.mkDerivation rec { glib-networking openssh python3Packages.pytest - python3Packages.vulture ]; checkPhase = '' export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules From 2ee82b8bb13551577468dc899035fd05ba188b78 Mon Sep 17 00:00:00 2001 From: Soispha Date: Sat, 23 Dec 2023 17:41:39 +0100 Subject: [PATCH 29/36] licensure: init at 0.3.2 --- pkgs/by-name/li/licensure/package.nix | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/li/licensure/package.nix diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix new file mode 100644 index 000000000000..476b5c18629d --- /dev/null +++ b/pkgs/by-name/li/licensure/package.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, git +, gitls +}: +rustPlatform.buildRustPackage rec { + pname = "licensure"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "chasinglogic"; + repo = "licensure"; + rev = version; + hash = "sha256-rOD2H9TEoZ8JCjlg6feNQiAjvroVGqrlOkDHNZKXDoE="; + }; + + cargoHash = "sha256-ku0SI14pZmbhzE7RnK5kJY6tSMjRVKEMssC9e0Hq6hc="; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl git gitls ]; + + checkFlags = [ + # Checking for files in the git repo (git ls-files), + # That obviously does not work with nix + "--skip=test_get_project_files" + ]; + + meta = with lib; { + description = "A FOSS License management tool for your projects"; + homepage = "https://github.com/chasinglogic/licensure"; + license = licenses.gpl3Plus; + mainProgram = "licensure"; + maintainers = [ maintainers.soispha ]; + platforms = platforms.linux; + }; +} From 38f96462bf8db319baaf9a59c93f37c3f822116c Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 1 Jan 2024 15:37:19 -0300 Subject: [PATCH 30/36] newsraft: refactor --- pkgs/by-name/ne/newsraft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 0555f1f4b9b6..ebb210d43581 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -10,7 +10,7 @@ , yajl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; version = "0.22"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "newsraft"; repo = "newsraft"; - rev = "newsraft-${version}"; + rev = "newsraft-${finalAttrs.version}"; hash = "sha256-QjIADDk1PSZP89+G7B1Bpu3oTEAykD4RJYghZnMJKho="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "newsraft"; platforms = platforms.all; }; -} +}) From 4985198defdc9f3c85fcaa459da31de2056184a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 18:46:01 +0000 Subject: [PATCH 31/36] the-way: 0.20.1 -> 0.20.2 --- pkgs/development/tools/the-way/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 51ba191e14a0..a161728657ac 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.20.1"; + version = "0.20.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-xOoqMqUFVCTS5gQnX4KEoXoMxVvQX3JRoNgzuA20M6g="; + sha256 = "sha256-jUo46NHjgSFOV7fsqh9Ki0QtTGfoaPjQ87/a66zBz1Q="; }; - cargoHash = "sha256-8eN+O3lygbftXVjIBWCwNfYKAIkmPF/eaUKDa9oVaCA="; + cargoHash = "sha256-nmVsg8LX3di7ZAvvDuPQ3PXlLjs+L6YFTzwXRAkcxig="; nativeBuildInputs = [ installShellFiles ]; From 9e33a4c688915a1a105b09650e49ee232da6d8d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Jan 2024 19:57:27 +0100 Subject: [PATCH 32/36] baboossh: 1.2.0 -> 1.2.1 Diff: https://github.com/cybiere/baboossh/compare/refs/tags/v1.2.0...v1.2.1 Changelog: https://github.com/cybiere/baboossh/releases/tag/v1.2.1 --- pkgs/tools/security/baboossh/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/baboossh/default.nix b/pkgs/tools/security/baboossh/default.nix index ee69130e67dd..66712eb99b2c 100644 --- a/pkgs/tools/security/baboossh/default.nix +++ b/pkgs/tools/security/baboossh/default.nix @@ -1,25 +1,18 @@ { lib , python3 , fetchFromGitHub -, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "baboossh"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = "cybiere"; repo = "baboossh"; rev = "refs/tags/v${version}"; - hash = "sha256-dorIqnJuAS/y9W6gyt65QjwGwx4bJHKLmdqRPzY25yA="; - }; - - patches = fetchpatch { - name = "py3compat-utils.patch"; - url = "https://github.com/cybiere/baboossh/commit/f7a75ebeda0c69ab5b119894b9e1488fc0a935a8.patch"; - hash = "sha256-gctuu/Qd3nmJIWv2mTyrGwjlQD1U+OhGK6Zh/Un06/E="; + hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -41,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/cybiere/baboossh"; changelog = "https://github.com/cybiere/baboossh/releases/tag/v${version}"; license = licenses.gpl3Only; + mainProgram = "baboossh"; maintainers = with maintainers; [ fab ]; }; } From c82f8a6ed73ec33590b8e809b4e4a799d7b71442 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 29 Dec 2023 11:26:12 -0500 Subject: [PATCH 33/36] satty: add shell completions --- pkgs/by-name/sa/satty/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index b22ea923a959..c9ec9c6b3494 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -10,6 +10,7 @@ , libadwaita , pango , copyDesktopItems +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec { copyDesktopItems pkg-config wrapGAppsHook4 + installShellFiles ]; buildInputs = [ @@ -43,6 +45,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dt $out/share/icons/hicolor/scalable/apps/ assets/satty.svg + + installShellCompletion --cmd satty \ + --bash completions/satty.bash \ + --fish completions/satty.fish \ + --zsh completions/_satty ''; desktopItems = [ "satty.desktop" ]; From ccac72b1471e56c9cfa96ba61f89ee715c87ee47 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 29 Dec 2023 11:57:45 -0500 Subject: [PATCH 34/36] satty: add myself as maintainer --- pkgs/by-name/sa/satty/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index c9ec9c6b3494..3e74a7878ca1 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { description = "A screenshot annotation tool inspired by Swappy and Flameshot"; homepage = "https://github.com/gabm/Satty"; license = licenses.mpl20; - maintainers = with maintainers; [ pinpox ]; + maintainers = with maintainers; [ pinpox donovanglover ]; mainProgram = "satty"; platforms = lib.platforms.linux; }; From 5ff7811393346a6d6e50e29ab3aade411a5cc3fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 20:10:05 +0000 Subject: [PATCH 35/36] makeInitrdNGTool: 0.1.0 -> 0.1.0 --- pkgs/build-support/kernel/make-initrd-ng/Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index fe3831a27cdf..1546456a3a85 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -57,18 +57,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a" dependencies = [ "proc-macro2", ] @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "92d27c2c202598d05175a6dd3af46824b7f747f8d8e9b14c623f19fa5069735d" dependencies = [ "proc-macro2", "quote", From 86d4d1ad174b228b0a56e639b20abc11bc30ac0b Mon Sep 17 00:00:00 2001 From: Jeremiah S Date: Mon, 1 Jan 2024 17:10:24 -0500 Subject: [PATCH 36/36] bambu-studio: add gst-plugins-good (#274383) --- pkgs/applications/misc/bambu-studio/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 69a27c06d671..a05a4379798d 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -24,6 +24,7 @@ , gstreamer , gst-plugins-base , gst-plugins-bad +, gst-plugins-good , gtest , gtk3 , hicolor-icon-theme @@ -90,6 +91,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad + gst-plugins-good gtk3 hicolor-icon-theme ilmbase diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4778d42ec69..0b9d2283b2fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35409,7 +35409,7 @@ with pkgs; super-slicer-latest = super-slicer.latest; bambu-studio = callPackage ../applications/misc/bambu-studio { - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good; glew = glew-egl;