From c172a8d4adde101cecc078180b20ab86c5bfa52c Mon Sep 17 00:00:00 2001 From: magnouvean Date: Thu, 26 Oct 2023 10:53:10 +0200 Subject: [PATCH 001/170] g4music: 3.3 -> 3.4-1 --- pkgs/applications/audio/g4music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 9063a8351a18..a0a9f5f828a5 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.3"; + version = "3.4-1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo="; + hash = "sha256-uklgxhyrnFQSUcttXvYQtm2BybRkdTK1IfaRpOp0sOE="; }; nativeBuildInputs = [ From 1d19b2cb78d9a2d1bff3b9b1c2a9aa719c5cc376 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Thu, 23 Nov 2023 16:01:41 +0100 Subject: [PATCH 002/170] openssl_3_2: init at 3.2.0 Signed-off-by: Markus Theil --- .../3.2/use-etc-ssl-certs-darwin.patch | 13 +++++++++++ .../openssl/3.2/use-etc-ssl-certs.patch | 13 +++++++++++ .../development/libraries/openssl/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch create mode 100644 pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch new file mode 100644 index 000000000000..e8b07b4ae599 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch new file mode 100644 index 000000000000..13a36fbcd031 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3aeafccb1edb..487a2322945c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -301,4 +301,27 @@ in { license = licenses.asl20; }; }; + + openssl_3_2 = common { + version = "3.2.0"; + hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./3.2/use-etc-ssl-certs-darwin.patch + else ./3.2/use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f90eee57aa8..44a0a1bd5ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24402,7 +24402,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_1; + openssl_3_1 + openssl_3_2; opensubdiv = callPackage ../development/libraries/opensubdiv { }; From 9de58c34dc5a579598f7908a0504d11a355d5918 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Wed, 29 Nov 2023 22:06:37 +0100 Subject: [PATCH 003/170] openssl_3_1: remove and explicitely state versioning Signed-off-by: Markus Theil --- .../development/libraries/openssl/default.nix | 30 +++++-------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 487a2322945c..a8e178c7e6d3 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -234,6 +234,13 @@ let }); in { + # intended version "policy": + # - 1.1 as long as some package exists, which does not build without it + # - latest 3.x LTS + # - latest 3.x non-LTS as preview/for development + # + # - other versions in between only when reasonable need is stated for some package + # - backport every security critical fix release e.g. 3.0.y -> 3.0.y+1 but no new version, e.g. 3.1 -> 3.2 # If you do upgrade here, please update in pkgs/top-level/release.nix # the permitted insecure version to ensure it gets cached for our users @@ -279,29 +286,6 @@ in { }; }; - openssl_3_1 = common { - version = "3.1.4"; - hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; - - patches = [ - ./3.0/nix-ssl-cert-file.patch - - # openssl will only compile in KTLS if the current kernel supports it. - # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch - - (if stdenv.hostPlatform.isDarwin - then ./use-etc-ssl-certs-darwin.patch - else ./use-etc-ssl-certs.patch) - ]; - - withDocs = true; - - extraMeta = with lib; { - license = licenses.asl20; - }; - }; - openssl_3_2 = common { version = "3.2.0"; hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44a0a1bd5ce9..5376e3141488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24402,7 +24402,6 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_1 openssl_3_2; opensubdiv = callPackage ../development/libraries/opensubdiv { }; From 3e57c2e2ba954283f1ea0bde45e871410e42d111 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Dec 2023 08:52:39 -0500 Subject: [PATCH 004/170] gamemode: prefer finalAttrs over rec --- pkgs/tools/games/gamemode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 25acf8cebb1e..87879c2d770f 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -16,7 +16,7 @@ , procps }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gamemode"; version = "1.7"; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; }; -} +}) From 56669c8f5b3ce03381c23bd6682f3ce533167a4b Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Dec 2023 08:54:12 -0500 Subject: [PATCH 005/170] gamemode: fetch src from refs/tags --- pkgs/tools/games/gamemode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 87879c2d770f..4fc7d9e54f91 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "FeralInteractive"; - repo = pname; - rev = version; + repo = "gamemode"; + rev = "refs/tags/${finalAttrs.version}"; sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; }; From cd034f4711f8b164352a773d5c99589a026c290a Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Dec 2023 08:53:52 -0500 Subject: [PATCH 006/170] gamemode: add mainProgram --- pkgs/tools/games/gamemode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 4fc7d9e54f91..84d856c49ff5 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "gamemoderun"; # Requires NixOS module to run }; }) From d209e9900cd8cdefd7890b8bd04aa3ced8fb2279 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 31 Aug 2023 14:25:02 -0400 Subject: [PATCH 007/170] gamemode: add updateScript --- pkgs/tools/games/gamemode/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 84d856c49ff5..9d2d3f7c6a3e 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -14,6 +14,7 @@ , findutils , gawk , procps +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { @@ -100,6 +101,8 @@ stdenv.mkDerivation (finalAttrs: { ]} ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Optimise Linux system performance on demand"; homepage = "https://github.com/FeralInteractive/GameMode"; From a9d02214b0991bd50aacd59c2e6758fb23af973a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 8 Dec 2023 20:42:57 -0300 Subject: [PATCH 008/170] pmbootstrap: 2.0.0 -> 2.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/tools/misc/pmbootstrap/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 43a803dfa3e5..6f11a2b3f3b5 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -1,21 +1,20 @@ { stdenv, lib, git, openssl, buildPythonApplication, pytestCheckHook, ps -, fetchPypi, fetchFromGitLab, sudo }: +, fetchPypi, fetchFromSourcehut, sudo }: buildPythonApplication rec { pname = "pmbootstrap"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-nN4KUP9l3g5Q+QeWr4Fju2GiOyu2f7u94hz/VJlCYdw="; + hash = "sha256-buCfQsi10LezDzYeplArmFRSc3vbjtl+FuTm/VUS2us="; }; - repo = fetchFromGitLab { - domain = "gitlab.com"; - owner = "postmarketOS"; + repo = fetchFromSourcehut { + owner = "~postmarketos"; repo = pname; rev = version; - hash = "sha256-UkgCNob4nazFO8xXyosV+11Sj4yveYBfgh7aw+/6Rlg="; + hash = "sha256-3GZ4PeMnG/a46WwvWPQFeYbJPp+NGU7A98QasnlMIL0="; }; pmb_test = "${repo}/test"; @@ -45,6 +44,7 @@ buildPythonApplication rec { "test_chroot_arguments" "test_chroot_interactive_shell" "test_chroot_interactive_shell_user" + "test_chroot_mount" "test_clean_worktree" "test_config_user" "test_cross_compile_distcc" From 303c78a655ebcd54daa9e620d7fa8fdeebfaff99 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 9 Dec 2023 23:08:35 +0100 Subject: [PATCH 009/170] freshrss: cleanup + runHook --- pkgs/servers/web-apps/freshrss/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 8a8502ad823b..60380c0e56dd 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nixosTests , php -, pkgs }: stdenvNoCC.mkDerivation rec { @@ -31,8 +30,10 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out cp -vr * $out/ + runHook postInstall ''; meta = with lib; { From b2d6b30648e2c51d869f085e819cbae950d6d19d Mon Sep 17 00:00:00 2001 From: SaltyKitkat <56984513+SaltyKitkat@users.noreply.github.com> Date: Wed, 13 Dec 2023 15:58:49 +0800 Subject: [PATCH 010/170] update oomd.nix due to https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb and https://src.fedoraproject.org/rpms/systemd/c/806c95e1c70af18f81d499b24cd7acfa4c36ffd6 --- nixos/modules/system/boot/systemd/oomd.nix | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index fad755e278c7..06dc48d07f89 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -7,10 +7,10 @@ in { enable = lib.mkEnableOption (lib.mdDoc "the `systemd-oomd` OOM killer") // { default = true; }; # Fedora enables the first and third option by default. See the 10-oomd-* files here: - # https://src.fedoraproject.org/rpms/systemd/tree/acb90c49c42276b06375a66c73673ac351025597 + # https://src.fedoraproject.org/rpms/systemd/tree/806c95e1c70af18f81d499b24cd7acfa4c36ffd6 enableRootSlice = lib.mkEnableOption (lib.mdDoc "oomd on the root slice (`-.slice`)"); enableSystemSlice = lib.mkEnableOption (lib.mdDoc "oomd on the system slice (`system.slice`)"); - enableUserServices = lib.mkEnableOption (lib.mdDoc "oomd on all user services (`user@.service`)"); + enableUserSlices = lib.mkEnableOption (lib.mdDoc "oomd on all user slices (`user@.slice`) and all user owned slices"); extraConfig = lib.mkOption { type = with lib.types; attrsOf (oneOf [ str int bool ]); @@ -44,14 +44,23 @@ in { users.groups.systemd-oom = { }; systemd.slices."-".sliceConfig = lib.mkIf cfg.enableRootSlice { - ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "80%"; }; systemd.slices."system".sliceConfig = lib.mkIf cfg.enableSystemSlice { - ManagedOOMSwap = "kill"; - }; - systemd.services."user@".serviceConfig = lib.mkIf cfg.enableUserServices { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "50%"; + ManagedOOMMemoryPressureLimit = "80%"; + }; + systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices { + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "80%"; + }; + systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices { + text = '' + ManagedOOMMemoryPressure=kill + ManagedOOMMemoryPressureLimit=80% + ''; + overrideStrategy = "asDropin"; }; }; } From 679a417a7a0c5df4a3206a19a0867adc0fa4099b Mon Sep 17 00:00:00 2001 From: SaltyKitkat <56984513+SaltyKitkat@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:39:04 +0800 Subject: [PATCH 011/170] Declare removed option with `mkRemovedOptionModule` --- nixos/modules/system/boot/systemd/oomd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 06dc48d07f89..2774edc42917 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -3,6 +3,10 @@ cfg = config.systemd.oomd; in { + imports = [ + (lib.mkRemovedOptionModule [ "systemd" "oomd" "enableUserServices" ] "Use systemd.oomd.enableUserSlices instead.") + ]; + options.systemd.oomd = { enable = lib.mkEnableOption (lib.mdDoc "the `systemd-oomd` OOM killer") // { default = true; }; From 5e57448d4fc2d791beb183dd71798a033f72da42 Mon Sep 17 00:00:00 2001 From: SaltyKitkat <56984513+SaltyKitkat@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:38:29 +0800 Subject: [PATCH 012/170] systemd/oomd: add release note for the backward incompatibility --- nixos/doc/manual/release-notes/rl-2405.section.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 2e9cd781ffb1..a8c83375d3c7 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -41,6 +41,17 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m `CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`. +- The `systemd.oomd` module behavior is changed as: + + - Raise ManagedOOMMemoryPressureLimit from 50% to 80%. This should make systemd-oomd kill things less often, and fix issues like [this](https://pagure.io/fedora-workstation/issue/358). + Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/806c95e1c70af18f81d499b24cd7acfa4c36ffd6?branch=806c95e1c70af18f81d499b24cd7acfa4c36ffd6) + + - Remove swap policy. This helps prevent killing processes when user's swap is small. + + - Expand the memory pressure policy to system.slice, user-.slice, and all user owned slices. Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb) + + - `systemd.oomd.enableUserServices` is renamed to `systemd.oomd.enableUserSlices`. + ## Other Notable Changes {#sec-release-24.05-notable-changes} From bc58917492c1acdcaa0cb761e770b0780a4dde4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 08:57:53 +0000 Subject: [PATCH 013/170] gi-crystal: 0.19.0 -> 0.21.0 --- pkgs/development/tools/gi-crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index b5d66566a6ff..8b664ee1e00f 100644 --- a/pkgs/development/tools/gi-crystal/default.nix +++ b/pkgs/development/tools/gi-crystal/default.nix @@ -5,13 +5,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o="; + hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path From 8fe8a22578c8591f5b8756439910e655da6c4615 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 17 Dec 2023 21:41:32 +0000 Subject: [PATCH 014/170] nixos/munge: ask for network-online instead of network.target --- nixos/modules/services/security/munge.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 4d6fe33f697b..be7af31607c1 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -45,7 +45,12 @@ in systemd.services.munged = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wants = [ + "network-online.target" + ]; + after = [ + "network-online.target" + ]; path = [ pkgs.munge pkgs.coreutils ]; From b29d689e3ad8f69703fb48ff68b5d0a7366ffb5c Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 17 Dec 2023 21:43:46 +0000 Subject: [PATCH 015/170] nixos/munge: ask for the optional time-sync.target --- nixos/modules/services/security/munge.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index be7af31607c1..c3c77489cba4 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -47,9 +47,11 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" + "time-sync.target" ]; after = [ "network-online.target" + "time-sync.target" ]; path = [ pkgs.munge pkgs.coreutils ]; From 515a26d9972435834e2d8eaf1746b3a0bfc6c716 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 17 Dec 2023 22:15:27 +0000 Subject: [PATCH 016/170] nixos/munge: run in foreground instead of using pidfile Confuse systemd less --- nixos/modules/services/security/munge.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index c3c77489cba4..521f847802f6 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -58,9 +58,7 @@ in serviceConfig = { ExecStartPre = "+${pkgs.coreutils}/bin/chmod 0400 ${cfg.password}"; - ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}"; - PIDFile = "/run/munge/munged.pid"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${pkgs.munge}/bin/munged --foreground --key-file ${cfg.password}"; User = "munge"; Group = "munge"; StateDirectory = "munge"; From b27c3e8252a3890224a168af167ecebc56298d5f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 17 Dec 2023 22:18:06 +0000 Subject: [PATCH 017/170] nixos/munge: restart "on-failure" (the default was "no") --- nixos/modules/services/security/munge.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 521f847802f6..9d306c205f94 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -63,6 +63,7 @@ in Group = "munge"; StateDirectory = "munge"; StateDirectoryMode = "0711"; + Restart = "on-failure"; RuntimeDirectory = "munge"; }; From ec2daea6e2c63b960b79e522176f62e2ab481341 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 24 Dec 2023 10:08:44 +0100 Subject: [PATCH 018/170] stellarium: 23.3 -> 23.4 https://github.com/Stellarium/stellarium/releases/tag/v23.4 --- .../science/astronomy/stellarium/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3b61c8dac2b8..cad727c75fd6 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -18,17 +18,19 @@ , indilib , libnova , qttools +, exiv2 +, nlopt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "23.3"; + version = "23.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; - rev = "v${version}"; - hash = "sha256-bYvGmYu9jMHk2IUICz2kCVh56Ymz8JHqurdWV+xEdJY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-rDqDs6sFaZQbqJcCRhY5w8sFM2mYHHvw0Ud2Niimg4Y="; }; patches = [ @@ -66,12 +68,14 @@ stdenv.mkDerivation rec { qxlsx indilib libnova + exiv2 + nlopt ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; preConfigure = '' - export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major version}0101 +%s) + export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s) '' + lib.optionalString stdenv.isDarwin '' export LC_ALL=en_US.UTF-8 ''; @@ -89,11 +93,11 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Free open-source planetarium"; homepage = "https://stellarium.org/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ kilianar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kilianar ]; }; -} +}) From 0f4bd7872cfcbdf4408dba731437f1a17820dffb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 019/170] h3: add dev output --- pkgs/development/misc/h3/default.nix | 2 ++ pkgs/development/python-modules/h3/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 13c8f8d0424e..b0b13cd03331 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -18,6 +18,8 @@ let inherit hash; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index f512d7c08cc5..f5413e544843 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { prePatch = let cmakeCommands = '' - include_directories(${h3}/include/h3) + include_directories(${lib.getDev h3}/include/h3) link_directories(${h3}/lib) ''; in '' From 7858f253d60d2d0c6c0ffb25a7a49741553fcc3a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 020/170] h3: use callPackages to make it overridable --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ba31c6d6db2..a1cdb0fd1cde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18149,7 +18149,7 @@ with pkgs; ### DEVELOPMENT / MISC - inherit (callPackage ../development/misc/h3 { }) h3_3 h3_4; + inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4; h3 = h3_3; From fd109717f822c892567789934a866ec9ce93b37f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 021/170] h3: do not expose static as argument --- pkgs/development/misc/h3/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index b0b13cd03331..7348a25e069b 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -2,7 +2,6 @@ , stdenv , cmake , fetchFromGitHub -, static ? stdenv.hostPlatform.isStatic }: let @@ -23,7 +22,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + "-DBUILD_SHARED_LIBS=ON" "-DBUILD_BENCHMARKS=OFF" "-DBUILD_FUZZERS=OFF" "-DBUILD_GENERATORS=OFF" From 7fc99b0e79629a190174658ab7237633df8bdd87 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 022/170] libui-ng: init at unstable-2023-12-19 --- pkgs/by-name/li/libui-ng/package.nix | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/li/libui-ng/package.nix diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix new file mode 100644 index 000000000000..c2c2f6b18ea2 --- /dev/null +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, cmocka +, darwin +, fetchFromGitHub +, gtk3 +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libui-ng"; + version = "unstable-2023-12-19"; + + src = fetchFromGitHub { + owner = "libui-ng"; + repo = "libui-ng"; + rev = "8de4a5c8336f82310df1c6dad51cb732113ea114"; + hash = "sha256-ZMt2pEHwxXxLWtK8Rm7hky9Kxq5ZIB0olBLf1d9wVfc="; + }; + + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace meson.build --replace "'-arch', 'arm64'" "" + ''; + + nativeBuildInputs = [ + cmocka + meson + ninja + pkg-config + ]; + + buildInputs = + if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.CoreFoundation + ] else [ + gtk3 + ]; + + mesonFlags = [ + (lib.mesonBool "examples" (!stdenv.isDarwin)) + ]; + + meta = with lib; { + description = "A portable GUI library for C"; + homepage = "https://github.com/libui-ng/libui-ng"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = platforms.all; + }; +} From b5f5d58b8fefcf22c73bacec8651768cd7ad27f2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 023/170] h3: do not build filters by default --- pkgs/development/misc/h3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 7348a25e069b..a672bf38b004 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -2,6 +2,7 @@ , stdenv , cmake , fetchFromGitHub +, withFilters ? false }: let @@ -29,6 +30,7 @@ let "-DENABLE_COVERAGE=OFF" "-DENABLE_FORMAT=OFF" "-DENABLE_LINTING=OFF" + (lib.cmakeBool "BUILD_FILTERS" withFilters) ]; meta = with lib; { From 2f3dee3492801fffd9f56c6abf5cb20c31091808 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 25 Dec 2023 16:27:36 +1000 Subject: [PATCH 024/170] ignite-cli: init at 28.1.0 --- pkgs/by-name/ig/ignite-cli/package.nix | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/ig/ignite-cli/package.nix diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix new file mode 100644 index 000000000000..839680bf83af --- /dev/null +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, go +, buf +}: + +buildGoModule rec { + pname = "ignite-cli"; + version = "28.1.0"; + + src = fetchFromGitHub { + repo = "cli"; + owner = "ignite"; + rev = "v${version}"; + hash = "sha256-/MsBVJ3aqlNfGtktjqDKGdibbZea/bdLuQbXnP3Ag0k="; + }; + + vendorHash = "sha256-VAXzwZ79TGvAoSRzjupL9XkXBn05tvaPCtRuxhls6XE="; + + nativeBuildInputs = [ makeWrapper ]; + + # Many tests require access to either executables, state or networking + doCheck = false; + + # Required for wrapProgram + allowGoReference = true; + + # Required for commands like `ignite version`, `ignite network` and others + postFixup = '' + wrapProgram $out/bin/ignite --prefix PATH : ${lib.makeBinPath [ go buf ]} + ''; + + meta = with lib; { + homepage = "https://ignite.com/"; + changelog = "https://github.com/ignite/cli/releases/tag/v${version}"; + description = "All-in-one platform to build, launch, and maintain any crypto application on a sovereign and secured blockchain"; + license = licenses.asl20; + maintainers = with maintainers; [ kashw2 ]; + mainProgram = "ignite"; + }; +} From d552cc3b6622cf7294f99953305df1664e9e8300 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 03:36:19 +0000 Subject: [PATCH 025/170] fioctl: 0.38 -> 0.40 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index d27e5eb7386d..e6207b440252 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.38"; + version = "0.40"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-MA7mMGZyRbQ4165qB+Q6/gQZP/yaUoZmMCVrPCPZoj4="; + sha256 = "sha256-G1CHm5z2D7l3NDmUMhubJsrXYUHb6FJ70EsYQShhsDE="; }; - vendorHash = "sha256-OmukK6ecaiCRnK6fL238GhkxW4A4yrcR/xelBZzVwqI="; + vendorHash = "sha256-j0tdFvOEp9VGx8OCfUruCzwVSB8thcenpvVNn7Rf0dA="; ldflags = [ "-s" "-w" From 57c1681ce6569fea5bdc6bfced5c3f87a16e6879 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 00:43:22 +0000 Subject: [PATCH 026/170] ebusd: 23.2 -> 23.3 --- pkgs/servers/ebusd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/servers/ebusd/default.nix index 318c274cf270..3e0b24c42c86 100644 --- a/pkgs/servers/ebusd/default.nix +++ b/pkgs/servers/ebusd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ebusd"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; + sha256 = "sha256-K3gZ5OudNA92S38U1+HndxjA7OVfh2ymYf8OetB646M="; }; nativeBuildInputs = [ From 09cc92d9257c9525f3101509a1368f8ffe72a5df Mon Sep 17 00:00:00 2001 From: Tyler Vick Date: Tue, 26 Dec 2023 18:11:53 -0700 Subject: [PATCH 027/170] maintainers: add tylervick --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0c4e245e52c..c75b91f3919c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18979,6 +18979,13 @@ matrix = "@ty:tjll.net"; name = "Tyler Langlois"; }; + tylervick = { + email = "nix@tylervick.com"; + github = "tylervick"; + githubId = 1395852; + name = "Tyler Vick"; + matrix = "@tylervick:matrix.org"; + }; tymscar = { email = "oscar@tymscar.com"; github = "tymscar"; From 40a19c1d4745b3882a113132bed40e65f9c30ccf Mon Sep 17 00:00:00 2001 From: Alexander Lash <167740+abl@users.noreply.github.com> Date: Tue, 26 Dec 2023 17:08:42 -0800 Subject: [PATCH 028/170] jam: set std=c89 jam relies on c89 conventions; this restores the ability to build on recent Darwin. --- pkgs/development/tools/build-managers/jam/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 2a40c5970984..bf06954df4de 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -7,6 +7,9 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; + # Jam uses c89 conventions + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + # Jambase expects ar to have flags. preConfigure = '' export AR="$AR rc" From 58cb40fa7dcb17270c11730e9f800d87dee5ad9d Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 27 Dec 2023 20:14:10 +0900 Subject: [PATCH 029/170] clipboard-jh: 0.8.3 -> 0.9.0.1 --- pkgs/tools/misc/clipboard-jh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 1c9ccfe41b1b..abd52a5d012e 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.8.3"; + version = "0.9.0.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-G0zOr56dR9rmymQ9MwPNnMZ2LZuuz4NiswRQIvdS9MY="; + hash = "sha256-iILtyURYCshicgAV3MWkgMQsXHe7Unj1A08W7tUMU2o="; }; postPatch = '' From 28d964a8fa7f659a69a0a23c371cef93b6cbdfe9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 13:38:30 +0000 Subject: [PATCH 030/170] nsz: 4.6.0 -> 4.6.1 --- pkgs/development/python-modules/nsz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index bd6ff0a05acb..05bbad2d2180 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2Df+xvfDHtZt3XW4ShKZFsjsFigW+3Avz8uStVtC1i4="; + hash = "sha256-ch4HzQFa95o3HMsi7R0LpPWmhN/Z9EYfrmCdUZLwPSE="; }; propagatedBuildInputs = [ From d4aa883213e2ac0f3f470820c024549f6ebde693 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 8 Dec 2023 11:03:20 -0500 Subject: [PATCH 031/170] gamemode: add meta.changelog --- pkgs/tools/games/gamemode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 9d2d3f7c6a3e..2b9c51d86285 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -105,7 +105,8 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Optimise Linux system performance on demand"; - homepage = "https://github.com/FeralInteractive/GameMode"; + homepage = "https://github.com/FeralInteractive/gamemode"; + changelog = "https://github.com/FeralInteractive/gamemode/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; From 30a6b77c41d30c65ec9a91e658fea8da7bdd2480 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Dec 2023 08:53:42 -0500 Subject: [PATCH 032/170] gamemode: 1.7 -> 1.8.1 https://github.com/FeralInteractive/gamemode/blob/1.8.1/CHANGELOG.md --- pkgs/tools/games/gamemode/default.nix | 35 +++++++------------ .../no-install-systemd-sysusers.patch | 16 --------- .../gamemode/preload-nix-workaround.patch | 2 +- 3 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 2b9c51d86285..928b9233bccd 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , libgamemode32 +, makeWrapper , meson , ninja , pkg-config @@ -10,7 +10,6 @@ , inih , systemd , appstream -, makeWrapper , findutils , gawk , procps @@ -19,28 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "gamemode"; - version = "1.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "FeralInteractive"; repo = "gamemode"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; + hash = "sha256-kusb58nGxYA3U9GbZdW3hLjA3NmHc+af0VT4iGRewBw="; }; - outputs = [ "out" "dev" "lib" "man" "static" ]; + outputs = [ "out" "dev" "lib" "man" ]; patches = [ # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch - # Do not install systemd sysusers configuration - ./no-install-systemd-sysusers.patch - - # fix build with glibc >=2.36 (declaration of pidfd_open) - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f.patch"; - sha256 = "sha256-pWf2NGbd3gEJFwVP/EIJRbTD29V7keTQHy388enktsY="; - }) ]; postPatch = '' @@ -67,12 +58,15 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - # libexec is just a way to package binaries without including them - # in PATH. It doesn't make sense to install them to $lib - # (the default behaviour in the meson hook). - "--libexecdir=${placeholder "out"}/libexec" - + "-Dwith-pam-limits-dir=etc/security/limits.d" "-Dwith-systemd-user-unit-dir=lib/systemd/user" + "-Dwith-systemd-group-dir=lib/sysusers.d" + + # The meson builder installs internal executables to $lib/lib by + # default, but they should be installed to "$out". It's also more + # appropriate to install these executables under a libexec + # directory instead of lib. + "--libexecdir=libexec" ]; doCheck = true; @@ -80,11 +74,6 @@ stdenv.mkDerivation (finalAttrs: { appstream ]; - # Move static libraries to $static so $lib only contains dynamic libraries. - postInstall = '' - moveToOutput lib/*.a "$static" - ''; - postFixup = '' # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since # they use dlopen to load libgamemode. Can't use makeWrapper since diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch deleted file mode 100644 index 27aa1d4d710c..000000000000 --- a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/data/meson.build w/data/meson.build -index 6fb82d8..2e9e170 100644 ---- i/data/meson.build -+++ w/data/meson.build -@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' - configuration: data_conf, - install_dir: path_systemd_unit_dir, - ) -- # Install the sysusers.d file -- install_data( -- files('gamemode.conf'), -- install_dir: path_systemd_sysusers_dir, -- ) - endif - - # Install the D-BUS service file diff --git a/pkgs/tools/games/gamemode/preload-nix-workaround.patch b/pkgs/tools/games/gamemode/preload-nix-workaround.patch index 9c8db37f5d91..06989ff984ab 100644 --- a/pkgs/tools/games/gamemode/preload-nix-workaround.patch +++ b/pkgs/tools/games/gamemode/preload-nix-workaround.patch @@ -6,7 +6,7 @@ index 573b3e4..6f2799e 100755 # ld will find the right path to load the library, including for 32-bit apps. LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}" -+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@" +exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@" From 02d4aa23069d83477e1cd4fd8675199df139ace0 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Dec 2023 08:52:08 -0500 Subject: [PATCH 033/170] nixos/gamemode: format with nixpkgs-fmt --- nixos/modules/programs/gamemode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index c43e2c2296f5..344f392852e2 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -18,7 +18,7 @@ in settings = mkOption { type = settingsFormat.type; - default = {}; + default = { }; description = lib.mdDoc '' System-wide configuration for GameMode (/etc/gamemode.ini). See gamemoded(8) man page for available settings. From 9ecbdfb5bd127b1c4fcea2bd325b19271f07b5a3 Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Wed, 27 Dec 2023 17:55:09 +0100 Subject: [PATCH 034/170] portunus: 1.1.0 -> 2.0.0 Changelog: --- nixos/doc/manual/release-notes/rl-2405.section.md | 5 +++++ nixos/modules/services/misc/portunus.nix | 4 +++- pkgs/servers/portunus/default.nix | 7 +++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index fe088bb9d9b0..eff579bbb369 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -86,6 +86,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m The `nimPackages` and `nim2Packages` sets have been removed. See https://nixos.org/manual/nixpkgs/unstable#nim for more information. +- [Portunus](https://github.com/majewsky/portunus) has been updated to 2.0. + This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts. + After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes. + Support for weak password hashes will be removed in NixOS 24.11. + - `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc. - The Yama LSM is now enabled by default in the kernel, which prevents ptracing diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index 3299b6404c2b..58dd3591172c 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -102,7 +102,9 @@ in ldap = { package = mkOption { type = types.package; - # needs openldap built with a libxcrypt that support crypt sha256 until https://github.com/majewsky/portunus/issues/2 is solved + # needs openldap built with a libxcrypt that support crypt sha256 until users have had time to migrate to newer hashes + # Ref: + # TODO: remove in NixOS 24.11 (cf. same note on pkgs/servers/portunus/default.nix) default = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }; defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }"; description = lib.mdDoc "The OpenLDAP package to use."; diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix index b2cd17f016d2..f42888cbd32a 100644 --- a/pkgs/servers/portunus/default.nix +++ b/pkgs/servers/portunus/default.nix @@ -1,19 +1,22 @@ { lib , buildGoModule , fetchFromGitHub +, libxcrypt-legacy # TODO: switch to libxcrypt for NixOS 24.11 (cf. same note on nixos/modules/services/misc/portunus.nix) }: buildGoModule rec { pname = "portunus"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE="; + sha256 = "sha256-jicqH31Q+kDkOvtCg+HStQ4LUUzKm5ZO4utnAkCOLvY="; }; + buildInputs = [ libxcrypt-legacy ]; + vendorHash = null; postInstall = '' From 85afbc22543d7267693bb3067ba53abc72507479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 17:49:13 +0000 Subject: [PATCH 035/170] python310Packages.clarifai-grpc: 9.11.2 -> 9.11.4 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index d7b727830b13..d8b74f55f7d4 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.11.2"; + version = "9.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-ImfZ5g/EhAqkP4CbA7AZHWHQ88KBVCwMVU/j0OQCilg="; + hash = "sha256-uCXtd9m2phIgP85syIPtoFIxM9dkBzFxxK6OOF0VWAA="; }; nativeBuildInputs = [ From a06fdd32ecc31b20daac5f855c8620dae5562dac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 18:01:24 +0000 Subject: [PATCH 036/170] python310Packages.cloudpathlib: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/cloudpathlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index ae22d4bcafbf..b76de3717bf4 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drivendataorg"; repo = "cloudpathlib"; - rev = "v${version}"; - hash = "sha256-d4CbzPy3H5HQ4YmSRCRMEYaTpwB7F0Bznd26aKWiHTA="; + rev = "refs/tags/v${version}"; + hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; }; nativeBuildInputs = [ From 64395b676fdc0b47d42501bd7db2eaf34323b42d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 27 Dec 2023 18:36:19 +0000 Subject: [PATCH 037/170] nixosTests.allDrivers.anbox: avoid use of aliases Before the change eval of a test failed with disabled aliases as: $ nix build -f. nixosTests.allDrivers.anbox --arg config '{ allowAliases = false; }' ... error: attribute 'linuxPackages_5_15' missing --- nixos/tests/anbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/anbox.nix b/nixos/tests/anbox.nix index dfd6c13d9318..a00116536db7 100644 --- a/nixos/tests/anbox.nix +++ b/nixos/tests/anbox.nix @@ -15,7 +15,7 @@ test-support.displayManager.auto.user = "alice"; virtualisation.anbox.enable = true; - boot.kernelPackages = pkgs.linuxPackages_5_15; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_15; virtualisation.memorySize = 2500; }; From 628b80515ad91f718f8003a234a7bcb4b6a442a6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 27 Dec 2023 14:30:39 -0500 Subject: [PATCH 038/170] lxc: fix license and update long description --- pkgs/os-specific/linux/lxc/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 4192de0cfeab..c3733e1d85ca 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -89,14 +89,12 @@ stdenv.mkDerivation rec { meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = lib.licenses.lgpl21Plus; + license = lib.licenses.gpl2; longDescription = '' - LXC is the userspace control package for Linux Containers, a - lightweight virtual system mechanism sometimes described as - "chroot on steroids". LXC builds up from chroot to implement - complete virtual systems, adding resource management and isolation - mechanisms to Linux’s existing process management infrastructure. + LXC containers are often considered as something in the middle between a chroot and a + full fledged virtual machine. The goal of LXC is to create an environment as close as + possible to a standard Linux installation but without the need for a separate kernel. ''; platforms = lib.platforms.linux; From 46974ccd231890913c840627d2227825b7f9a7c3 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 27 Dec 2023 14:32:57 -0500 Subject: [PATCH 039/170] lxc: 4.0.12 -> 5.0.3 --- .../linux/lxc/add-meson-options.patch | 153 ++++++++++++++++++ pkgs/os-specific/linux/lxc/default.nix | 121 ++++++-------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 205 insertions(+), 73 deletions(-) create mode 100644 pkgs/os-specific/linux/lxc/add-meson-options.patch diff --git a/pkgs/os-specific/linux/lxc/add-meson-options.patch b/pkgs/os-specific/linux/lxc/add-meson-options.patch new file mode 100644 index 000000000000..01aea4df2747 --- /dev/null +++ b/pkgs/os-specific/linux/lxc/add-meson-options.patch @@ -0,0 +1,153 @@ +diff --git a/meson.build b/meson.build +index 21a8705d0..f12b81442 100644 +--- a/meson.build ++++ b/meson.build +@@ -50,7 +50,7 @@ rootfsmount = get_option('rootfs-mount-path') + user_network_db_opt = get_option('usernet-db-path') + user_network_conf_opt = get_option('usernet-config-path') + +-bashcompletiondir = join_paths('/', 'usr', 'share', 'bash-completion', 'completions') ++bashcompletiondir = join_paths(prefixdir, get_option('datadir'), 'bash-completion', 'completions') + bindir = join_paths(prefixdir, get_option('bindir')) + datadir = join_paths(prefixdir, get_option('datadir')) + mandir = join_paths(prefixdir, get_option('mandir')) +@@ -123,22 +123,6 @@ conf.set('PACKAGE_VERSION', meson.project_version()) + conf.set('RUNTIME_PATH', runtimepath) + conf.set('SYSCONFDIR', sysconfdir) + +-# Set sysconfdir +-fs = import('fs') +-distrosysconfdir = get_option('distrosysconfdir') +-if distrosysconfdir != '' +- distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-elif fs.is_dir('/etc/sysconfig') +- distrosysconfdir = join_paths(sysconfdir, 'sysconfig') +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-elif fs.is_dir('/etc/default') +- distrosysconfdir = join_paths(sysconfdir, 'default') +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-else +- error('"distrosysconfdir" is not set') +-endif +- + # Cross-compile on Android. + srcconf.set10('IS_BIONIC', host_machine.system() == 'android') + +@@ -148,6 +132,7 @@ coverity = get_option('coverity-build') + init_script = get_option('init-script') + sanitize = get_option('b_sanitize') + want_examples = get_option('examples') ++want_install_init = get_option('install-init-files') + want_io_uring = get_option('io-uring-event-loop') + want_pam_cgroup = get_option('pam-cgroup') + want_mans = get_option('man') +@@ -160,10 +145,30 @@ want_openssl = get_option('openssl') + want_selinux = get_option('selinux') + want_oss_fuzz = get_option('oss-fuzz') + want_seccomp = get_option('seccomp') ++want_spec = get_option('specfile') ++want_state_dirs = get_option('install-state-dirs') + want_thread_safety = get_option('thread-safety') + want_memfd_rexec = get_option('memfd-rexec') + want_sd_bus = get_option('sd-bus') + ++# Set sysconfdir ++fs = import('fs') ++if want_install_init ++ distrosysconfdir = get_option('distrosysconfdir') ++ if distrosysconfdir != '' ++ distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ elif fs.is_dir('/etc/sysconfig') ++ distrosysconfdir = join_paths(sysconfdir, 'sysconfig') ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ elif fs.is_dir('/etc/default') ++ distrosysconfdir = join_paths(sysconfdir, 'default') ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ else ++ error('"distrosysconfdir" is not set') ++ endif ++endif ++ + srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern) + if coverity + srcconf.set('ENABLE_COVERITY_BUILD', 1) +@@ -926,14 +931,16 @@ if want_apparmor + endif + subdir('config/bash') + subdir('config/etc') +-subdir('config/init/common') +-subdir('config/init/systemd') +-subdir('config/init/sysvinit') +-subdir('config/init/upstart') ++if want_install_init ++ subdir('config/init/common') ++ subdir('config/init/systemd') ++ subdir('config/init/sysvinit') ++ subdir('config/init/upstart') ++ subdir('config/sysconfig') ++endif + if want_selinux + subdir('config/selinux') + endif +-subdir('config/sysconfig') + subdir('config/templates') + subdir('config/templates/common.conf.d') + subdir('config/yum') +@@ -963,21 +970,25 @@ pkg_config_file = pkgconfig.generate(liblxc, + ) + + # Empty dirs. +-install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) +-install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) ++if want_state_dirs ++ install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) ++ install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) ++endif + + # RPM spec file. +-specconf = configuration_data() +-specconf.set('LXC_VERSION_BASE', meson.project_version()) +-specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) +-specconf.set('PACKAGE', meson.project_name()) +-specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) +- +-configure_file( +- configuration: specconf, +- input: 'lxc.spec.in', +- output: 'lxc.spec', +- install: false) ++if want_spec ++ specconf = configuration_data() ++ specconf.set('LXC_VERSION_BASE', meson.project_version()) ++ specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) ++ specconf.set('PACKAGE', meson.project_name()) ++ specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) ++ ++ configure_file( ++ configuration: specconf, ++ input: 'lxc.spec.in', ++ output: 'lxc.spec', ++ install: false) ++endif + + # Build overview. + status = [ +diff --git a/meson_options.txt b/meson_options.txt +index 9803473d2..84a6d45b5 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -120,3 +120,12 @@ option('memfd-rexec', type : 'boolean', value : 'true', + + option('distrosysconfdir', type : 'string', value: '', + description: 'relative path to sysconfdir for distro default configuration') ++ ++option('specfile', type : 'boolean', value: true, ++ description: 'whether to prepare RPM spec') ++ ++option('install-init-files', type : 'boolean', value: true, ++ description: 'whether to install init files for local init (e.g. systemd, sysvinit)') ++ ++option('install-state-dirs', type : 'boolean', value: true, ++ description: 'whether to create state directories on install') diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c3733e1d85ca..4caf5b9aa943 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,90 +1,71 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x -, docbook_xml_dtd_45, python3Packages, pam, fetchpatch - -# Optional Dependencies -, libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null -, libcap ? null, systemd ? null +{ + lib, + stdenv, + fetchFromGitHub, + docbook2x, + libapparmor, + libcap, + libseccomp, + libselinux, + meson, + ninja, + nix-update-script, + nixosTests, + openssl, + pam, + pkg-config, + systemd, }: stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.12"; + version = "5.0.3"; - src = fetchurl { - url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "lxc"; + rev = "refs/tags/lxc-${version}"; + hash = "sha256-lnLmLgWXt3pI2S+4OeHRlPP5gui7S7ZXXClFt+n/8sY="; }; nativeBuildInputs = [ - autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython + docbook2x + meson + ninja + pkg-config ]; + buildInputs = [ - pam libapparmor gnutls libselinux libseccomp libcap - python3Packages.python python3Packages.setuptools systemd + libapparmor + libcap + libseccomp + libselinux + openssl + pam + systemd ]; - patches = [ - ./support-db2x.patch + patches = [ ./add-meson-options.patch ]; - # Backport of https://github.com/lxc/lxc/pull/4179 for glibc-2.36 build - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3.patch"; - sha256 = "sha256-aC1XQesRJfkyQnloB3NvR4p/1WITrqkGYzw50PDxDrs="; - excludes = [ "meson.build" ]; - }) + mesonFlags = [ + "-Dinstall-init-files=false" + "-Dinstall-state-dirs=false" + "-Dspecfile=false" ]; - postPatch = '' - sed -i '/chmod u+s/d' src/lxc/Makefile.am - ''; + enableParallelBuilding = true; - XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + doCheck = true; - configureFlags = [ - "--enable-pam" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--disable-api-docs" - "--with-init-script=none" - "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ lib.optional (libapparmor != null) "--enable-apparmor" - ++ lib.optional (libselinux != null) "--enable-selinux" - ++ lib.optional (libseccomp != null) "--enable-seccomp" - ++ lib.optional (libcap != null) "--enable-capabilities" - ++ [ - "--disable-examples" - "--enable-python" - "--disable-lua" - "--enable-bash" - (if doCheck then "--enable-tests" else "--disable-tests") - "--with-rootfs-path=/var/lib/lxc/rootfs" - ]; - - doCheck = false; - - installFlags = [ - "localstatedir=\${TMPDIR}" - "sysconfdir=\${out}/etc" - "sysconfigdir=\${out}/etc/default" - "bashcompdir=\${out}/share/bash-completion/completions" - "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" - "LXCPATH=\${TMPDIR}/var/lib/lxc" - ]; - - postInstall = '' - wrapPythonPrograms - - completions=( - lxc-attach lxc-cgroup lxc-console lxc-destroy lxc-device lxc-execute - lxc-freeze lxc-info lxc-monitor lxc-snapshot lxc-stop lxc-unfreeze - ) - pushd $out/share/bash-completion/completions/ - mv lxc lxc-start - for completion in ''${completions[@]}; do - ln -sfn lxc-start $completion - done - popd - ''; + passthru = { + tests.incus = nixosTests.incus.container; + updateScript = nix-update-script { + extraArgs = [ + "-vr" + "lxc-(.*)" + ]; + }; + }; meta = { homepage = "https://linuxcontainers.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cbd2ff12704..883815f5893b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10731,9 +10731,7 @@ with pkgs; lwc = callPackage ../tools/misc/lwc { }; - lxc = callPackage ../os-specific/linux/lxc { - autoreconfHook = buildPackages.autoreconfHook269; - }; + lxc = callPackage ../os-specific/linux/lxc { }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; From 708a5c2ba268f12646b9a5e9b9c58d83c30e354b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 02:16:04 +0000 Subject: [PATCH 040/170] level-zero: 1.15.1 -> 1.15.8 --- pkgs/development/libraries/level-zero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index f2ea91bf8be8..50cbe4a18cc3 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.15.1"; + version = "1.15.8"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; + hash = "sha256-n1dcsI2sLeB68HpI5oQ5p3zdAcSvnSY+qpHL9vp6FOk="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; From e7b0d0499304485d893b7b9533d828d152fe9096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 03:47:06 +0000 Subject: [PATCH 041/170] python310Packages.langsmith: 0.0.72 -> 0.0.75 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 888147b4b571..a24fc80db16c 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.72"; + version = "0.0.75"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-o7KERA+fYo69jR8LSsa901nE1r3GD38rYO7sj0QsOgM="; + hash = "sha256-BbDB3xP3OCRXxbOqFIzFNrpK5+wHbIZ/VlurNXrXpTw="; }; sourceRoot = "${src.name}/python"; From 4e1d0581c117ac4dc1cc795c777ddacc040c1f45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 06:12:32 +0000 Subject: [PATCH 042/170] kanshi: 1.4.0 -> 1.5.0 --- pkgs/tools/wayland/kanshi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index c0884acfeadb..6d2d1a4b1a98 100644 --- a/pkgs/tools/wayland/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "sha256-5dIBQBA3OMlmaSYswwggFuedsb3i4uy9bcTZahIS2gQ="; + sha256 = "sha256-vxysZWFcfYwOgFMcRuPzYpWmFOFMiwc62DqI+nTQ4MI="; }; strictDeps = true; From 617ea42bba6b58d4d3296b4da482a89cc44992af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:40:34 +0100 Subject: [PATCH 043/170] python311Packages.dvc: 3.33.4 -> 3.37.0 Diff: https://github.com/iterative/dvc/compare/refs/tags/3.33.4...3.37.0 Changelog: https://github.com/iterative/dvc/releases/tag/3.37.0 --- pkgs/development/python-modules/dvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index c4577e691357..3d1461ab0a76 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.33.4"; + version = "3.37.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NWu12FVJDSSuxYGVWFNlbAEUINg05s64EJ6gIaErQ9E="; + hash = "sha256-mO6fhPUub09nWmiFSciwNhuS4VJAjQgIukc+lQWB7Qg="; }; pythonRelaxDeps = [ From ec5f6fe4ae09c0fc973f5484a6212a6a1a6d6921 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:43:53 +0100 Subject: [PATCH 044/170] python311Packages.dvc-data: 3.0.1 -> 3.5.0 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/3.0.1...3.5.0 Changelog: https://github.com/iterative/dvc-data/releases/tag/3.5.0 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 7c5489e3648a..ea4d12b9921d 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.0.1"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-OySGTJFHBb+Ot5NUZsQZ4gJkbc6ojrSyDWDPp32q74E="; + hash = "sha256-vLSb+RIaebF+ili+6bvU8wplcpycPVRadUkhkLHdqi8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1ae6d471b7991fe95461ddec3c20af2763116a66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:44:12 +0100 Subject: [PATCH 045/170] python311Packages.dvclive: 3.4.1 -> 3.5.1 Diff: https://github.com/iterative/dvclive/compare/refs/tags/3.4.1...3.5.1 Changelog: https://github.com/iterative/dvclive/releases/tag/3.5.1 --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f97a418a61ea..ebe26e2b057f 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.4.1"; + version = "3.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-apk1akdFLtps5fq28GUgLef2VEgZulj7vuhxsGpCqJE="; + hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4eb07b724b41505a5027167738cb63501ad22af5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 08:44:26 +0100 Subject: [PATCH 046/170] python311Packages.dvc-objects: 2.0.1 -> 3.0.0 Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/2.0.1...3.0.0 Changelog: https://github.com/iterative/dvc-objects/releases/tag/3.0.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index b5df60a987e6..1f07fe7b8707 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "2.0.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-nxZN0Q9mRAZJUOoxfE58lXZVOrY0r05iROcuo+nV99A="; + hash = "sha256-hpiDbECVXbBkewJa+RwrgTQFEFAb3Ir2qs0ENYuJtwI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5ac573e64774931e27a5787eeec7d131b8d43796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:22:59 +0000 Subject: [PATCH 047/170] prometheus-redis-exporter: 1.55.0 -> 1.56.0 --- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 3450ea73c68a..42db8a165a55 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-KF3tbMgcmZHn8u2wPVidH35vi/Aj7xXUvXPXUci6qrM="; + sha256 = "sha256-7tnl8iItGegfRXLF3f+tmNxgJWkai6n8EOP00zyqyYs="; }; - vendorHash = "sha256-zwWiUXexGI9noHSRC+h9/IT0qdNwPMDZyP3AIKtnRn0="; + vendorHash = "sha256-r+VJ2+4F3BQ0tmNTVHDOxKaKAPSIvgu7ZcQZ6BXt2kA="; ldflags = [ "-X main.BuildVersion=${version}" From 1d146c17886e37bd1b3ab57df329c2a4610e1fe8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 09:46:01 +0100 Subject: [PATCH 048/170] python311Packages.binary2strings: init at 0.1.13 Module to extract Ascii, Utf8, and Unicode strings from binary data https://github.com/glmcdona/binary2strings --- .../python-modules/binary2strings/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/binary2strings/default.nix diff --git a/pkgs/development/python-modules/binary2strings/default.nix b/pkgs/development/python-modules/binary2strings/default.nix new file mode 100644 index 000000000000..c122b67886da --- /dev/null +++ b/pkgs/development/python-modules/binary2strings/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pybind11 +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "binary2strings"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glmcdona"; + repo = "binary2strings"; + rev = "refs/tags/v${version}"; + hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "binary2strings" + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + meta = with lib; { + description = "Module to extract Ascii, Utf8, and Unicode strings from binary data"; + homepage = "https://github.com/glmcdona/binary2strings"; + changelog = "https://github.com/glmcdona/binary2strings/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d13edb009d3f..ed6bd4f4c787 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1456,6 +1456,8 @@ self: super: with self; { binary = callPackage ../development/python-modules/binary { }; + binary2strings = callPackage ../development/python-modules/binary2strings { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; bincopy = callPackage ../development/python-modules/bincopy { }; From ad7472b5c33877778c4711305ad053a54da23b95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 09:51:16 +0100 Subject: [PATCH 049/170] flare-floss: 2.3.0 -> 3.0.1 Diff: https://github.com/mandiant/flare-floss/compare/refs/tags/v2.3.0...v3.0.1 Changelog: https://github.com/mandiant/flare-floss/releases/tag/v3.0.1 --- pkgs/tools/security/flare-floss/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index b049ea166108..212d0a74ebb1 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -5,15 +5,15 @@ python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "2.3.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "mandiant"; repo = "flare-floss"; rev = "refs/tags/v${version}"; fetchSubmodules = true; # for tests - hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ="; + hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU="; }; postPatch = '' @@ -24,7 +24,12 @@ python3.pkgs.buildPythonPackage rec { --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ + binary2strings halo networkx pefile @@ -47,6 +52,10 @@ python3.pkgs.buildPythonPackage rec { cp -r floss/sigs $out/share/flare-floss/ ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with lib; { description = "Automatically extract obfuscated strings from malware"; homepage = "https://github.com/mandiant/flare-floss"; From 4b2912c5fbbc3f5348403626fc0eb59046029372 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Dec 2023 11:42:59 +0100 Subject: [PATCH 050/170] python311Packages.arviz: 0.16.1 -> 0.17.0 Changelog: https://github.com/arviz-devs/arviz/blob/main/CHANGELOG.md#v0170-2023-dec-22 --- pkgs/development/python-modules/arviz/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 0a186781b4a2..63bf85273811 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -8,13 +8,11 @@ , numba , numpy , pandas -, pytest , setuptools , cloudpickle , pytestCheckHook , scipy , packaging -, typing-extensions , pythonOlder , xarray , xarray-einstats @@ -33,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; + hash = "sha256-DqVwbiNJHdRxK3Ppfa6sqPJzDqMaj1mtlAJHFq09u2Y="; }; propagatedBuildInputs = [ @@ -86,6 +84,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access + "test_plot_ppc_transposed" "test_plot_separation" "test_plot_trace_legend" "test_cov" From 61a68fd52d4f270148e4ff9365ec46851ae8a9cf Mon Sep 17 00:00:00 2001 From: Tim Kleinschmidt Date: Thu, 28 Dec 2023 13:55:39 +0100 Subject: [PATCH 051/170] vscode-extensions.charliermarsh.ruff: 2023.40.0 -> 2023.60.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 52fa085311ef..d7df2dac1b5a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -710,8 +710,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.40.0"; - sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; + version = "2023.60.0"; + sha256 = "sha256-zxE4QcWt8M6djTbdIf0YNSpeF1w7vMK4/BW5ArCOYbE="; }; meta = { license = lib.licenses.mit; From 900c56ecab6c28b2e18be3d12fc2c1de2c6f6507 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 14:07:54 +0100 Subject: [PATCH 052/170] python311Packages.dvc-azure: 2.22.1 -> 3.0.1 Changelog: https://github.com/iterative/dvc-azure/releases/tag/3.0.1 --- .../python-modules/dvc-azure/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index fee36f66d886..339e36fc0489 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -6,34 +6,46 @@ , fetchPypi , knack , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-azure"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v3VRCN1OoST5RlfUOP9Dpfmf3o9C/ckusmh91Ya2Cik="; + hash = "sha256-TB7yY5b2AWBFt8+AnxyKyP6hoXi6cdHVjtffapRVfHc="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - adlfs azure-identity dvc-objects knack + adlfs + azure-identity + dvc-objects + knack ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_azure" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_azure" + # ]; meta = with lib; { - description = "azure plugin for dvc"; + description = "Azure plugin for dvc"; homepage = "https://pypi.org/project/dvc-azure/${version}"; changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}"; license = licenses.asl20; From 2a4e36d02b5d0a83374ee751dd110f4a6f0a3981 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:03:45 +0800 Subject: [PATCH 053/170] timeshift: 23.12.1 -> 23.12.2 https://github.com/linuxmint/timeshift/compare/23.12.1...23.12.2 --- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index b41ca774cf96..bcf6ff6af721 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "23.12.1"; + version = "23.12.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "uesedEXPfvI/mRs8BiNkv8B2vVxmtTSaIvlQIsajkVg="; + sha256 = "xeO1/YQGRTCCGMRPr6Dqb9+89lP24fPBDBJpvtcr2X0="; }; patches = [ From 5c2122c997074db98a05d13da6e05cc84fd09812 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:05:46 +0800 Subject: [PATCH 054/170] cinnamon.warpinator: 1.8.1 -> 1.8.2 https://github.com/linuxmint/warpinator/compare/1.8.1...1.8.2 --- pkgs/desktops/cinnamon/warpinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 4ccb373d0666..0539075ca51d 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-dxbs2Qq1Ix04yIA587tntLJ3W/pnA0wTiQ4BB5GCTR0="; + hash = "sha256-wBln4YqjZ8aI3D4Arwa7UgDKxNPSlC5fRZtjanTHl4Q="; }; nativeBuildInputs = [ From 0c98c1f2b93e1c40b9c64eb138f7e25fb7d7f732 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:06:41 +0800 Subject: [PATCH 055/170] cinnamon.mint-y-icons: 1.7.1 -> 1.7.2 https://github.com/linuxmint/mint-y-icons/compare/1.7.1...1.7.2 --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 9e86a0fb9dda..4742e7af8308 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Uzayo1hmNwOMszTV8/KqOLxjERBC/L16hRpCWbK10Uc="; + hash = "sha256-8dwJyvM5sQNtUzhreBCgSWeElGlp/z3Dk7/xCeUSGKU="; }; propagatedBuildInputs = [ From c291fe6a2ca8e65679a53185cbd059f02b8abc53 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:08:08 +0800 Subject: [PATCH 056/170] cinnamon.xreader: 4.0.0 -> 4.0.1 https://github.com/linuxmint/xreader/compare/4.0.0...4.0.1 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index fbf8fbdf64d4..c20177e043ee 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-TL8LlNQLGUevXlNcnS9HcdGh1TzC/0I/6reJpe6rahM="; + sha256 = "sha256-sADdslxDtI+zV8DLnczlzNtB9W+BhMP8vb5riSnPYaw="; }; nativeBuildInputs = [ From e4288024b8be0bc0c784eaf6834ac5d23b4177b5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:08:39 +0800 Subject: [PATCH 057/170] cinnamon.cinnamon-screensaver: 6.0.1 -> 6.0.2 https://github.com/linuxmint/cinnamon-screensaver/compare/6.0.1...6.0.2 --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index a42fa79c6768..17d846f305b2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-jWUPn5+ynuLdb2GaqKph1M62Ky00sRP/vUXedEvBT7A="; + hash = "sha256-6Js670Z3/5BwAHvEJrXJkBZvEvx1NeT+eXOKaqKqFqI="; }; nativeBuildInputs = [ From 2f3a9e93816434b1fd2545ac365a1a673d01f959 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:09:25 +0800 Subject: [PATCH 058/170] cinnamon.nemo: 6.0.1 -> 6.0.2 https://github.com/linuxmint/nemo/compare/6.0.1...6.0.2 --- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 202bfa19af39..7b124c7987da 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-3iGwpHuZrRBd35nAa3x1Lu/KDS1L42y5u8A4vM41b0Q="; + sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; }; patches = [ From dd1a4f9522027f86a87e5bb338179ebd2ec4e59f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:09:48 +0800 Subject: [PATCH 059/170] cinnamon.muffin: 6.0.0 -> 6.0.1 https://github.com/linuxmint/muffin/compare/6.0.0...6.0.1 --- pkgs/desktops/cinnamon/muffin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 98ee19c27e78..893ddf065333 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.0"; + version = "6.0.1"; outputs = [ "out" "dev" "man" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8="; + hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; }; patches = [ From 0e0889ec1d59f666adc554a2b096edc5a2a88c3a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 28 Dec 2023 22:10:30 +0800 Subject: [PATCH 060/170] cinnamon.cinnamon-common: 6.0.2 -> 6.0.3 https://github.com/linuxmint/cinnamon/compare/6.0.2...6.0.3 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 2d3d3be5092f..2f6f2f77ba4c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-/kjl/0Qdro6H3fMfs1dA0Zf/GT5Z4s6kK4vB+EBKw0g="; + hash = "sha256-8Y+WUnNQ4p/JeUR4q6Ti6HdoN5bghXs6XJsuWGY66S4="; }; patches = [ From c6edf4fe496c373e05308135ccdb44ea6288fe22 Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Thu, 28 Dec 2023 15:29:21 +0100 Subject: [PATCH 061/170] elixir-ls: 1.17.10 -> 1.18.1 elixir-ls 1.18.0 changed the name of the `debugger.sh` (which we call `elixir-debugger`) script to `debug_adapter.sh`, so the new name in this package is `elixir-debug-adapter`. --- pkgs/development/beam-modules/elixir-ls/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 167ffa0b5cc8..c2f688efce4d 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.10"; + version = "0.18.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-LUAYfR6MNNGLaqv8EBx0JQ8KYYD7jRvez3HJFnczV+Y="; + hash = "sha256-o5/H2FeDXzT/ZyWtLmRs+TWJQfmuDUnnR5Brvkifn6E="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-MVGYENy6/xI/ph/X0DxquigCuLK1FAEIONzoQU7TXoM="; + hash = "sha256-q4VKtGxrRaAhtNIJFjNN7tF+HFgU/UX9sKq0BkOIiQI="; }; # elixir-ls is an umbrella app @@ -50,9 +50,9 @@ mixRelease { --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-ls - substitute release/debugger.sh $out/bin/elixir-debugger \ + substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" - chmod +x $out/bin/elixir-debugger + chmod +x $out/bin/elixir-debug-adapter # prepare the launcher substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ From e1976625bd5942d52ffec80a31ef86077efa0a49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:17:54 +0100 Subject: [PATCH 062/170] python311Packages.archinfo: 9.2.81 -> 9.2.82 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.81...v9.2.82 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e8096551d022..fc31ed21b814 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e/13v2hm0yYoO2A/kz6ekvN1FP8XNqqypfZdHKGEItM="; + hash = "sha256-uK42wbP6zZFRR6JqHs3Ag5zsPT9JFyKviDRxLDa1QjY="; }; nativeBuildInputs = [ From fe84bedc3e9143d3a4e4979a7c7e9eff02c06c58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:17:57 +0100 Subject: [PATCH 063/170] python311Packages.ailment: 9.2.81 -> 9.2.82 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.81...v9.2.82 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 8edaa2495824..e85c15e534d8 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ovV6BlhED9Du/jKQzgBFSp+XPYVAkNONU5iOEd52e2s="; + hash = "sha256-jDejI5e2ASoQUMPS9Ajis14RF66HnbkoOK6+Xs8ydis="; }; nativeBuildInputs = [ From b5d32c220f97d05695b32fb97251f7cc28817457 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:18:02 +0100 Subject: [PATCH 064/170] python311Packages.pyvex: 9.2.81 -> 9.2.82 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 17f8185a8dfb..371258063763 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-59Lq2JKDWrtkRMZb5AjH69LX9+Zk+BvfKxKXG/qGw6g="; + hash = "sha256-m3vHz56w15M2oZhSDzO5wiAVk1+/DoxZxS0qBFh5pQM="; }; nativeBuildInputs = [ From e307f821380e9ae90c26e4916432d8f7a6503898 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:18:05 +0100 Subject: [PATCH 065/170] python311Packages.claripy: 9.2.81 -> 9.2.82 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.81...v9.2.82 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 138c75836d15..81a111c7f145 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-6DqIeLoJzpONte4WHI5EeV3iDDh1lNhegrNiKIgSAbY="; + hash = "sha256-veJd3M2Jf6snXZsR4P0wQpC0rSbIFT92QgyFFI5Er4Y="; }; nativeBuildInputs = [ From 4800ac04dfa2a93828efbb4bbf4309479217ed52 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:18:12 +0100 Subject: [PATCH 066/170] python311Packages.angr: 9.2.81 -> 9.2.82 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.81...v9.2.82 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 3d15fbb30be5..516d86acb6fd 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-ckak602Uz8YqBDVmh3iDh9d9/SPNRZMil8PskUbrjLA="; + hash = "sha256-3DqR1p2VK9Xe2Yk+gZ81GM4Cn39TDrx1LSivu4xVDOI="; }; propagatedBuildInputs = [ From e87d635ebdb53d54aab1622cc19696a24c8e395d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:20:49 +0100 Subject: [PATCH 067/170] python311Packages.cle: 9.2.81 -> 9.2.82 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.81...v9.2.82 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e6906ffe103b..1ae119f8404a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.81"; + version = "9.2.82"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-42J6uBM5Ek1uv5gc4ZwtWpVgUdS3Sd4Y+ge2hkG8QTA="; + hash = "sha256-fUp0nS4ILU90uvROH3qNy3kYrpt7yHzbCG5TE/0BqKU="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-NS3yi5Ysu0s5PcqnLYOUYI0qpfOX4/E/UDmReX7aNGM="; + hash = "sha256-wzRHYgnZPLDgcf1IlXxY2a52mbeImejj/F8DUAuB1VU="; }; nativeBuildInputs = [ From 06416d63edd62c35ecb002afa54ef4e3e152756a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 14:43:34 +0100 Subject: [PATCH 068/170] python311Packages.dvc-gs: 2.22.1 -> 3.0.1 Changelog: https://github.com/iterative/dvc-gs/releases/tag/3.0.1 --- .../python-modules/dvc-gs/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index e36ec61a88c3..fa01c64c8daf 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -4,29 +4,41 @@ , fetchPypi , gcsfs , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-gs"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-IKDwdSfolZwv8TvHHicVV42PYeULhskv8csbkiJzLbk="; + hash = "sha256-5UMKKX+4GCNm98S8kQsasQTY5cwi9hGhm84FFl3/7NQ="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; - propagatedBuildInputs = [ gcsfs dvc-objects ]; + propagatedBuildInputs = [ + gcsfs + dvc-objects + ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_gs" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_gs" + # ]; meta = with lib; { description = "gs plugin for dvc"; From 9e6b63302f8fd29ebc3986a2090093d5fe3d095f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Dec 2023 16:27:37 +0100 Subject: [PATCH 069/170] python311Packages.dvc-s3: 2.23.0 -> 3.0.1 Changelog: https://github.com/iterative/dvc-s3/releases/tag/3.0.1 --- .../python-modules/dvc-s3/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index ca4fe5a810d0..a15295649d4e 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -7,36 +7,48 @@ , flatten-dict , pythonRelaxDepsHook , s3fs -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-s3"; - version = "2.23.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HyhZj1sN70o1CTNCiroGKjaMk7tBGqPG2PRsrnm1uVc="; + hash = "sha256-ax2Wsjfvu4hoF99eDPT2sbFhl30wuYtGdEonYCCkJMY="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs postPatch = '' substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore' ''; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - aiobotocore boto3 dvc-objects flatten-dict s3fs + aiobotocore + boto3 + dvc-objects + flatten-dict s3fs ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_s3" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_s3" + # ]; meta = with lib; { description = "s3 plugin for dvc"; From 3f3e74bc93d4d2ccbff8c5cfa913daf7f1baec3f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 15:28:09 +0000 Subject: [PATCH 070/170] stdenv: fix eval of pkgsMusl packages with platform constraints Before the change `pkgsMusl.adobe-reader` was failing the interpreter: $ nix-instantiate --eval --strict --expr 'with import ./. {}; builtins.tryEval pkgsMusl.adobe-reader' error: error: evaluation aborted with the following error message: 'unsupported platform for the pure Linux stdenv' After the change `pkgsMusl.adobe-reader` returns catchable excation: $ nix-instantiate --eval --strict --expr 'with import ./. {}; builtins.tryEval pkgsMusl.adobe-reader' { success = false; value = false; } Noticed when was exploring `nixpkgs` for uncatchable evaluation errors. Ideally those should only happen when there is a code bug in the use site. In this case it's just a package with incompatible constraints for `musl`. Changed uncatchable `abort` to `throw`. --- pkgs/stdenv/linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 35cdb6311df3..d2f3cc31ca08 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -89,9 +89,9 @@ else null) null (lib.attrNames archLookupTable); archLookupTable = table.${localSystem.libc} - or (abort "unsupported libc for the pure Linux stdenv"); + or (throw "unsupported libc for the pure Linux stdenv"); files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools - else (abort "unsupported platform for the pure Linux stdenv")); + else (throw "unsupported platform for the pure Linux stdenv")); in files }: From d7324eb2c9c251609561801ff4baf0d8e3ee7929 Mon Sep 17 00:00:00 2001 From: Syed Moiz Ur Rehman Date: Sun, 17 Dec 2023 14:00:50 +0500 Subject: [PATCH 071/170] maintainers: add smrehman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 58bb5cbd2ad2..3faa46db67a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17160,6 +17160,12 @@ fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; }]; }; + smrehman = { + name = "Syed Moiz Ur Rehman"; + email = "smrehman@proton.me"; + github = "syedmoizurrehman"; + githubId = 17818950; + }; sna = { email = "abouzahra.9@wright.edu"; github = "S-NA"; From 50e01aa1cce23a487e23d8df56e620d308dc2968 Mon Sep 17 00:00:00 2001 From: Syed Moiz Ur Rehman Date: Sun, 17 Dec 2023 14:25:43 +0500 Subject: [PATCH 072/170] python3Packages.simple-term-menu: init at 1.6.4 --- .../simple-term-menu/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/simple-term-menu/default.nix diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix new file mode 100644 index 000000000000..9f21c327da97 --- /dev/null +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "simple-term-menu"; + version = "1.6.4"; + pyproject = true; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "simple_term_menu" ]; + + # no unit tests in the upstream + doCheck = false; + + meta = with lib; { + description = "A Python package which creates simple interactive menus on the command line"; + homepage = "https://github.com/IngoMeyer441/simple-term-menu"; + license = licenses.mit; + changelog = "https://github.com/IngoMeyer441/simple-term-menu/releases/tag/v${version}"; + maintainers = with maintainers; [ smrehman ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f42299fb536..9d9ef083e4c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13122,6 +13122,8 @@ self: super: with self; { simber = callPackage ../development/python-modules/simber { }; + simple-term-menu = callPackage ../development/python-modules/simple-term-menu { }; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; From 823c595d1cd6feba877d0a7aa45480a65f9812fb Mon Sep 17 00:00:00 2001 From: traxys Date: Thu, 28 Dec 2023 12:28:40 +0100 Subject: [PATCH 073/170] djlint: 1.32.1 -> 1.34.1 --- pkgs/development/tools/djlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index ba3e5606d095..27d66f6dd42c 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "djlint"; - version = "1.32.1"; - format = "pyproject"; + version = "1.34.1"; + pyproject = true; src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "djlint"; rev = "v${version}"; - hash = "sha256-///ZEkVohioloBJn6kxpEK5wmCzMp9ZYeAH1mONOA0E="; + hash = "sha256-p9RIzX9zoZxBrhiNaIeCX9OgfQm/lXNwYsh6IcsnIVk="; }; nativeBuildInputs = [ From b79ab667758a7edceb725aee6f2dddda6f88f984 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 17:07:22 +0100 Subject: [PATCH 074/170] libsidplayfp: 2.5.0 -> 2.5.1 --- pkgs/development/libraries/libsidplayfp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index b8b62781d0a6..e6c1e4cce80c 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,16 +16,16 @@ , graphviz }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; + hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { "--with-gcrypt" "--with-exsid" ] - ++ lib.optional doCheck "--enable-tests"; + ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-tests"; FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ramkromberg OPNA2608 ]; platforms = platforms.all; }; -} +}) From c22777ae4ffa155a20168d526baa93af1ddc8529 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 16:54:22 +0000 Subject: [PATCH 075/170] popeye: 0.11.1 -> 0.11.2 --- pkgs/applications/networking/cluster/popeye/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index c65c795a173b..8e5a7e68ef56 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk="; + sha256 = "sha256-2mLbBvdUWGspTNeU3QJzR5NDI24njvRO2nss/Bo93W8="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4="; + vendorHash = "sha256-Vt5QwggdasVk4j2huSIneBMemi3Q0R4MgZn2yNlOH5E="; doInstallCheck = true; installCheckPhase = '' From 41c97a952d1024f173b3ff125ff47600ff648db8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 17:48:58 +0000 Subject: [PATCH 076/170] python310Packages.oelint-parser: 2.12.1 -> 2.12.3 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 42bcc9e660f1..6b415cf9f52a 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "2.12.1"; + version = "2.12.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-So9Kyj4jMRiaBRQGXE88DSWgLEPqQkv8R/Sd8tyRvE0="; + hash = "sha256-fzHEy9/BxstPAYhVTG0o7Gn2D9UKuSZvI0X5ynZ+oEk="; }; buildInputs = [ pip ]; From 97ffd19292541d870ac2a1064e91777a7dde4ec1 Mon Sep 17 00:00:00 2001 From: Unidealistic Raccoon Date: Thu, 28 Dec 2023 14:53:44 -0300 Subject: [PATCH 077/170] komikku: 1.32.0 -> 1.33.0 Diff: https://gitlab.com/valos/Komikku/-/compare/v1.32.0...v1.33.0 Changelog: https://gitlab.com/valos/Komikku/-/releases/v1.33.0 --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index d0151aa5aa0c..bbce1b15a19a 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.32.0"; + version = "1.33.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-aF7EByUQ6CO+rXfGz4ivU18N5sh0X8nGgJT94dCuN8c="; + hash = "sha256-59RkynW02gxVPz48diC1Th+vtru+oHMeuArfdA2a1IU="; }; nativeBuildInputs = [ From 78ea7eac56c9454d57365e3a68c366a8a4c07375 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 28 Dec 2023 19:20:26 +0100 Subject: [PATCH 078/170] rmapi: set meta.mainProgram One fewer warning when using `lib.getExe`. --- pkgs/applications/misc/remarkable/rmapi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index b09e0fe04724..585a18bb3432 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; maintainers = [ maintainers.nickhu ]; + mainProgram = "rmapi"; }; } From 6ee837e8f179b2aff8a698fa7d1dfc828e1c070d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 18:59:17 +0100 Subject: [PATCH 079/170] libsidplayfp: Cleanups & formatting - Use lib.strings.*Feature functions for generating configureFlags - Fetch upstream-submitted patch to fix some flag logic - Move documentation building to buildPhase - Add meta.pkgConfigModules + test - Switch to finalAttrs pattern --- .../libraries/libsidplayfp/default.nix | 85 +++++++++++++------ 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index e6c1e4cce80c..fbfdc0b7ff0d 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -4,16 +4,17 @@ , fetchpatch , makeFontsConf , nix-update-script +, testers , autoreconfHook -, pkg-config -, perl -, unittest-cpp -, xa -, libgcrypt -, libexsid , docSupport ? true , doxygen , graphviz +, libexsid +, libgcrypt +, perl +, pkg-config +, unittest-cpp +, xa }: stdenv.mkDerivation (finalAttrs: { @@ -28,14 +29,30 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; }; + outputs = [ + "out" + ] ++ lib.optionals docSupport [ + "doc" + ]; + patches = [ # Pull autoconf-2.72 compatibility fix: # https://github.com/libsidplayfp/libsidplayfp/pull/103 + # Remove when version > 2.5.1 (fetchpatch { - name = "autoconf-2.72"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/b8fff55f6aaa005a3899b59e70cd8730f962641b.patch"; + name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; }) + + # Fix --disable-tests logic + # https://github.com/libsidplayfp/libsidplayfp/pull/108 + # Remove when version > 2.5.1 + (fetchpatch { + name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; + hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; + }) ]; postPatch = '' @@ -44,30 +61,35 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] - ++ lib.optionals docSupport [ doxygen graphviz ]; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + xa + ] ++ lib.optionals docSupport [ + doxygen + graphviz + ]; - buildInputs = [ libgcrypt libexsid ]; + buildInputs = [ + libexsid + libgcrypt + ]; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - checkInputs = [ unittest-cpp ]; + checkInputs = [ + unittest-cpp + ]; enableParallelBuilding = true; - installTargets = [ "install" ] - ++ lib.optionals docSupport [ "doc" ]; - - outputs = [ "out" ] - ++ lib.optionals docSupport [ "doc" ]; - configureFlags = [ - "--enable-hardsid" - "--with-gcrypt" - "--with-exsid" - ] - ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-tests"; + (lib.strings.enableFeature true "hardsid") + (lib.strings.withFeature true "gcrypt") + (lib.strings.withFeature true "exsid") + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + ]; + # Make Doxygen happy with the setup, reduce log noise FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); preBuild = '' @@ -75,12 +97,21 @@ stdenv.mkDerivation (finalAttrs: { export XDG_CACHE_HOME=$TMPDIR ''; + buildFlags = [ + "all" + ] ++ lib.optionals docSupport [ + "doc" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ ''; passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; updateScript = nix-update-script { }; }; @@ -96,5 +127,9 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ramkromberg OPNA2608 ]; platforms = platforms.all; + pkgConfigModules = [ + "libsidplayfp" + "libstilview" + ]; }; }) From 93d26a6f8f20e61a327f60981546f5ff49f2eb3f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 19:02:21 +0100 Subject: [PATCH 080/170] sidplayfp: 2.5.0 -> 2.5.1 --- pkgs/applications/audio/sidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 3e485e9de4c3..406e14c61e1d 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-ECHtHJrkJ5Y0YvDNdMM3VB+s7I/8JCPZiwsPYLM/oig="; + hash = "sha256-oV7ZPWgMEsNlsF2OoOvf7Ah5ZLcVkIDyC+PrPIJGyzQ="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; From f4e3ecb31e90dbcf6aaa4f6b317e2a198b054b06 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 19:13:18 +0100 Subject: [PATCH 081/170] sidplayfp: Cleanups & formatting - Use lib.strings.*Feature functions for generating configureFlags - Add meta.mainProgram - Switch to finalAttrs pattern --- pkgs/applications/audio/sidplayfp/default.nix | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 406e14c61e1d..31fa49702203 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -2,38 +2,49 @@ , lib , fetchFromGitHub , nix-update-script -, autoreconfHook -, perl -, pkg-config -, libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib +, autoreconfHook , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio +, libsidplayfp , out123Support ? stdenv.hostPlatform.isDarwin , mpg123 +, perl +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oV7ZPWgMEsNlsF2OoOvf7Ah5ZLcVkIDyC+PrPIJGyzQ="; }; - nativeBuildInputs = [ autoreconfHook perl pkg-config ]; + strictDeps = true; - buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional out123Support mpg123; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; - configureFlags = lib.optionals out123Support [ - "--with-out123" + buildInputs = [ + libsidplayfp + ] ++ lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseSupport [ + libpulseaudio + ] ++ lib.optionals out123Support [ + mpg123 + ]; + + configureFlags = [ + (lib.strings.withFeature out123Support "out123") ]; enableParallelBuilding = true; @@ -46,7 +57,8 @@ stdenv.mkDerivation rec { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; license = with licenses; [ gpl2Plus ]; + mainProgram = "sidplayfp"; maintainers = with maintainers; [ dezgeg OPNA2608 ]; platforms = platforms.all; }; -} +}) From fdc70103c0d8c9b34cb3258bd3966e53af691b16 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 29 Dec 2023 00:04:38 +0400 Subject: [PATCH 082/170] =?UTF-8?q?python3Packages.gpxpy:=201.5.0=20?= =?UTF-8?q?=E2=86=92=201.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/gpxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 17632c72a397..40708972823a 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "gpxpy"; - version = "1.5.0"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "tkrajina"; repo = pname; rev = "v${version}"; - hash = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk="; + hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI="; }; propagatedBuildInputs = [ lxml ]; From 0b657480f7de54b004fcf66144ad0c9d896ee85c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:06:25 +0100 Subject: [PATCH 083/170] deadcode: remove --- pkgs/development/tools/deadcode/default.nix | 31 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/deadcode/default.nix diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix deleted file mode 100644 index c5074cd03776..000000000000 --- a/pkgs/development/tools/deadcode/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: - -# TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of -# the standalone extract of deadcode from it? -buildGoPackage rec { - pname = "deadcode-unstable"; - version = "2016-07-24"; - rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; - - goPackagePath = "github.com/tsenart/deadcode"; - excludedPackages = "cmd/fillswitch/test-fixtures"; - - src = fetchFromGitHub { - inherit rev; - - owner = "tsenart"; - repo = "deadcode"; - sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; - }; - - meta = with lib; { - description = "Very simple utility which detects unused declarations in a Go package"; - homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9583cb8c21e..300b15940cdf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -187,6 +187,7 @@ mapAliases ({ dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; + deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = debugedit; # Added 2021-11-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 139723b9cbb3..ac58fb268fc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -614,8 +614,6 @@ with pkgs; djhtml = python3Packages.callPackage ../development/tools/djhtml { }; - deadcode = callPackage ../development/tools/deadcode { }; - deadnix = callPackage ../development/tools/deadnix { }; dec-decode = callPackage ../development/tools/dec-decode { }; From 2a84df1eca1f88c2cbd0158db54de8f59f8d92f5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 20:11:24 +0000 Subject: [PATCH 084/170] bazel-watcher.bazel: fix `tests` attribute evaluation Without the change evaluation fails as: $ nix build --no-link -f. bazel-watcher.bazel.tests error: error: attribute 'optionalSttrs' missing --- pkgs/development/tools/build-managers/bazel/bazel_5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index e662c14fa399..08944413b7a0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -287,7 +287,7 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (lib.optionalSttrs (!stdenv.hostPlatform.isDarwin) { + in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; }) // { From afc71327c383b7efb06afbc1536a2b70af17161d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 28 Dec 2023 21:03:14 +0100 Subject: [PATCH 085/170] osu-lazer: 2023.1224.0 -> 2023.1229.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index bbcc13e6ec5d..9949a2ee9f0f 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.1224.0"; + version = "2023.1229.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-o/I8f0aYM9FnMuRF6+Yk2DH20EwgzbLwvl4lqPPPJUk="; + hash = "sha256-2GcPV6UHnNdToXfLs2+i3XNwE6Ymaj2bqNb5EePE3kM="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index d0d247d85ad7..8a67a1d16171 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -126,22 +126,23 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.3"; sha256 = "1ac4s2422gyfmi5b2znn6i9j5p3w3w2jjng7g9lzh1mfgad3wfc2"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.3"; sha256 = "176lj975yz2m34dzhjjawnsca4vviaayvmqinh6vsss6v1084fws"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.3"; sha256 = "0dd37qfh6mxsf13bfnywy5ni17wvy6g419ksc4ga3ljv0zhrbpfz"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.3"; sha256 = "0pq43y1zlx4a0lidav1w6jsywvwc4z3aaq4w53w68cqf855k4wv9"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.4"; sha256 = "0lbd80yddsy7wqjw014kvj9an49h2rbgd9s86ifq38dyin5r2czn"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.1117.0"; sha256 = "04q65q27nzjq0fmv8p62r5lmhzdbpfk6y65fxqmfmm7qz2wkiy27"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.1117.0"; sha256 = "1yr0r628x5aaa1vqxpkr9ys1xnf4qnz6ypggms6v4a336gjz2734"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1219.0"; sha256 = "0ljm2pj5brf024wd50mqzmqxw2ngchwyvbsxdx2g3dp9459bwsrh"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1205.0-nativelibs"; sha256 = "1ldsn6fdcgp2dl64z2r4m87fwm84r4vfwlqfnyhxgs5n7xwwmb11"; }) + (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1227.1"; sha256 = "1jx40963xr1wsbx09n7aq9i86wa33qm932159wp0nhbk6iqwafix"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1215.0"; sha256 = "03zmwpvmqw24zgl9hhnbxh3a9l2jmj5yb7j067606hk7kg14k04d"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1228.0"; sha256 = "09qjfavp71nlzyl6fqgpjfpsilii2fbsjyjggdbq9hf9i49hwz7s"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) From 69e0e70d59e13af369271ec4421bd8c9ff87a591 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 20:22:52 +0000 Subject: [PATCH 086/170] bitcoind-knots: remove non-working `tests` attribute Without the change `bitcoind-knots.tests` fails to evaluate: $ nix build --no-link -f. bitcoind-knots.tests error: attribute 'bitcoind-knots' missing 71| passthru.tests = { 72| smoke-test = nixosTests.bitcoind-knots; | ^ 73| }; From what I can see `nixos/tests/all-tests.nix` never had a `bitcoind-knots` present. --- pkgs/applications/blockchains/bitcoin-knots/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index d8378f5e9f06..ace8329bb876 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = { - smoke-test = nixosTests.bitcoind-knots; - }; - meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; From e8423fb65ac2ac0866b496685206b22acb601373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 28 Dec 2023 20:43:16 +0100 Subject: [PATCH 087/170] osu-lazer-bin: 2023.1224.0 -> 2023.1229.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index ffa52a6746d7..e042e9d295eb 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2023.1224.0"; + version = "2023.1229.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-6+Ddar9uu/0U0H/rvs0J3v+BfNHtDnJbnjmzRt5zYlc="; + hash = "sha256-aZp8pVeCxmaAyWYnBg7w8sPMXy+L2UGRk3NvG/VsxYI="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-TJR0GpMEL3Gu+cQZMI7rwdeY0rm5CIbhIJ1AG653csg="; + hash = "sha256-Xle/WcWg+lYA+DxQmE4Kzn1pJTa+HrM13utXqdK8ZZY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-4kwRTgkiLWbDxR+KTc6pyULKLS2wDKNC4BO6OhysijI="; + hash = "sha256-lRdRPwa6xix5Nvt3szPeposmqU8D826iFmE6S1uPBF8="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From b76c2082ead2cbc13f8cc2c55b158eadeb1bc31b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Dec 2023 21:37:07 +0100 Subject: [PATCH 088/170] linux_testing: 6.7-rc6 -> 6.7-rc7 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bddd68d46ae4..5fd27c761f67 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.7-rc6", - "hash": "sha256:164jik11lv35jxfbci3vdb413qi241w51jrisilvfqy8ap0ccs4k" + "version": "6.7-rc7", + "hash": "sha256:1w1np05mqyviykj0gyx6z2l9ql4f909dy0ximh0gkcpkgy6zz9qc" }, "6.5": { "version": "6.5.13", From ca0f0e35454f787d03ff80897bc5755d7e94ec11 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 20:37:13 +0000 Subject: [PATCH 089/170] corosync: fix `tests` eval Without the change attempt to run tests fails as: $ nix build --no-link -f. corosync.tests error: undefined variable 'nixosTests' 68| passthru.tests = { 69| inherit (nixosTests) pacemaker; | ^ 70| }; --- pkgs/servers/corosync/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 12cf26db2b2a..f1d81aae92fa 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -4,6 +4,7 @@ , enableInfiniBandRdma ? false , enableMonitoring ? false , enableSnmp ? false +, nixosTests }: with lib; From 45ae51d6d183ea4c1d7cecd15707d655af32328d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Dec 2023 21:38:50 +0100 Subject: [PATCH 090/170] linux_5_15: 5.15.144 -> 5.15.145 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5fd27c761f67..13fd2ed4d371 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby" }, "5.15": { - "version": "5.15.144", - "hash": "sha256:0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh" + "version": "5.15.145", + "hash": "sha256:086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j" }, "5.10": { "version": "5.10.205", From 269e0c31e9f8eeeb91e0cd7afae8f497ad4f9197 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Dec 2023 21:40:47 +0100 Subject: [PATCH 091/170] linux-rt_5_10: 5.10.201-rt98 -> 5.10.204-rt100 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ce26a38ed069..58a1be131962 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.201-rt98"; # updated by ./update-rt.sh + version = "5.10.204-rt100"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a"; + sha256 = "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1g7xbjsfrgins3agz9sq9ia13h5k9605gak7s14z5i4vd34y8pk8"; + sha256 = "1zbpkira8wf3w46586af72k43j8xkj15f0dgq86z975vl60hdk68"; }; }; in [ rt-patch ] ++ kernelPatches; From 0f52666e61f4bca1f6c134db9ef99d796837d1b2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Dec 2023 21:41:26 +0100 Subject: [PATCH 092/170] linux_latest-libre: 19441 -> 19453 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9cf5f46cfb80..9308cba46f13 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19441"; - sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; + rev = "19453"; + sha256 = "12jy0kyhl9dsp20yprbw27kzh1p4qxi5m5zy9j7sglm9ajrbnkar"; } , ... }: From cfdb96ec524972f313210874744d79393c757111 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Dec 2023 21:43:50 +0100 Subject: [PATCH 093/170] linux/hardened/patches/5.15: 5.15.144-hardened1 -> 5.15.145-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c635af0672c7..3d95407fbe81 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.144-hardened1.patch", - "sha256": "03b2hg01z7fpscgpiw10bvlhq5dph5shdx5zn15csg5vjy6dl2cb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.144-hardened1/linux-hardened-5.15.144-hardened1.patch" + "name": "linux-hardened-5.15.145-hardened1.patch", + "sha256": "0jip4c7r41a3nzgv6zzrkjg4flb0ri6ar60l246ixzyp9sv19x9r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.145-hardened1/linux-hardened-5.15.145-hardened1.patch" }, - "sha256": "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh", - "version": "5.15.144" + "sha256": "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j", + "version": "5.15.145" }, "5.4": { "patch": { From b12ca09813ab4bf93eb6a4252d17bb816798e8b9 Mon Sep 17 00:00:00 2001 From: huantian Date: Thu, 28 Dec 2023 14:22:34 -0700 Subject: [PATCH 094/170] unityhub: 3.6.1 -> 3.7.0 --- pkgs/development/tools/unityhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index c8c510553138..3ef4b44953d1 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-rpH87aFvbYanthwPw/SlluOH/rtj6owcVetBD4+TJeU="; + sha256 = "sha256-cFHcfpsHSDlR82PtZ0leRDpvCD6nw0Qdb3PsYKMnosA="; }; nativeBuildInputs = [ From f6d62068434fe2db88c6470967b4df086820e5c3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 21:43:57 +0000 Subject: [PATCH 095/170] displaylink: fix `tests` eval Before the change `tests` eval failed for non-existent `displaylink` nixos test as: $ nix build --no-link -f. displaylink.tests error: attribute 'displaylink' missing 72| passthru = { 73| tests = { | ^ 74| inherit (nixosTests) displaylink; As far as I can see `displaylink` was never added to `nixos/tests/all-tests.nix`. --- pkgs/os-specific/linux/displaylink/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index e71062e8ac47..408dfa408e1d 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -8,7 +8,6 @@ , makeWrapper , requireFile , substituteAll -, nixosTests }: let @@ -69,12 +68,6 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - passthru = { - tests = { - inherit (nixosTests) displaylink; - }; - }; - meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; From 7e75a23d1f7c1321c78a31d001af74fc15552606 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Dec 2023 23:32:50 +0100 Subject: [PATCH 096/170] python311Packages.ipykernel: 6.27.1 -> 6.28.0 Changelog: https://github.com/ipython/ipykernel/releases/tag/v6.28.0 --- pkgs/development/python-modules/ipykernel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 9d32925f0ca9..d96ab023c87f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.27.1"; + version = "6.28.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY="; + hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; + changelog = "https://github.com/ipython/ipykernel/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; }; From 4f31d4ab8a900a370a5147b2aa2a84061a8c2b30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 22:40:38 +0000 Subject: [PATCH 097/170] python310Packages.pyngrok: 7.0.3 -> 7.0.4 --- pkgs/development/python-modules/pyngrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 0038db89f6cc..e5c027171813 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.3"; + version = "7.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RNi0ivQKsLb/JD9+vdJYGf5HDC6BmeNdseR2OU8v1uY="; + hash = "sha256-VEIsGjVFx5Q7G2cKtMYQY7Te1TpFUZYZJRZvRMAwSS8="; }; propagatedBuildInputs = [ From 2991cb6b037eefc7b832cf67f70837c830a519cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 Dec 2023 14:45:37 -0800 Subject: [PATCH 098/170] python311Packages.ndms2-client: 0.1.2 -> 0.1.3 Diff: https://github.com/foxel/python_ndms2_client/compare/0.1.2...0.1.3 --- .../python-modules/ndms2-client/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index feeb36737a8a..ff872aa6f386 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "ndms2-client"; - version = "0.1.2"; + version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "foxel"; repo = "python_ndms2_client"; rev = version; - hash = "sha256-cM36xNLymg5Xph3bvbUGdAEmMABJ9y3/w/U8re6ZfB4="; + hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From d363b99f1afc34aa7e192bd01cb049bb87d0770c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 23:09:49 +0000 Subject: [PATCH 099/170] cargo-expand: 1.0.75 -> 1.0.77 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 85ff24c845d6..bf3a36591d3d 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.75"; + version = "1.0.77"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-1huB+wQ0x770PQF/mFEDzfyjhjYiTRmr2Y+IhqAKP8M="; + sha256 = "sha256-jaTSbEmqu9xyv9E5VgiHLE5YIBHVNXdVw8B+rSCjaZQ="; }; - cargoHash = "sha256-svb1qWJpaZ2uBdXGWrMXwm1wwQGrhGe891JOtiHnaVg="; + cargoHash = "sha256-WXNfxyD0CpoXEkVI+t30aTrdq/KqPnqeDt3wCEBoyLg="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; From 2941ce1993d800f699aeaa9078d369ff8a5598a0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 23:12:55 +0000 Subject: [PATCH 100/170] gnupg22: fix `tests` eval Without the change `tests` attribute fails to resolve testsuite: $ nix build --no-link -f. gnupg22.tests error: attribute 'nixosTests' missing --- pkgs/tools/security/gnupg/22.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 78f4af894a30..59e7bcc13d66 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -5,6 +5,7 @@ , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite , guiSupport ? stdenv.isDarwin, pinentry +, nixosTests }: assert guiSupport -> enableMinimal == false; @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = lib.nixosTests.gnupg; + passthru.tests = nixosTests.gnupg; meta = with lib; { homepage = "https://gnupg.org"; From 41941e7cf350bf7737bf43c1b43f8ee782008ebf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 23:20:14 +0000 Subject: [PATCH 101/170] picoscope: fix `rules` eval Without the change `picoscope.rules` failed to evaluate due to wrong attribute path: $ nix build --no-link -f. picoscope.rules error: attribute 'writeTextDir' missing 116| # users.users.you.extraGroups = [ "pico" ]; 117| passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' | ^ --- pkgs/applications/science/electronics/picoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 596f220242bb..c7242117b68c 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 -, glib, libusb1 , zlib, gtk3-x11, callPackage +, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir , scopes ? [ "picocv" "ps2000" @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { # services.udev.packages = [ pkgs.picoscope.rules ]; # users.groups.pico = {}; # users.users.you.extraGroups = [ "pico" ]; - passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' + passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" ''; From c37e8af94758b14fb04476e04013acffab27c8be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 23:25:11 +0000 Subject: [PATCH 102/170] joker: 1.3.3 -> 1.3.4 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 86c47da2e538..50dd86f7bd86 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-TaNuw84VCC1s2I7rmTdVKTrpT/nTrb+45haEFWf6S7k="; + sha256 = "sha256-sueFfR5KVj6HXR+5XWowL0Zjbuu7K+p/+skcTaXlOMc="; }; vendorHash = "sha256-rxWYNGFbFUKjy232DOhVlh341GV2VKLngJKM+DEd27o="; From dd8c96379f07e9e2fada88168c6c42920b3db7a1 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 9 Dec 2023 17:07:44 +0100 Subject: [PATCH 103/170] nixos/nextcloud: Move options into now freeForm extraOptions --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/services/web-apps/nextcloud.md | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 246 +++++++++--------- .../nextcloud/with-postgresql-and-redis.nix | 2 +- 4 files changed, 129 insertions(+), 123 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 8f6dd2fc74cc..579d2a1b3a17 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -91,6 +91,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc. +- The following options of the Nextcloud module were moved into `services.nextcloud.extraOptions`: `logLevel`, `logType`, `log_type`, `defaultPhoneRegion`, `overwriteProtocol`, `skeletonDirectory`, `globalProfiles`, `extraTrustedDomains` and `trustedProxies`. + - The Yama LSM is now enabled by default in the kernel, which prevents ptracing non-child processes. This means you will not be able to attach gdb to an existing process, but will need to start that process from gdb (so it is a diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index b10fd566abb3..ce8f96a6a389 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -51,7 +51,7 @@ to ensure that changes can be applied by changing the module's options. In case the application serves multiple domains (those are checked with [`$_SERVER['HTTP_HOST']`](https://www.php.net/manual/en/reserved.variables.server.php)) it's needed to add them to -[`services.nextcloud.config.extraTrustedDomains`](#opt-services.nextcloud.config.extraTrustedDomains). +[`services.nextcloud.extraOptions.trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains). Auto updates for Nextcloud apps can be enabled using [`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable). diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 501df47942e5..53df94213536 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -94,6 +94,22 @@ in { (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' Use services.nextcloud.enableImagemagick instead. '') + (mkRenamedOptionModule + [ "services" "nextcloud" "logLevel" ] [ "services" "nextcloud" "extraOptions" "loglevel" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "logType" ] [ "services" "nextcloud" "extraOptions" "log_type" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "defaultPhoneRegion" ] [ "services" "nextcloud" "extraOptions" "default_phone_region" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "overwriteProtocol" ] [ "services" "nextcloud" "extraOptions" "overwriteprotocol" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "skeletonDirectory" ] [ "services" "nextcloud" "extraOptions" "skeletondirectory" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "globalProfiles" ] [ "services" "nextcloud" "extraOptions" "profile.enabled" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "extraTrustedDomains" ] [ "services" "nextcloud" "extraOptions" "trusted_domains" ]) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "trustedProxies" ] [ "services" "nextcloud" "extraOptions" "trusted_proxies" ]) ]; options.services.nextcloud = { @@ -157,32 +173,6 @@ in { Set this to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. ''; }; - logLevel = mkOption { - type = types.ints.between 0 4; - default = 2; - description = lib.mdDoc '' - Log level value between 0 (DEBUG) and 4 (FATAL). - - - 0 (debug): Log all activity. - - - 1 (info): Log activity such as user logins and file activities, plus warnings, errors, and fatal errors. - - - 2 (warn): Log successful operations, as well as warnings of potential problems, errors and fatal errors. - - - 3 (error): Log failed operations and fatal errors. - - - 4 (fatal): Log only fatal errors that cause the server to stop. - ''; - }; - logType = mkOption { - type = types.enum [ "errorlog" "file" "syslog" "systemd" ]; - default = "syslog"; - description = lib.mdDoc '' - Logging backend to use. - systemd requires the php-systemd package to be added to services.nextcloud.phpExtraExtensions. - See the [nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/logging_configuration.html) for details. - ''; - }; https = mkOption { type = types.bool; default = false; @@ -206,16 +196,6 @@ in { ''; }; - skeletonDirectory = mkOption { - default = ""; - type = types.str; - description = lib.mdDoc '' - The directory where the skeleton files are located. These files will be - copied to the data directory of new users. Leave empty to not copy any - skeleton files. - ''; - }; - webfinger = mkOption { type = types.bool; default = false; @@ -315,7 +295,6 @@ in { }; - config = { dbtype = mkOption { type = types.enum [ "sqlite" "pgsql" "mysql" ]; @@ -380,53 +359,6 @@ in { setup of Nextcloud by the systemd service `nextcloud-setup.service`. ''; }; - - extraTrustedDomains = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - Trusted domains from which the Nextcloud installation will be - accessible. You don't need to add - `services.nextcloud.hostname` here. - ''; - }; - - trustedProxies = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - Trusted proxies to provide if the Nextcloud installation is being - proxied to secure against, e.g. spoofing. - ''; - }; - - overwriteProtocol = mkOption { - type = types.nullOr (types.enum [ "http" "https" ]); - default = null; - example = "https"; - - description = lib.mdDoc '' - Force Nextcloud to always use HTTP or HTTPS i.e. for link generation. - Nextcloud uses the currently used protocol by default, but when - behind a reverse-proxy, it may use `http` for everything although - Nextcloud may be served via HTTPS. - ''; - }; - - defaultPhoneRegion = mkOption { - default = null; - type = types.nullOr types.str; - example = "DE"; - description = lib.mdDoc '' - An [ISO 3166-1](https://www.iso.org/iso-3166-country-codes.html) - country code which replaces automatic phone-number detection - without a country code. - - As an example, with `DE` set as the default phone region, - the `+49` prefix can be omitted for phone numbers. - ''; - }; - objectstore = { s3 = { enable = mkEnableOption (lib.mdDoc '' @@ -609,30 +541,109 @@ in { The nextcloud-occ program preconfigured to target this Nextcloud instance. ''; }; - globalProfiles = mkEnableOption (lib.mdDoc "global profiles") // { - description = lib.mdDoc '' - Makes user-profiles globally available under `nextcloud.tld/u/user.name`. - Even though it's enabled by default in Nextcloud, it must be explicitly enabled - here because it has the side-effect that personal information is even accessible to - unauthenticated users by default. - - By default, the following properties are set to “Show to everyone” - if this flag is enabled: - - About - - Full name - - Headline - - Organisation - - Profile picture - - Role - - Twitter - - Website - - Only has an effect in Nextcloud 23 and later. - ''; - }; extraOptions = mkOption { - type = jsonFormat.type; + type = types.submodule { + freeformType = jsonFormat.type; + options = { + + loglevel = mkOption { + type = types.ints.between 0 4; + default = 2; + description = lib.mdDoc '' + Log level value between 0 (DEBUG) and 4 (FATAL). + + - 0 (debug): Log all activity. + + - 1 (info): Log activity such as user logins and file activities, plus warnings, errors, and fatal errors. + + - 2 (warn): Log successful operations, as well as warnings of potential problems, errors and fatal errors. + + - 3 (error): Log failed operations and fatal errors. + + - 4 (fatal): Log only fatal errors that cause the server to stop. + ''; + }; + log_type = mkOption { + type = types.enum [ "errorlog" "file" "syslog" "systemd" ]; + default = "syslog"; + description = lib.mdDoc '' + Logging backend to use. + systemd requires the php-systemd package to be added to services.nextcloud.phpExtraExtensions. + See the [nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/logging_configuration.html) for details. + ''; + }; + skeletondirectory = mkOption { + default = ""; + type = types.str; + description = lib.mdDoc '' + The directory where the skeleton files are located. These files will be + copied to the data directory of new users. Leave empty to not copy any + skeleton files. + ''; + }; + trusted_domains = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Trusted domains, from which the nextcloud installation will be + accessible. You don't need to add + `services.nextcloud.hostname` here. + ''; + }; + trusted_proxies = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Trusted proxies, to provide if the nextcloud installation is being + proxied to secure against e.g. spoofing. + ''; + }; + overwriteprotocol = mkOption { + type = types.enum [ "" "http" "https" ]; + default = ""; + example = "https"; + description = lib.mdDoc '' + Force Nextcloud to always use HTTP or HTTPS i.e. for link generation. + Nextcloud uses the currently used protocol by default, but when + behind a reverse-proxy, it may use `http` for everything although + Nextcloud may be served via HTTPS. + ''; + }; + default_phone_region = mkOption { + default = ""; + type = types.str; + example = "DE"; + description = lib.mdDoc '' + An [ISO 3166-1](https://www.iso.org/iso-3166-country-codes.html) + country code which replaces automatic phone-number detection + without a country code. + + As an example, with `DE` set as the default phone region, + the `+49` prefix can be omitted for phone numbers. + ''; + }; + "profile.enabled" = mkEnableOption (lib.mdDoc "global profiles") // { + description = lib.mdDoc '' + Makes user-profiles globally available under `nextcloud.tld/u/user.name`. + Even though it's enabled by default in Nextcloud, it must be explicitly enabled + here because it has the side-effect that personal information is even accessible to + unauthenticated users by default. + By default, the following properties are set to “Show to everyone” + if this flag is enabled: + - About + - Full name + - Headline + - Organisation + - Profile picture + - Role + - Twitter + - Website + Only has an effect in Nextcloud 23 and later. + ''; + }; + }; + }; default = {}; description = lib.mdDoc '' Extra options which should be appended to Nextcloud's config.php file. @@ -770,7 +781,6 @@ in { nextcloud-setup = let c = cfg.config; - writePhpArray = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable; objectstoreConfig = let s3 = c.objectstore.s3; in optionalString s3.enable '' 'objectstore' => [ @@ -833,12 +843,7 @@ in { [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ], ], ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"} - 'datadirectory' => '${datadir}/data', - 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} - 'log_type' => '${cfg.logType}', - 'loglevel' => '${builtins.toString cfg.logLevel}', - ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} @@ -851,10 +856,6 @@ in { '' } 'dbtype' => '${c.dbtype}', - 'trusted_domains' => ${writePhpArray ([ cfg.hostName ] ++ c.extraTrustedDomains)}, - 'trusted_proxies' => ${writePhpArray (c.trustedProxies)}, - ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"} - ${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"} ${objectstoreConfig} ]; @@ -907,7 +908,7 @@ in { (i: v: '' ${occ}/bin/nextcloud-occ config:system:set trusted_domains \ ${toString i} --value="${toString v}" - '') ([ cfg.hostName ] ++ cfg.config.extraTrustedDomains)); + '') ([ cfg.hostName ] ++ cfg.extraOptions.trusted_domains)); in { wantedBy = [ "multi-user.target" ]; @@ -1043,16 +1044,19 @@ in { user = "nextcloud"; }; - services.nextcloud = lib.mkIf cfg.configureRedis { - caching.redis = true; - extraOptions = { + services.nextcloud = { + caching.redis = lib.mkIf cfg.configureRedis true; + extraOptions = mkMerge [({ + datadirectory = lib.mkDefault "${datadir}/data"; + trusted_domains = [ cfg.hostName ]; + }) (lib.mkIf cfg.configureRedis { "memcache.distributed" = ''\OC\Memcache\Redis''; "memcache.locking" = ''\OC\Memcache\Redis''; redis = { host = config.services.redis.servers.nextcloud.unixSocket; port = 0; }; - }; + })]; }; services.nginx.enable = mkDefault true; diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 586bf50fd939..d95af8a89d07 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -32,7 +32,6 @@ in { adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} ''); - trustedProxies = [ "::1" ]; }; notify_push = { enable = true; @@ -42,6 +41,7 @@ in { extraApps = { inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push; }; + extraOptions.trusted_proxies = [ "::1" ]; }; services.redis.servers."nextcloud".enable = true; From a3957236ce752b03d0ba3c388422b730129c6085 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 20:30:19 +0000 Subject: [PATCH 104/170] cargo: fix `tests` eval Without the change `cargo` tests fail the eval as: $ nix build --no-link -f. cargo.tests error: attribute 'tests' missing at pkgs/development/compilers/rust/cargo.nix:22:15: 21| 22| passthru = { | ^ 23| rustc = rustc; The test teried to pull `tests` attribute from `rustc`, which is a wrapper without `tests`. Pull tests from unwrapped rust instead. --- pkgs/development/compilers/rust/cargo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 1bc1777acd47..ff0ecf45fd23 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage.override { passthru = { rustc = rustc; - inherit (rustc) tests; + inherit (rustc.unwrapped) tests; }; # Upstream rustc still assumes that musl = static[1]. The fix for From fa182d59bf171de970c5f0c5e503c72207bfe087 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 01:09:44 +0000 Subject: [PATCH 105/170] onetun: 0.3.6 -> 0.3.7 --- pkgs/tools/networking/onetun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index ca07db7583a4..5200cff7076f 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "onetun"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "aramperes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NH3K/EGFtBcTAxGntneV86zd8eWSV4fFxvr76xtE/mw="; + sha256 = "sha256-GVIRCMeuuhUA8lqQ1oI/Xcuf90QIlwhqYeU+HhbGWXQ="; }; - cargoHash = "sha256-ZpgcFzQLiOWyhjSI+WcLa0UFUw8zQWfqJkrVVpIexgM="; + cargoHash = "sha256-TRfr4riMzR/MbsV2RiQNlPoPLhHK5EScNBCeyyamfgE="; buildInputs = lib.optionals stdenv.isDarwin [ Security From ec866c544f01cee68989be9b448104aa7a5b2281 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 28 Dec 2023 16:26:04 -0500 Subject: [PATCH 106/170] python311Packages.pylibjpeg: init at 1.4.0 --- .../python-modules/pylibjpeg/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/pylibjpeg/default.nix diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix new file mode 100644 index 000000000000..65055d94280c --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, numpy +, pydicom +, pylibjpeg-libjpeg +}: + +let + pylibjpeg-data = buildPythonPackage rec { + pname = "pylibjpeg-data"; + version = "1.0.0dev0"; + pyproject = true; + + nativeBuildInputs = [ setuptools ]; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-data"; + rev = "2ab4b8a65b070656eca2582bd23197a3d01cdccd"; + hash = "sha256-cFE1XjrqyGqwHCYGRucXK+q4k7ftUIbYwBw4WwIFtEc="; + }; + + doCheck = false; + }; +in + +buildPythonPackage rec { + pname = "pylibjpeg"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg"; + rev = "refs/tags/v${version}"; + hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pydicom + pylibjpeg-data + pylibjpeg-libjpeg + ]; + + pythonImportsCheck = [ "pylibjpeg" ]; + + meta = with lib; { + description = "Python framework for decoding JPEG images, with a focus on supporting Pydicom"; + homepage = "https://github.com/pydicom/pylibjpeg"; + changelog = "https://github.com/pydicom/pylibjpeg/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + # several test failures of form + # "pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. ..." + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f42299fb536..fd3decd1dc25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10602,6 +10602,8 @@ self: super: with self; { inherit (pkgs) libusb1; }; + pylibjpeg = callPackage ../development/python-modules/pylibjpeg { }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; pyliblo = callPackage ../development/python-modules/pyliblo { }; From 6cf4c910f9e39d6b8f0343549a4aa92fb2f903cc Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Thu, 28 Dec 2023 13:13:45 -0800 Subject: [PATCH 107/170] llama-cpp: change default value of openblasSupport The previous default caused build failures when `config.rocmSupport` was enabled, since rocmSupport conflicts with openblasSupport. --- pkgs/by-name/ll/llama-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index a5b44e83a80b..d2c076aae046 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -17,7 +17,7 @@ , openclSupport ? false , clblast -, openblasSupport ? true +, openblasSupport ? !rocmSupport , openblas , pkg-config }: From a0bedc64a60e3ef377337344565b4862cd92b8b0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Dec 2023 21:07:10 -0500 Subject: [PATCH 108/170] bpftune: unstable-2023-09-11 -> unstable-2023-12-20 Diff: https://github.com/oracle/bpftune/compare/22926812a555eac910eac0699100bac0f8776f1b...0e6bca2e5880fcbaac6478c4042f5f9314e61463 --- pkgs/os-specific/linux/bpftune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index c2fd9d3f6a5e..86c706ac2702 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-09-11"; + version = "unstable-2023-12-20"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "22926812a555eac910eac0699100bac0f8776f1b"; - hash = "sha256-BflJc5lYWYFIo9LzKfb34F4V1qOI8ywVjnzOLz605DI="; + rev = "0e6bca2e5880fcbaac6478c4042f5f9314e61463"; + hash = "sha256-y9WQrQb9U5YdzKAR63FzC8V1+jZL027pzAmQPpgM3jM="; }; postPatch = '' From 682cb1d640779e7ba63d070030deaf0cb4d82b53 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 28 Oct 2023 22:55:59 +0200 Subject: [PATCH 109/170] nixos/vmware-host: replace activationScript Replace with a dedicated system servie ordered before the other VMWare services. --- nixos/modules/virtualisation/vmware-host.nix | 63 +++++++++++--------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix index 1eaa896fe096..094114623a42 100644 --- a/nixos/modules/virtualisation/vmware-host.nix +++ b/nixos/modules/virtualisation/vmware-host.nix @@ -85,35 +85,44 @@ in }; }; - ###### wrappers activation script - - system.activationScripts.vmwareWrappers = - lib.stringAfter [ "specialfs" "users" ] - '' - mkdir -p "${parentWrapperDir}" - chmod 755 "${parentWrapperDir}" - # We want to place the tmpdirs for the wrappers to the parent dir. - wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) - chmod a+rx "$wrapperDir" - ${lib.concatStringsSep "\n" (vmwareWrappers)} - if [ -L ${wrapperDir} ]; then - # Atomically replace the symlink - # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ - old=$(readlink -f ${wrapperDir}) - if [ -e "${wrapperDir}-tmp" ]; then - rm --force --recursive "${wrapperDir}-tmp" - fi - ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" - mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" - rm --force --recursive "$old" - else - # For initial setup - ln --symbolic "$wrapperDir" "${wrapperDir}" - fi - ''; - # Services + systemd.services."vmware-wrappers" = { + description = "Create VMVare Wrappers"; + wantedBy = [ "multi-user.target" ]; + before = [ + "vmware-authdlauncher.service" + "vmware-networks-configuration.service" + "vmware-networks.service" + "vmware-usbarbitrator.service" + ]; + after = [ "systemd-sysusers.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = '' + mkdir -p "${parentWrapperDir}" + chmod 755 "${parentWrapperDir}" + # We want to place the tmpdirs for the wrappers to the parent dir. + wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) + chmod a+rx "$wrapperDir" + ${lib.concatStringsSep "\n" (vmwareWrappers)} + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink -f ${wrapperDir}) + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" + fi + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" + else + # For initial setup + ln --symbolic "$wrapperDir" "${wrapperDir}" + fi + ''; + }; + systemd.services."vmware-authdlauncher" = { description = "VMware Authentication Daemon"; serviceConfig = { From e96cd172fb625b910f13c0957be4204188afc884 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 28 Oct 2023 23:04:54 +0200 Subject: [PATCH 110/170] nixos/logcheck: replace activationScript via tmpfiles --- nixos/modules/services/logging/logcheck.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 8a277cea6e46..5d87fc87d416 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -220,10 +220,16 @@ in logcheck = {}; }; - system.activationScripts.logcheck = '' - mkdir -m 700 -p /var/{lib,lock}/logcheck - chown ${cfg.user} /var/{lib,lock}/logcheck - ''; + systemd.tmpfiles.settings.logcheck = { + "/var/lib/logcheck".d = { + mode = "700"; + inherit (cfg) user; + }; + "/var/lock/logcheck".d = { + mode = "700"; + inherit (cfg) user; + }; + }; services.cron.systemCronJobs = let withTime = name: {timeArgs, ...}: timeArgs != null; From ab64ae8fdd87aaaca5cebe30a43b076b1183f15d Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Thu, 28 Dec 2023 18:19:55 -0800 Subject: [PATCH 111/170] llama-cpp: 1671 -> 1710 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index a5b44e83a80b..719677497070 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1671"; + version = "1710"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-OFRc3gHKQboVCsDlQVHwzEBurIsOMj/bVGYuCLilydE="; + hash = "sha256-fbzHjaL+qAE9HdtBVxboo8T2/KCdS5O1RkTQvDwD/xs="; }; patches = [ From 994df434ba29b9774efe56d23270a8dc150c68ce Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 16 Nov 2023 23:14:22 +0100 Subject: [PATCH 112/170] nixos/ldap: replace activationScript Replace with a dedicated systemd service. --- nixos/modules/config/ldap.nix | 101 ++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index d2f01fb87d32..e374e4a7a27e 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -226,18 +226,6 @@ in "ldap.conf" = ldapConfig; }; - system.activationScripts = mkIf (!cfg.daemon.enable) { - ldap = stringAfter [ "etc" "groups" "users" ] '' - if test -f "${cfg.bind.passwordFile}" ; then - umask 0077 - conf="$(mktemp)" - printf 'bindpw %s\n' "$(cat ${cfg.bind.passwordFile})" | - cat ${ldapConfig.source} - >"$conf" - mv -fT "$conf" /etc/ldap.conf - fi - ''; - }; - system.nssModules = mkIf cfg.nsswitch (singleton ( if cfg.daemon.enable then nss_pam_ldapd else nss_ldap )); @@ -258,42 +246,63 @@ in }; }; - systemd.services = mkIf cfg.daemon.enable { - nslcd = { - wantedBy = [ "multi-user.target" ]; - - preStart = '' - umask 0077 - conf="$(mktemp)" - { - cat ${nslcdConfig} - test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.passwordFile}' || - printf 'bindpw %s\n' "$(cat '${cfg.bind.passwordFile}')" - test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpwFile}' || - printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpwFile}')" - } >"$conf" - mv -fT "$conf" /run/nslcd/nslcd.conf - ''; - - restartTriggers = [ - nslcdConfig - cfg.bind.passwordFile - cfg.daemon.rootpwmodpwFile - ]; - - serviceConfig = { - ExecStart = "${nslcdWrapped}/bin/nslcd"; - Type = "forking"; - Restart = "always"; - User = "nslcd"; - Group = "nslcd"; - RuntimeDirectory = [ "nslcd" ]; - PIDFile = "/run/nslcd/nslcd.pid"; - AmbientCapabilities = "CAP_SYS_RESOURCE"; + systemd.services = mkMerge [ + (mkIf (!cfg.daemon.enable) { + ldap-password = { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = '' + if test -f "${cfg.bind.passwordFile}" ; then + umask 0077 + conf="$(mktemp)" + printf 'bindpw %s\n' "$(cat ${cfg.bind.passwordFile})" | + cat ${ldapConfig.source} - >"$conf" + mv -fT "$conf" /etc/ldap.conf + fi + ''; }; - }; + }) - }; + (mkIf cfg.daemon.enable { + nslcd = { + wantedBy = [ "multi-user.target" ]; + + preStart = '' + umask 0077 + conf="$(mktemp)" + { + cat ${nslcdConfig} + test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.passwordFile}' || + printf 'bindpw %s\n' "$(cat '${cfg.bind.passwordFile}')" + test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpwFile}' || + printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpwFile}')" + } >"$conf" + mv -fT "$conf" /run/nslcd/nslcd.conf + ''; + + restartTriggers = [ + nslcdConfig + cfg.bind.passwordFile + cfg.daemon.rootpwmodpwFile + ]; + + serviceConfig = { + ExecStart = "${nslcdWrapped}/bin/nslcd"; + Type = "forking"; + Restart = "always"; + User = "nslcd"; + Group = "nslcd"; + RuntimeDirectory = [ "nslcd" ]; + PIDFile = "/run/nslcd/nslcd.pid"; + AmbientCapabilities = "CAP_SYS_RESOURCE"; + }; + }; + }) + ]; }; From 80fa4731f9ce5c0e5e70b0ed7c73730f043a9f1d Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 28 Oct 2023 23:46:09 +0200 Subject: [PATCH 113/170] nixos/amdgpu-pro: replacce activationScript via tmpfiles --- nixos/modules/hardware/video/amdgpu-pro.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 605aa6ef8b88..2a86280eec8c 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -39,9 +39,10 @@ in hardware.firmware = [ package.fw ]; - system.activationScripts.setup-amdgpu-pro = '' - ln -sfn ${package}/opt/amdgpu{,-pro} /run - ''; + systemd.tmpfiles.settings.amdgpu-pro = { + "/run/amdgpu"."L+".argument = "${package}/opt/amdgpu"; + "/run/amdgpu-pro"."L+".argument = "${package}/opt/amdgpu-pro"; + }; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "DEVICE_PRIVATE") From 36f2ab21eae7b7924f7bbeb62f7453a9d94defbc Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 28 Oct 2023 23:50:24 +0200 Subject: [PATCH 114/170] nixos/tests/incron: replace activcationScript via tmpfiles --- nixos/tests/incron.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/incron.nix b/nixos/tests/incron.nix index c978ff27dfad..d016360ba0ef 100644 --- a/nixos/tests/incron.nix +++ b/nixos/tests/incron.nix @@ -13,9 +13,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; # ensure the directory to be monitored exists before incron is started - system.activationScripts.incronTest = '' - mkdir /test - ''; + systemd.tmpfiles.settings.incron-test = { + "/test".d = { }; + }; }; testScript = '' From 9b29bc0010a9cee3236511f70f36b8ae95887f5c Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 29 Oct 2023 00:05:14 +0200 Subject: [PATCH 115/170] nixos/trackpoint: replace activationScript Replace with a separate systemd service ordered before sysinit.target --- nixos/modules/tasks/trackpoint.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index d197a0feb337..317613b84792 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -80,10 +80,17 @@ with lib; ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="${cfg.device}", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" ''; - system.activationScripts.trackpoint = - '' - ${config.systemd.package}/bin/udevadm trigger --attr-match=name="${cfg.device}" + systemd.services.trackpoint = { + wantedBy = [ "sysinit.target" ] ; + before = [ "sysinit.target" "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.ExecStart = '' + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="${cfg.device} ''; + }; }) (mkIf (cfg.emulateWheel) { From af87c19427b9704eb77b5db080c3c117b00de589 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 29 Oct 2023 00:50:27 +0200 Subject: [PATCH 116/170] nixos/yggdrasil: replace activationScript Replace with separate service because it cannot be moved into the preStart of the yggdrasil service. --- .../modules/services/networking/yggdrasil.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 514753687d69..9173e7eb3457 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -137,16 +137,24 @@ in message = "networking.enableIPv6 must be true for yggdrasil to work"; }]; - system.activationScripts.yggdrasil = mkIf cfg.persistentKeys '' - if [ ! -e ${keysPath} ] - then - mkdir --mode=700 -p ${builtins.dirOf keysPath} - ${binYggdrasil} -genconf -json \ - | ${pkgs.jq}/bin/jq \ - 'to_entries|map(select(.key|endswith("Key")))|from_entries' \ - > ${keysPath} - fi - ''; + # This needs to be a separate service. The yggdrasil service fails if + # this is put into its preStart. + systemd.services.yggdrasil-persistent-keys = lib.mkIf cfg.persistentKeys { + wantedBy = [ "multi-user.target" ]; + before = [ "yggdrasil.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = '' + if [ ! -e ${keysPath} ] + then + mkdir --mode=700 -p ${builtins.dirOf keysPath} + ${binYggdrasil} -genconf -json \ + | ${pkgs.jq}/bin/jq \ + 'to_entries|map(select(.key|endswith("Key")))|from_entries' \ + > ${keysPath} + fi + ''; + }; systemd.services.yggdrasil = { description = "Yggdrasil Network Service"; From 1c22b64fc97f9a5d05d6286d06b7606fba31eaaf Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 29 Oct 2023 01:05:47 +0200 Subject: [PATCH 117/170] nixos/tests/nextcloud: replace activationScript Replace with a seprate systemd service --- nixos/tests/nextcloud/basic.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index ab1d8353dba0..428fe0aa10db 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -13,10 +13,12 @@ in { # The only thing the client needs to do is download a file. client = { ... }: { services.davfs2.enable = true; - system.activationScripts.davfs2-secrets = '' - echo "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}" > /tmp/davfs2-secrets - chmod 600 /tmp/davfs2-secrets - ''; + systemd.tmpfiles.settings.nextcloud = { + "/tmp/davfs2-secrets"."f+" = { + mode = "0600"; + argument = "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}"; + }; + }; virtualisation.fileSystems = { "/mnt/dav" = { device = "http://nextcloud/remote.php/dav/files/${adminuser}"; From 8d3cf213db5a2323fea961b434a4157d7fed8911 Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Nov 2023 10:41:19 +0100 Subject: [PATCH 118/170] nixos/borgbackup: replace activationScript via tmpfiles --- nixos/modules/services/backup/borgbackup.nix | 23 ++++++++------------ 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 393fe83f493f..6f4455d3be60 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -143,20 +143,15 @@ let }; # Paths listed in ReadWritePaths must exist before service is started - mkActivationScript = name: cfg: + mkTmpfiles = name: cfg: let - install = "install -o ${cfg.user} -g ${cfg.group}"; - in - nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] ('' - # Ensure that the home directory already exists - # We can't assert createHome == true because that's not the case for root - cd "${config.users.users.${cfg.user}.home}" - # Create each directory separately to prevent root owned parent dirs - ${install} -d .config .config/borg - ${install} -d .cache .cache/borg - '' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) '' - ${install} -d ${escapeShellArg cfg.repo} - '')); + settings = { inherit (cfg) user group; }; + in lib.nameValuePair "borgbackup-job-${name}" ({ + "${config.users.users."${cfg.user}".home}/.config/borg".d = settings; + "${config.users.users."${cfg.user}".home}/.cache/borg".d = settings; + } // optionalAttrs (isLocalPath cfg.repo && !cfg.removableDevice) { + "${cfg.repo}".d = settings; + }); mkPassAssertion = name: cfg: { assertion = with cfg.encryption; @@ -760,7 +755,7 @@ in { ++ mapAttrsToList mkSourceAssertions jobs ++ mapAttrsToList mkRemovableDeviceAssertions jobs; - system.activationScripts = mapAttrs' mkActivationScript jobs; + systemd.tmpfiles.settings = mapAttrs' mkTmpfiles jobs; systemd.services = # A job named "foo" is mapped to systemd.services.borgbackup-job-foo From 65ff518a0d56ea2907114288a891464c2ab916ac Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Nov 2023 10:47:25 +0100 Subject: [PATCH 119/170] nixos/ipa: replace activationScript Replaced with a dedicated systemd service. --- nixos/modules/security/ipa.nix | 40 ++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/nixos/modules/security/ipa.nix b/nixos/modules/security/ipa.nix index 69a670cd5e4a..49226ec38199 100644 --- a/nixos/modules/security/ipa.nix +++ b/nixos/modules/security/ipa.nix @@ -181,25 +181,33 @@ in { ''; }; - system.activationScripts.ipa = stringAfter ["etc"] '' - # libcurl requires a hard copy of the certificate - if ! ${pkgs.diffutils}/bin/diff ${cfg.certificate} /etc/ipa/ca.crt > /dev/null 2>&1; then - rm -f /etc/ipa/ca.crt - cp ${cfg.certificate} /etc/ipa/ca.crt - fi + systemd.services."ipa-activation" = { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + script = '' + # libcurl requires a hard copy of the certificate + if ! ${pkgs.diffutils}/bin/diff ${cfg.certificate} /etc/ipa/ca.crt > /dev/null 2>&1; then + rm -f /etc/ipa/ca.crt + cp ${cfg.certificate} /etc/ipa/ca.crt + fi - if [ ! -f /etc/krb5.keytab ]; then - cat < Date: Thu, 2 Nov 2023 00:15:38 +0100 Subject: [PATCH 120/170] nixos/wrappers: order service after sysusers service --- nixos/modules/security/wrappers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 4e123fa9ca5e..a298686b34e9 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -280,6 +280,7 @@ in wantedBy = [ "sysinit.target" ]; before = [ "sysinit.target" "shutdown.target" ]; conflicts = [ "shutdown.target" ]; + after = [ "systemd-sysusers.service" ]; unitConfig.DefaultDependencies = false; unitConfig.RequiresMountsFor = [ "/nix/store" "/run/wrappers" ]; serviceConfig.Type = "oneshot"; From 3be357b2e78799704df2c3fb3b5f1c3872efc43b Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Nov 2023 09:22:18 +0100 Subject: [PATCH 121/170] nixos/binfmt: remove unused stringAfter --- nixos/modules/system/boot/binfmt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index d16152ab9dec..08e3dce70844 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkOption mkDefault types optionalString stringAfter; + inherit (lib) mkOption mkDefault types optionalString; cfg = config.boot.binfmt; From 0ebd39b5418cc8b5d8635c41e893ee4dfc19c7de Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Nov 2023 09:29:33 +0100 Subject: [PATCH 122/170] nixos/nix-channel: remove unused stringAfter --- nixos/modules/config/nix-channel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index a7ca7a5c74a4..dd97cb730ae4 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -12,7 +12,6 @@ let mkDefault mkIf mkOption - stringAfter types ; From 988b464d1e85c9c54fc547676f5323015b2232cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 03:08:57 +0000 Subject: [PATCH 123/170] python310Packages.pyvicare: 2.30.0 -> 2.32.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index fc0165c464e6..0fa3895caa58 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.30.0"; + version = "2.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-jcnA5qxS4eq1nZ0uo8NGPoSGTI/JrrH02MJPFxL3hQM="; + hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ce065c6a81cfcf7c1222a5275fa6e32607d19406 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 29 Dec 2023 04:15:43 +0100 Subject: [PATCH 124/170] perlPackages.SpreadsheetParseExcel: 0.65 -> 0.66 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7669bf2db61e..0c2464cb071c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22693,10 +22693,10 @@ with self; { SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz"; - hash = "sha256-bsTLQpvVjYFkD+EhFvQ1xG9R/xBAxo8JzIt2gcFnW+w="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-0.66.tar.gz"; + hash = "sha256-v9dqz7qYhgHcBRvac7S7JfaDmgBt2WC2p0AcJJJF9ls="; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { From 09ef96738583bba5490db540beed8eea44825853 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 28 Dec 2023 14:40:19 -0500 Subject: [PATCH 125/170] python311Packages.accelerate: 0.24.1 -> 0.25.0 --- .../python-modules/accelerate/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 24ed871c4037..d607fab5194b 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -11,6 +11,7 @@ , packaging , psutil , pyyaml +, safetensors , torch , evaluate , parameterized @@ -19,26 +20,18 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.24.1"; - format = "pyproject"; + version = "0.25.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; + hash = "sha256-WIMOSfo9fGbevMkUHvFsA51SOiGkBO1cK388FudRDY0="; }; - patches = [ - # https://github.com/huggingface/accelerate/pull/2121 - (fetchpatch { - name = "fix-import-error-without-torch_distributed.patch"; - url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; - hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -46,6 +39,7 @@ buildPythonPackage rec { packaging psutil pyyaml + safetensors torch ]; @@ -83,9 +77,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # python3.11 not yet supported for torch.compile - "test_dynamo_extract_model" ]; disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ From 0d7da4ad3164b43dbec3e35d62eb22e17018a53d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 29 Dec 2023 04:20:00 +0000 Subject: [PATCH 126/170] esbuild: 0.19.10 -> 0.19.11 Diff: https://github.com/evanw/esbuild/compare/v0.19.10...v0.19.11 Changelog: https://github.com/evanw/esbuild/blob/v0.19.11/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 9b80b6528b48..7d19b59638e5 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.10"; + version = "0.19.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-+PCNsIMc9+5/QlRsV1/pjcqklS+SNy2RaDuCLk1GaOs="; + hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 40299cc826272f40ef2952b4c8a23962068cb05a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 05:24:44 +0000 Subject: [PATCH 127/170] python310Packages.soco: 0.30.0 -> 0.30.1 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d496d42fff1b..40bcd475604e 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.0"; + version = "0.30.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-xoHXUcHmzEDmE17r0+vI56UBAPQEhpglBkWtwE9b2Nw="; + hash = "sha256-MajtB754VY+WmeJ2UROeNfvFdqSWIDXQwDSDK7zn8fk="; }; propagatedBuildInputs = [ From 00ad36658a3d001bf051d15fe6723c1af0468f60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 06:04:30 +0000 Subject: [PATCH 128/170] python310Packages.streamdeck: 0.9.4 -> 0.9.5 --- pkgs/development/python-modules/streamdeck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 7c17ba2d49a9..6202fcdf1f79 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aVmWbrBhZ49NfwOp23FD1dxZF+w/q26fIOVs7iQXUxo="; + hash = "sha256-BHliZrRFd64D+UD1xcpp2HAH4D0Z7tibawJobAMM65E="; }; patches = [ From 1168d42391c50e10ab126774496b211fa8c33c47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 06:39:11 +0000 Subject: [PATCH 129/170] cargo-semver-checks: 0.26.0 -> 0.27.0 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 51e2e5d062dd..e1b2f6867e1f 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-M7ovDD9dwxVZgbggnXhe1A/hDQ8QRmY/2J6qdWU4mys="; + hash = "sha256-DN50syZ965MWXKg3lhEhvINeqZUtZgJNjusevf4EIUw="; }; - cargoHash = "sha256-wPWSuvAmPCquwg44PsbExnDKp7xDVWIy+/1SnnCuJmE="; + cargoHash = "sha256-ulsU/QSSNqyZTjM77PQnr3HVUg2dS8SxHv2y6Lsvths="; nativeBuildInputs = [ cmake From 520298bae541290e987afd035658a729366ded61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 06:39:14 +0000 Subject: [PATCH 130/170] bup: 0.33.2 -> 0.33.3 --- pkgs/tools/backup/bup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4b9951f2e2ea..c2b7b048bce2 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -6,7 +6,7 @@ assert par2Support -> par2cmdline != null; let - version = "0.33.2"; + version = "0.33.3"; pythonDeps = with python3.pkgs; [ setuptools tornado ] ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - hash = "sha256-DDVCrY4SFqzKukXm8rIq90xAW2U+yYyhyPmUhslMMWI="; + hash = "sha256-w7yPs7hG4v0Kd9i2tYhWH7vW95MAMfI/8g61MB6bfps="; }; buildInputs = [ git python3 ]; From a6addb6b20fcf22bdb751077a2e3fca69c0c425c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 29 Dec 2023 06:59:51 +0000 Subject: [PATCH 131/170] guacamole-client: fix `tests` attribute eval Without the change `tests` eval fails as: $ nix build --no-link -f. guacamole-client.tests error: attribute 'guacamole-client' missing `guacamole-client` test was removed in a4e7f5011d86f966d "nixos/tests: remove reference to non-existent test" --- pkgs/servers/guacamole-client/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index db10f2851df2..23c56df62a46 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchurl -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,10 +24,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - inherit (nixosTests) guacamole-client; - }; - meta = { description = "Clientless remote desktop gateway"; homepage = "https://guacamole.apache.org/"; From 98cddee95bf2ae2bb25623d3859379dfea155059 Mon Sep 17 00:00:00 2001 From: octodi Date: Tue, 26 Dec 2023 22:57:50 +0530 Subject: [PATCH 132/170] caido: init at 0.29.2 Removed OZONE flags as it not an electron app Added changelog Added WEBKIT_DISABLE_COMPOSITING_MODE env variable Added mainProgram and sourceProvenance Co-Authored-By: Fabian Affolter Co-Authored-By: Arthur <150680976+arthsmn@users.noreply.github.com> Co-Authored-By: Peder Bergebakken Sundt --- pkgs/by-name/ca/caido/package.nix | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/ca/caido/package.nix diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix new file mode 100644 index 000000000000..f7da4eaef797 --- /dev/null +++ b/pkgs/by-name/ca/caido/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchurl +, appimageTools +, makeWrapper +}: + +let + pname = "caido"; + version = "0.29.2"; + src = fetchurl { + url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-linux-v${version}-e0f8102b.AppImage"; + hash = "sha256-4PgQK52LAX1zacmoUK0muIhrvFDF7anQ6sx35I+ErVs="; + }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; + +in appimageTools.wrapType2 { + inherit pname src version; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + substituteInPlace $out/share/applications/caido.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + + meta = with lib; { + description = "A lightweight web security auditing toolkit"; + homepage = "https://caido.io/"; + changelog = "https://github.com/caido/caido/releases/tag/v${version}"; + license = licenses.unfree; + maintainers = with maintainers; [ octodi ]; + mainProgram = "caido"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + }; +} From 2f5baded885ae44953e774088c618dd477cec47d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 29 Dec 2023 07:09:58 +0000 Subject: [PATCH 133/170] mutmut: fix `tests` eval Without the change `tests fails the eval as: $ nix build --no-link -f. mutmut.tests error: undefined variable 'testers' --- pkgs/development/tools/mutmut/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/development/tools/mutmut/default.nix index 4b40930c646d..85d981961d16 100644 --- a/pkgs/development/tools/mutmut/default.nix +++ b/pkgs/development/tools/mutmut/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , python3 +, testers }: let self = with python3.pkgs; buildPythonApplication rec { From e9ddf8f9eb7bcc6c4b0cb58d376d76a0543d0163 Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Fri, 29 Dec 2023 08:22:23 +0100 Subject: [PATCH 134/170] linuxKernel.kernels.linux_lqx: 6.6.8-lqx1 -> 6.6.8-lqx2 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ce64711dac42..658dc4a193c3 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,8 +12,8 @@ let # ./update-zen.py lqx lqxVariant = { version = "6.6.8"; #lqx - suffix = "lqx1"; #lqx - sha256 = "04ix6mifnwg1flk2mnjxsajg227svwazhyi8r2h6xwbg0sy80qps"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1hb6g657ivpnyqw6xsd6b09kwlh4vv11wv68ydcmsd5cg6qmv2zy"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From da6707b432093b24fedafc384ca27ac7892363b7 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 29 Dec 2023 13:13:03 +0530 Subject: [PATCH 135/170] just: 1.18.1 -> 1.20.0 Diff: https://github.com/casey/just/compare/refs/tags/1.18.1...1.20.0 Changelog: https://github.com/casey/just/blob/1.20.0/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 213a411b6b6b..424c5f0db2be 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.18.1"; + version = "1.20.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jmTSTx2WSLOtxy0gPCTonjcoy4o9FKA5aiQW3+wPrZQ="; + hash = "sha256-MTfxVUr5rQpu5AXJmP/7rOjeHSsX+iQqfBdYb8YWfiU="; }; - cargoHash = "sha256-4kbvtmXkU5bhuC079K5NOGKVdqYvTileVNXSNLIV0ok="; + cargoHash = "sha256-lvqtt6RCy/SqzZXWRR5u2P9UOlHC5Hjg6UhYjxpS3as="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 651398cc035f56e8f273776a47174ac4ee28e4eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 08:25:22 +0000 Subject: [PATCH 136/170] icewm: 3.4.4 -> 3.4.5 --- pkgs/by-name/ic/icewm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 186810876b32..9f64d08ca771 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-bnoNkBsNJ/6CVmm5I/nwy6LGxYhxPXssjZ3TT7FdEz8="; + hash = "sha256-Auuu+hRYVziAF3hXH7XSOyNlDehEKg6QmSJicY+XQLk="; }; nativeBuildInputs = [ From 31d8c94e7b8e2c1067a3ca574bb4217e28063910 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 29 Dec 2023 18:29:16 +1000 Subject: [PATCH 137/170] supabase-cli: 1.127.1 -> 1.129.0 --- pkgs/development/tools/supabase-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index ddb57f7ee20a..541e82c60054 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.127.1"; + version = "1.129.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-FzAGhIEuAOvLNQdoDqkIJBWcl0cDGz1nkbpp4Ha4yQo="; + hash = "sha256-qbm7ByPZpLx0BB/iZ3UjYFe/g6l7ZuUw4wzrH72Ut7U="; }; vendorHash = "sha256-lFholyFVr6uMcfafM/tb8r1/4ysgWZOW5neoy3uL0Vw="; From a26053936bb69bfb9a0ce2f3084db3e076476f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 08:52:03 +0000 Subject: [PATCH 138/170] charasay: 3.1.0 -> 3.2.0 --- pkgs/tools/misc/charasay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/tools/misc/charasay/default.nix index 9051638a8c2c..7e79c6479b40 100644 --- a/pkgs/tools/misc/charasay/default.nix +++ b/pkgs/tools/misc/charasay/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "charasay"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latipun7"; repo = pname; rev = "v${version}"; - hash = "sha256-ijr6AvhoiYWHYTPUxSdBds9jBW1HEy1n7h6zH1VGP1c="; + hash = "sha256-7z5+7yrx5X5rdBMNj9oWBZ2IX0s88c1SLhgz2IDDEn8="; }; - cargoHash = "sha256-HCHdiCeb4dqxQMWfYZV2k8Yq963vWfmL05BRpVYmIcg="; + cargoHash = "sha256-5htNU8l+amh+C8EL1K4UcXzf5Pbhhjd5RhxrucJoj/M="; nativeBuildInputs = [ installShellFiles ]; From 2839d411e9f08204a867a9fb6c01715b84e8b5e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 09:23:22 +0000 Subject: [PATCH 139/170] nkeys: 0.4.6 -> 0.4.7 --- pkgs/tools/system/nkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index a9328067463a..54a02a906576 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Sgj4+akOs/3fnpP0YDoRY9WwSk4uwtIPyPilutDXOlE="; + hash = "sha256-ui/vSa2TGe6Pe2aAzitBa1Pd2vKgTMuHoBhYYy2p6Rw="; }; - vendorHash = "sha256-8EfOtCiYCGmhGtZdPiFyNzBj+QsPx67vwFDMZ6ATidc="; + vendorHash = "sha256-SiSqmj6ktfiGsJOSu/pBY53e3vnN+RBfTkGwUuW52uo="; meta = with lib; { description = "Public-key signature system for NATS"; From 8c994854f2f53acaca889949ee35a2ed924759cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 00:47:21 +0000 Subject: [PATCH 140/170] juicefs: 1.1.0 -> 1.1.1 --- pkgs/tools/filesystems/juicefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 5df6986380b7..00f45c332cbe 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UtERYOjAKOTK+A1qPdD1PajOkf/t5vqWRBvEuxkZmdg="; + sha256 = "sha256-dMzBgwd5tVxE6OFHf6QTZfoqgL/t2pX+OgI6Pki6PG8="; }; - vendorHash = "sha256-BpqxCCuWyUgzPyh7sq3/HyQ29qm/PWD7mQFh1nkkAkA="; + vendorHash = "sha256-orq03bwN1cbwHoZFXz92tcA2F0oivGR/C5EJDAPA+pk="; ldflags = [ "-s" "-w" ]; From 5803e6701fb03f092f377c7802b6027588aa131c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 10:13:57 +0000 Subject: [PATCH 141/170] static-web-server: 2.24.1 -> 2.24.2 --- pkgs/servers/static-web-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 4c7b8d46638c..824c56584e2b 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.24.1"; + version = "2.24.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; + hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc="; }; - cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; + cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 4eb331ef94a58a068717771f6d6fd0f6c64ef5b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 10:47:23 +0000 Subject: [PATCH 142/170] automatic-timezoned: 1.0.137 -> 1.0.138 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index edc02b3f4465..52102fcb1872 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.137"; + version = "1.0.138"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+/P+pt79kGIr399c3oTwqbvtMc1nJNRhBYmYJsLrmDg="; + sha256 = "sha256-QygghEMpIoYaIIzINHXKUQmkCdoZdScZLHlIW9sObWk="; }; - cargoHash = "sha256-QCWlyuoogrU09JvP+X5If1KcYjaoL0zVhBexXwSqc1U="; + cargoHash = "sha256-HLqONTd+8kn6nUWEEJTGevJxntnfYEu5e41/wvENZAw="; meta = with lib; { description = "Automatically update system timezone based on location"; From 18e61acd4a88da0f543e7fcebb9e493430985354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 10:48:08 +0000 Subject: [PATCH 143/170] pgmoneta: 0.7.2 -> 0.7.3 --- pkgs/by-name/pg/pgmoneta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 8f04fdae7bbd..7ff1794850a2 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-4jysBL6fwX2ns+N+ldhTCXZ7L/IuXjbAwou18Ur5+JU="; + hash = "sha256-sErdlHXMn97acVIxKapsnLkyOAgO7lOB0UQC5GkL4sQ="; }; nativeBuildInputs = [ From 0e7633f486912c0375f9f243f43113eb1469a9db Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 28 Dec 2023 23:11:55 +0100 Subject: [PATCH 144/170] esphome: improve error message --- pkgs/tools/misc/esphome/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 489250776213..a8ab91f8f329 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -75,6 +75,7 @@ python.pkgs.buildPythonApplication rec { # esptool is used in esphomeyaml/__main__.py # git is used in esphomeyaml/writer.py "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages "--set ESPHOME_USE_SUBPROCESS ''" ]; From 81d6df0268747d1a32ea85d37b4276fd23a9795d Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 15:43:58 +0000 Subject: [PATCH 145/170] mpvScripts: Avoid mixing `//` and `callPackage` This will avoid an infinite recursion issue when turned into a scope --- pkgs/applications/video/mpv/scripts/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 3520138a7d60..a3de7e315a2b 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -58,6 +58,11 @@ in lib.recurseIntoAttrs (lib.mapAttrs addTests ({ + inherit (callPackage ./mpv.nix { inherit buildLua; }) + acompressor autocrop autodeint autoload; + inherit (callPackage ./occivink.nix { inherit buildLua; }) + blacklistExtensions seekTo; + chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; convert = callPackage ./convert.nix { inherit buildLua; }; cutter = callPackage ./cutter.nix { inherit buildLua; }; @@ -76,9 +81,7 @@ lib.recurseIntoAttrs visualizer = callPackage ./visualizer.nix { inherit buildLua; }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - } - // (callPackage ./mpv.nix { inherit buildLua; }) - // (callPackage ./occivink.nix { inherit buildLua; }))) + })) // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 } From 6b186414ded05f306218883a861f958386450252 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 15:44:44 +0000 Subject: [PATCH 146/170] mpvScripts.buildLua: Expose to nixpkgs users --- .../video/mpv/scripts/default.nix | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index a3de7e315a2b..3c1af55a2921 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -5,64 +5,65 @@ }: let - buildLua = callPackage ./buildLua.nix { }; - unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint {}; - addTests = name: drv: let - inherit (drv) scriptName; - scriptPath = "share/mpv/scripts/${scriptName}"; - fullScriptPath = "${drv}/${scriptPath}"; + addTests = name: drv: + if ! lib.isDerivation drv then + drv + else let + inherit (drv) scriptName; + scriptPath = "share/mpv/scripts/${scriptName}"; + fullScriptPath = "${drv}/${scriptPath}"; + in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ + (old.passthru.tests or {}) - in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ - (old.passthru.tests or {}) + { + scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + if [ -e "${fullScriptPath}" ]; then + touch $out + else + echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 + exit 1 + fi + ''; + } - { - scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - if [ -e "${fullScriptPath}" ]; then - touch $out - else - echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 - exit 1 - fi - ''; - } + # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode + (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { + single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + die() { + echo "$@" >&2 + exit 1 + } - # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode - (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { - single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - die() { - echo "$@" >&2 - exit 1 - } - - cd "${drv}/${scriptPath}" # so the glob expands to filenames only - mains=( main.* ) - if [ "''${#mains[*]}" -eq 1 ]; then - touch $out - elif [ "''${#mains[*]}" -eq 0 ]; then - die "'${scriptPath}' contains no 'main.*' file" - else - die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" - fi - ''; - }) - ]; }; }); + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + }) + ]; }; }); in lib.recurseIntoAttrs - (lib.mapAttrs addTests ({ + (lib.mapAttrs addTests (rec { inherit (callPackage ./mpv.nix { inherit buildLua; }) acompressor autocrop autodeint autoload; inherit (callPackage ./occivink.nix { inherit buildLua; }) blacklistExtensions seekTo; + buildLua = callPackage ./buildLua.nix { }; chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; convert = callPackage ./convert.nix { inherit buildLua; }; cutter = callPackage ./cutter.nix { inherit buildLua; }; From 614afa6014f7d289f606c46c6840c81976948a3a Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 15:49:35 +0000 Subject: [PATCH 147/170] mpvScripts: Make into a scope --- .../video/mpv/scripts/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 3c1af55a2921..98860e1f2cba 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -1,6 +1,6 @@ { lib -, callPackage , config +, newScope , runCommand }: @@ -56,33 +56,34 @@ let ]; }; }); in -lib.recurseIntoAttrs - (lib.mapAttrs addTests (rec { - inherit (callPackage ./mpv.nix { inherit buildLua; }) +lib.recurseIntoAttrs (lib.makeScope newScope (self: + let inherit (self) callPackage; + in lib.mapAttrs addTests { + inherit (callPackage ./mpv.nix { }) acompressor autocrop autodeint autoload; - inherit (callPackage ./occivink.nix { inherit buildLua; }) + inherit (callPackage ./occivink.nix { }) blacklistExtensions seekTo; buildLua = callPackage ./buildLua.nix { }; - chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; - convert = callPackage ./convert.nix { inherit buildLua; }; - cutter = callPackage ./cutter.nix { inherit buildLua; }; + chapterskip = callPackage ./chapterskip.nix { }; + convert = callPackage ./convert.nix { }; + cutter = callPackage ./cutter.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; - mpv-webm = callPackage ./mpv-webm.nix { inherit buildLua; }; - mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; - quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; + mpvacious = callPackage ./mpvacious.nix { }; + quality-menu = callPackage ./quality-menu.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; - sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { inherit buildLua; }; - thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; - thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; - uosc = callPackage ./uosc.nix { inherit buildLua; }; - visualizer = callPackage ./visualizer.nix { inherit buildLua; }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; + uosc = callPackage ./uosc.nix { }; + visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - })) + } // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 -} + })) From 08de7bd96147bca47ee7428c620707cbb34cef9f Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 27 Dec 2023 22:59:08 +0000 Subject: [PATCH 148/170] mpvScripts: Refactor `default.nix` It seems a bit easier to follow what is going on --- .../video/mpv/scripts/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 98860e1f2cba..2c310cd410b6 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -54,10 +54,9 @@ let ''; }) ]; }; }); -in -lib.recurseIntoAttrs (lib.makeScope newScope (self: - let inherit (self) callPackage; + scope = self: let + inherit (self) callPackage; in lib.mapAttrs addTests { inherit (callPackage ./mpv.nix { }) acompressor autocrop autodeint autoload; @@ -83,7 +82,15 @@ lib.recurseIntoAttrs (lib.makeScope newScope (self: visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - } - // lib.optionalAttrs config.allowAliases { - youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 - })) + }; + + aliases = lib.optionalAttrs config.allowAliases { + youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 + }; +in + +with lib; pipe scope [ + (makeScope newScope) + (attrsets.unionOfDisjoint aliases) + recurseIntoAttrs +] From ef51456d0f2b01674d62f658ff5f5b286e27d24b Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 27 Dec 2023 23:08:17 +0000 Subject: [PATCH 149/170] mpvScripts: Immediately error on collisions between `scope` and `aliases` This makes mistakes more obvious, and ensures the error happens independently of config.allowAliases, so any build will catch it. --- pkgs/applications/video/mpv/scripts/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 2c310cd410b6..158a7c491007 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -84,13 +84,15 @@ let webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; }; - aliases = lib.optionalAttrs config.allowAliases { + aliases = { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 }; in with lib; pipe scope [ (makeScope newScope) - (attrsets.unionOfDisjoint aliases) + (self: + assert builtins.intersectAttrs self aliases == {}; + self // optionalAttrs config.allowAliases aliases) recurseIntoAttrs ] From d95aaab15364d7f30167cab4cd003a166c37d52d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 11:23:02 +0000 Subject: [PATCH 150/170] python310Packages.textdistance: 4.6.0 -> 4.6.1 --- pkgs/development/python-modules/textdistance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 2c2d5ee23adf..c362e936eb32 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cyxQMVzU7pRjg4ZDzxnWkiEwLDYDHqpgcMMMwKpdqMo="; + hash = "sha256-JYllgBse+FaGppq/bDzv3F2iHC+9iMkMaHJfV6fUXyE="; }; # There aren't tests From 089b731d87d41e03f57cb46a712381c98e37bfa6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 29 Dec 2023 11:27:59 +0000 Subject: [PATCH 151/170] python/hooks: fix `test` attribute eval Without the change `tests` attribute fails the eval as: $ nix build --no-link -f. pypy27Packages.pypaBuildHook.tests error: 69| # versions of this hook's dependencies. 70| passthru.tests = import ./pypa-build-hook-tests.nix { | ^ Fixed file name and added missing runCommand import. --- pkgs/development/interpreters/python/hooks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 35116b38f810..d06f3db334da 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -2,6 +2,7 @@ self: dontUse: with self; let inherit (python) pythonOnBuildForHost; + inherit (pkgs) runCommand; pythonInterpreter = pythonOnBuildForHost.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; @@ -67,7 +68,7 @@ in { # Such conflicts don't happen within the standard nixpkgs python package # set, but in downstream projects that build packages depending on other # versions of this hook's dependencies. - passthru.tests = import ./pypa-build-hook-tests.nix { + passthru.tests = import ./pypa-build-hook-test.nix { inherit pythonOnBuildForHost runCommand; }; } ./pypa-build-hook.sh) { From 48956956edbba59fdf3ac4552d6be7b57e30a566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Fri, 29 Dec 2023 12:35:19 +0100 Subject: [PATCH 152/170] symfony-cli: 5.7.6 -> 5.7.7 Diff: https://github.com/symfony-cli/symfony-cli/compare/v5.7.6...v5.7.7 Changelog: https://github.com/symfony-cli/symfony-cli/releases/tag/v5.7.7 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 9c75e6d66234..f663da08b0b0 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.7.6"; - vendorHash = "sha256-GuLcevYEM+neWAJoNBZrAVzVxdaLFFi9nubXGzp4EXw="; + version = "5.7.7"; + vendorHash = "sha256-R0/zJlK9T0iAfquROOWraoBHzd//rIIXNIps3GvGRvA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-HMyq4raB6pPtx4DEJlcSM2+jlw7KWJW72RRVdG2wvn0="; + hash = "sha256-ZoBMOArpsmUniVc7cqbB4UZZ6ujnVfHqRos0Mcr+E4Q="; }; ldflags = [ From 34d2421d7196d7382dda2b76fe3c28c9e606c06e Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 29 Dec 2023 00:10:09 +0100 Subject: [PATCH 153/170] satty: 0.8.2 -> 0.8.3 Diff: https://github.com/gabm/Satty/compare/v0.8.2...v0.8.3 --- pkgs/by-name/sa/satty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index e9b9c1746a87..b22ea923a959 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-5FKEQUH43qx8w7s7lW8EDOWtWCUJTbWlXcMQazR8Thk="; + hash = "sha256-KCHKR6DP8scd9xdWi0bLw3wObrEi0tOsflXHa9f4Z5k="; }; - cargoHash = "sha256-FpCmzU2C+5+5eSB5Mno+lOFd4trHXmfp6e5oV+CvU1c="; + cargoHash = "sha256-pUBtUC+WOuiypLUpXCPR1pu0fRrMVTxg7FE2JSaszNw="; nativeBuildInputs = [ copyDesktopItems From 915c004e3690a47cc731f30eb4c61e20a9ab3c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Dec 2023 13:58:55 +0100 Subject: [PATCH 154/170] Revert "melpa2nix: update to work with Emacs HEAD" --- pkgs/build-support/emacs/melpa.nix | 4 +- pkgs/build-support/emacs/melpa2nix.el | 26 +++++------ .../emacs/package-build-dont-use-mtime.patch | 43 +++++++++++++------ 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 83654cf47144..85bc8aa37b3a 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -40,8 +40,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; - sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + rev = "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d"; + sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5"; }; patches = [ ./package-build-dont-use-mtime.patch ]; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 3de77dbf5e5c..72667dea652c 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -11,22 +11,22 @@ ;; Allow installing package tarfiles larger than 10MB (setq large-file-warning-threshold nil) -(defun melpa2nix-build-package-1 (rcp) - (let* ((default-directory (package-recipe--working-tree rcp))) +(defun melpa2nix-build-package-1 (rcp version commit) + (let ((source-dir (package-recipe--working-tree rcp))) (unwind-protect (let ((files (package-build-expand-files-spec rcp t))) - (unless files - (error "Unable to find files matching recipe patterns")) - (if (> (length files) 1) - (package-build--build-multi-file-package rcp files) - (package-build--build-single-file-package rcp files)))))) + (cond + ((= (length files) 1) + (package-build--build-single-file-package + rcp version commit files source-dir)) + ((> (length files) 1) + (package-build--build-multi-file-package + rcp version commit files source-dir)) + (t (error "Unable to find files matching recipe patterns"))))))) (defun melpa2nix-build-package () - (unless noninteractive - (error "`melpa2nix-build-package' is to be used only with -batch")) + (if (not noninteractive) + (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left (`(,package ,version ,commit) - (let ((recipe (package-recipe-lookup package))) - (setf (oref recipe commit) commit) - (setf (oref recipe version) version) - (melpa2nix-build-package-1 recipe))))) + (melpa2nix-build-package-1 (package-recipe-lookup package) version commit)))) diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch index 1ace7771ea3a..fe94de57a300 100644 --- a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch +++ b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch @@ -1,21 +1,40 @@ diff --git a/package-build.el b/package-build.el -index 29cdb61..c19be1b 100644 +index e572045..9eb0f82 100644 --- a/package-build.el +++ b/package-build.el -@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory - that is put in the tarball." - (let* ((name (oref rcp name)) - (version (oref rcp version)) -- (time (oref rcp time)) - (tar (expand-file-name (concat name "-" version ".tar") - package-build-archive-dir)) - (dir (concat name "-" version))) -@@ -939,7 +938,7 @@ that is put in the tarball." - ;; prevent a reproducible tarball as described at +@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir) + (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" + (current-buffer))))) + +-(defun package-build--create-tar (name version directory mtime) ++(defun package-build--create-tar (name version directory) + "Create a tar file containing the contents of VERSION of package NAME. + DIRECTORY is a temporary directory that contains the directory + that is put in the tarball. MTIME is used as the modification +@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime) + ;; prevent a reproducable tarball as described at ;; https://reproducible-builds.org/docs/archives. "--sort=name" -- (format "--mtime=@%d" time) +- (format "--mtime=@%d" mtime) + "--mtime=@0" "--owner=0" "--group=0" "--numeric-owner" "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) (when (and package-build-verbose noninteractive) +@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source- + (package-build--desc-from-library + name version commit files 'tar) + (error "%s[-pkg].el matching package name is missing" +- name)))) +- (mtime (package-build--get-commit-time rcp commit))) ++ name))))) + (package-build--copy-package-files files source-dir target) + (package-build--write-pkg-file desc target) + (package-build--generate-info-files files source-dir target) +- (package-build--create-tar name version tmp-dir mtime) ++ (package-build--create-tar name version tmp-dir) + (package-build--write-pkg-readme name files source-dir) + (package-build--write-archive-entry desc)) + (delete-directory tmp-dir t nil)))) +-- +2.37.2 + From 3def6e473c41d8b5b97de959bb0c808649c4d862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 13:22:59 +0000 Subject: [PATCH 155/170] python310Packages.withings-sync: 4.2.1 -> 4.2.2 --- pkgs/development/python-modules/withings-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 60cce387fa62..0e57cd5b7914 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.1"; + version = "4.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jaroslawhartman"; repo = "withings-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-6igjUmgIA077/1SQMt10tRpnLVKxGFNJN1GeLhQLROg="; + hash = "sha256-p1coGTbMQ+zptFKVLW5qgSdoudo2AggGT8Xu+cSCCs4="; }; nativeBuildInputs = [ From 0403c41f61bbb3065d9d894ee5b4e799af872c4d Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 29 Dec 2023 17:00:45 +0300 Subject: [PATCH 156/170] nixos/installer: add a link to how to actually upgrade your system to the stateVersion note --- nixos/modules/installer/tools/tools.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 9ccc76a82c95..a7d11370d445 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -231,7 +231,8 @@ in # even if you've upgraded your system to a new NixOS release. # # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system. + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. # # This value being lower than the current NixOS release does NOT mean your system is # out of date, out of support, or vulnerable. From 836e74d69553b74c557613e1763d99a0ffed0a6e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 29 Dec 2023 14:07:43 +0000 Subject: [PATCH 157/170] python312Packages.array-record: improve eval error Before the change access to non-existent `.cp312` attribute caused irrecoverable eval failure: $ nix build --no-link -f. python312Packages.array-data ... error: attribute 'cp312' missing After the change we use `throw` fallback to turn the error into recoverable: $ nix build --no-link -f. python312Packages.array-data ... error: array-record is missing hash for cp312 The difference is visible when one tries to skip the derivations that throw errors. Irrecoverable eval errors do not allow skipping such derivations. --- pkgs/development/python-modules/array-record/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 0497c542fe24..3abe60f64d5e 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; - }.${pyShortVersion}; + }.${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; propagatedBuildInputs = [ From 03387a3e63e7ad76dea7432bb65a9d8f42b24874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 07:51:54 +0000 Subject: [PATCH 158/170] git-releaser: 0.1.1 -> 0.1.2 --- pkgs/by-name/gi/git-releaser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix index f5b0518aaabc..f5be82cec293 100644 --- a/pkgs/by-name/gi/git-releaser/package.nix +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "git-releaser"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "git-releaser"; repo = "git-releaser"; rev = "refs/tags/v${version}"; - hash = "sha256-owIXiLLnCkda9O0C0wW0nEuwXC4hipNpR9fdFqgbWts="; + hash = "sha256-rgnOXon68QMfVbyYhERy5z2pUlLCBwum7a/U9kdp5M0="; }; - vendorHash = "sha256-dTyHKSCEImySu6Tagqvh6jDvgDbOTL0fMUOjFBpp64k="; + vendorHash = "sha256-O6Rqdf6yZvW8aix51oIziip+WcVIiyDZZ2VOQfwP8Fs="; ldflags = [ "-X main.version=${version}" ]; From dfc1bdb916552e0e6b3ea649e72e56477dc5ce3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 07:49:20 +0000 Subject: [PATCH 159/170] ddgr: 2.1 -> 2.2 --- pkgs/applications/misc/ddgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index a9e87e724059..0e7800b9bbb3 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "sha256-D5FUhv1moQKzcLj/3VWJNs24jTXJir1dMpv59orPTtc="; + sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg="; }; nativeBuildInputs = [ installShellFiles ]; From 67a799c40f1e177950d70bb0ea1073c4b6273b0f Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 29 Dec 2023 01:46:01 +0100 Subject: [PATCH 160/170] nixos/ollama: init --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/ollama.nix | 42 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 nixos/modules/services/misc/ollama.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 8f6dd2fc74cc..019cac01905f 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [rspamd-trainer](https://gitlab.com/onlime/rspamd-trainer), script triggered by a helper which reads mails from a specific mail inbox and feeds them into rspamd for spam/ham training. +- [ollama](https://ollama.ai), server for running large language models locally. + - [Anki Sync Server](https://docs.ankiweb.net/sync-server.html), the official sync server built into recent versions of Anki. Available as [services.anki-sync-server](#opt-services.anki-sync-server.enable). The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been marked deprecated and will be dropped after 24.05 due to lack of maintenance of the anki-sync-server softwares. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3bb50d8e6b05..65047bdd110a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -723,6 +723,7 @@ ./services/misc/nzbget.nix ./services/misc/nzbhydra2.nix ./services/misc/octoprint.nix + ./services/misc/ollama.nix ./services/misc/ombi.nix ./services/misc/osrm.nix ./services/misc/owncast.nix diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix new file mode 100644 index 000000000000..9794bbbec464 --- /dev/null +++ b/nixos/modules/services/misc/ollama.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: let + + cfg = config.services.ollama; + +in { + + options = { + services.ollama = { + enable = lib.mkEnableOption ( + lib.mdDoc "Server for local large language models" + ); + package = lib.mkPackageOption pkgs "ollama" { }; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd = { + services.ollama = { + wantedBy = [ "multi-user.target" ]; + description = "Server for local large language models"; + after = [ "network.target" ]; + environment = { + HOME = "%S/ollama"; + OLLAMA_MODELS = "%S/ollama/models"; + }; + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} serve"; + WorkingDirectory = "/var/lib/ollama"; + StateDirectory = [ "ollama" ]; + DynamicUser = true; + }; + }; + }; + + environment.systemPackages = [ cfg.package ]; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} From 626c0e3f7c574122300631c68323cbd972a02719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 14:23:17 +0000 Subject: [PATCH 161/170] qownnotes: 23.12.3 -> 23.12.5 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7a714d6f3008..e7f8cd804460 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.12.3"; + version = "23.12.5"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-cQjO5LgGDU9ZHnvKniFMBzcxgWRFfS+PQ0OSe+NFv+c="; + hash = "sha256-nPlaKbtG6ncHI9I/qHUFRtc98lWkz7C/VXFX/JkXhDo="; }; nativeBuildInputs = [ From d05b9fdc8fd83705acf6677371391d10651d0a7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Dec 2023 06:47:39 -0800 Subject: [PATCH 162/170] =?UTF-8?q?evolution-ews:=203.50.1=20=E2=86=92=203?= =?UTF-8?q?.50.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.50.1...3.50.2 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- .../evolution/evolution-ews/hardcode-gsettings.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index b7948a9df97d..792a785317f8 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "577S3Z/AhFf3W6ufiWJV8w/TTHu8nIqV74fi4pEqCa0="; + sha256 = "gYgjez2TGnOrire1c5/0Pqoky8mtjnK4I5KZ9pizHmY="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index aa1b1bcb89db..55fcb25f1551 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c -index 653a8fb..ad80283 100644 +index b7c65ae..b334198 100644 --- a/src/EWS/calendar/e-cal-backend-ews-utils.c +++ b/src/EWS/calendar/e-cal-backend-ews-utils.c -@@ -2406,7 +2406,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) +@@ -2425,7 +2425,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) if (schema) { GSettings *settings; From ff0852881078880b1bd5d04bf954e641cda776bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Dec 2023 06:55:32 -0800 Subject: [PATCH 163/170] planner: 0.14.91 -> 0.14.92 https://gitlab.gnome.org/World/planner/-/compare/0.14.91...0.14.92 --- pkgs/applications/office/planner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 51957037cc2b..8dbcd13f1c99 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "planner"; - version = "0.14.91"; + version = "0.14.92"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "planner"; rev = version; - hash = "sha256-LxctZv/CKolJ1I4Hql20E+/+p+ZoJLR1eZe34HPMqvY="; + hash = "sha256-2LmNeyZURVtA52Vosyn44wT8zSaJn8tR+8sPM9atAwM="; }; postPatch = '' From 93d39734d9e77abfdaed12824b480ee8bad0beff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 10:13:17 +0000 Subject: [PATCH 164/170] wakapi: 2.10.0 -> 2.10.2 --- pkgs/tools/misc/wakapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 954924c3ca22..4602f5ba35bc 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.10.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-CyMzhEKaTiLODjXbHqkqEJNeCsssCjmdVOzg3vXVjJY="; + sha256 = "sha256-ecbWP6WnFCMCnk8o3A0UUdMj8cSmKm5KD/gVN/AVvIY="; }; - vendorHash = "sha256-+FYeaIQXHZyrik/9OICl2zk+OA8X9bry7JCQbdf9QGs="; + vendorHash = "sha256-RG6lc2axeAAPHLS1xRh8gpV/bcnyTWzYcb1YPLpQ0uQ="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; From ea34b38d74f1aca48d0baa99c40bfd0378c056b6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Dec 2023 15:36:47 +0100 Subject: [PATCH 165/170] =?UTF-8?q?jasmin-compiler:=202023.06.1=20?= =?UTF-8?q?=E2=86=92=202023.06.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/jasmin-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7bb0d3742a97..dcb2bf87692f 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.1"; + version = "2023.06.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-3+eIR8wkBlcUQVDsugHo/rHNHbE2vpE9gutp55kRY4Y="; + hash = "sha256-I3+MP2Q7ENOdQdvvCqcyD+I8ImF6c+9HQDpY6QUWuY8="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; From bae5e6516269cc804974ef2d5f494d46f7a012c1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 28 Dec 2023 19:07:48 +0100 Subject: [PATCH 166/170] nixos/nextcloud: fix nginx routing to store and nix apps Closes #277206 The bug mentioned above was a symptom of the issue fixed here: when opening the `forms` app which is installed via `extraApps` (or the app store) the site wouldn't work because `.mjs` files had the wrong Content-Type. The actual problem got fixed already[1], however this config was not used for stuff from `/nix-apps` & `/store-apps` which had their own location section with only a `root ;` statement. In fact, this setup isn't strictly supported by Nextcloud upstream[2], so to fix this for good, I decided to follow the upstream suggestion for app directories outside the server root, i.e. linking them back into the store path. This means that the module generates a new derivation now with * `services.nextcloud.package` linked into it via `lndir`. * under `nix-apps` is a symlink to the link farm containing all apps from `services.nextcloud.extraApps`. * under `store-apps` is a symlink to `/var/lib/nextcloud/store-apps`. Since this is only used in the NixOS module that also configures this location for imperatively installed apps, this seems an OK thing to do. Successfully tested the change on a productive Nextcloud 28.0.1 with several apps installed via `extraApps` (`forms`, `cospend`, `maps`, `user_saml` and a few more). [1] 292c74c7a92efe45cfdfc091fb48d8c575346a95 [2] https://docs.nextcloud.com/server/28/admin_manual/apps_management.html#using-custom-app-directories --- nixos/modules/services/web-apps/nextcloud.nix | 76 +++++++++++++------ 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 501df47942e5..0508b51b7925 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -23,6 +23,43 @@ let catch_workers_output = "yes"; }; + appStores = { + # default apps bundled with pkgs.nextcloudXX, e.g. files, contacts + apps = { + enabled = true; + writable = false; + }; + # apps installed via cfg.extraApps + nix-apps = { + enabled = cfg.extraApps != { }; + linkTarget = pkgs.linkFarm "nix-apps" + (mapAttrsToList (name: path: { inherit name path; }) cfg.extraApps); + writable = false; + }; + # apps installed via the app store. + store-apps = { + enabled = cfg.appstoreEnable == null || cfg.appstoreEnable; + linkTarget = "${cfg.home}/store-apps"; + writable = true; + }; + }; + + webroot = pkgs.runCommand + "${cfg.package.name or "nextcloud"}-with-apps" + { } + '' + mkdir $out + ln -sfv "${cfg.package}"/* "$out" + ${concatStrings + (mapAttrsToList (name: store: optionalString (store.enabled && store?linkTarget) '' + if [ -e "$out"/${name} ]; then + echo "Didn't expect ${name} already in $out!" + exit 1 + fi + ln -sfTv ${store.linkTarget} "$out"/${name} + '') appStores)} + ''; + inherit (cfg) datadir; phpPackage = cfg.phpPackage.buildEnv { @@ -45,7 +82,7 @@ let occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.runtimeShell} - cd ${cfg.package} + cd ${webroot} sudo=exec if [[ "$USER" != nextcloud ]]; then sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' @@ -766,7 +803,7 @@ in { # When upgrading the Nextcloud package, Nextcloud can report errors such as # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly" # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround). - phpfpm-nextcloud.restartTriggers = [ cfg.package ]; + phpfpm-nextcloud.restartTriggers = [ webroot ]; nextcloud-setup = let c = cfg.config; @@ -800,6 +837,10 @@ in { nextcloudGreaterOrEqualThan = req: versionAtLeast cfg.package.version req; + mkAppStoreConfig = name: { enabled, writable, ... }: optionalString enabled '' + [ 'path' => '${webroot}/${name}', 'url' => '/${name}', 'writable' => ${boolToString writable} ], + ''; + overrideConfig = pkgs.writeText "nextcloud-config.php" '' [ - ${optionalString (cfg.extraApps != { }) "[ 'path' => '${cfg.home}/nix-apps', 'url' => '/nix-apps', 'writable' => false ],"} - [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], - [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ], + ${concatStrings (mapAttrsToList mkAppStoreConfig appStores)} ], ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"} 'datadirectory' => '${datadir}/data', @@ -935,17 +974,16 @@ in { exit 1 fi - ln -sf ${cfg.package}/apps ${cfg.home}/ - - # Install extra apps - ln -sfT \ - ${pkgs.linkFarm "nix-apps" - (mapAttrsToList (name: path: { inherit name path; }) cfg.extraApps)} \ - ${cfg.home}/nix-apps + ${concatMapStrings (name: '' + if [ -d "${cfg.home}"/${name} ]; then + echo "Cleaning up ${name}; these are now bundled in the webroot store-path!" + rm -r "${cfg.home}"/${name} + fi + '') [ "nix-apps" "apps" ]} # create nextcloud directories. # if the directories exist already with wrong permissions, we fix that - for dir in ${datadir}/config ${datadir}/data ${cfg.home}/store-apps ${cfg.home}/nix-apps; do + for dir in ${datadir}/config ${datadir}/data ${cfg.home}/store-apps; do if [ ! -e $dir ]; then install -o nextcloud -g nextcloud -d $dir elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then @@ -982,7 +1020,7 @@ in { environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; + serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${webroot}/cron.php"; }; nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { after = [ "nextcloud-setup.service" ]; @@ -1058,7 +1096,7 @@ in { services.nginx.enable = mkDefault true; services.nginx.virtualHosts.${cfg.hostName} = { - root = cfg.package; + root = webroot; locations = { "= /robots.txt" = { priority = 100; @@ -1075,14 +1113,6 @@ in { } ''; }; - "~ ^/store-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; - "~ ^/nix-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; "^~ /.well-known" = { priority = 210; extraConfig = '' From 02ebf149d53e5ac815e3dd4f668a088faa671dd3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Dec 2023 20:35:42 +0100 Subject: [PATCH 167/170] nixos/release-notes: more details about Nextcloud options rename * Explain why it was renamed (to match the format from `config.php`). * Show old and new name and link to the option in the options reference. --- nixos/doc/manual/release-notes/rl-2405.section.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 579d2a1b3a17..e0cb56bfc91f 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -91,7 +91,15 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc. -- The following options of the Nextcloud module were moved into `services.nextcloud.extraOptions`: `logLevel`, `logType`, `log_type`, `defaultPhoneRegion`, `overwriteProtocol`, `skeletonDirectory`, `globalProfiles`, `extraTrustedDomains` and `trustedProxies`. +- The following options of the Nextcloud module were moved into [`services.nextcloud.extraOptions`](#opt-services.nextcloud.extraOptions) and renamed to match the name from Nextcloud's `config.php`: + - `logLevel` -> [`loglevel`](#opt-services.nextcloud.extraOptions.loglevel), + - `logType` -> [`log_type`](#opt-services.nextcloud.extraOptions.log_type), + - `defaultPhoneRegion` -> [`default_phone_region`](#opt-services.nextcloud.extraOptions.default_phone_region), + - `overwriteProtocol` -> [`overwriteprotocol`](#opt-services.nextcloud.extraOptions.overwriteprotocol), + - `skeletonDirectory` -> [`skeletondirectory`](#opt-services.nextcloud.extraOptions.skeletondirectory), + - `globalProfiles` -> [`profile.enabled`](#opt-services.nextcloud.extraOptions._profile.enabled_), + - `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.extraOptions.trusted_domains) and + - `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.extraOptions.trusted_proxies). - The Yama LSM is now enabled by default in the kernel, which prevents ptracing non-child processes. This means you will not be able to attach gdb to an From 4d96a0f96f69eeb26e058417441f93638c2a9e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Dec 2023 16:12:56 +0100 Subject: [PATCH 168/170] envfs: 1.0.2 -> 1.0.3 Diff: https://github.com/Mic92/envfs/compare/1.0.2...1.0.3 --- pkgs/tools/filesystems/envfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix index ab47aeb550de..e91df03f7da1 100644 --- a/pkgs/tools/filesystems/envfs/default.nix +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -1,14 +1,14 @@ { rustPlatform, lib, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "envfs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = version; - hash = "sha256-MfKOfI21sRNEBX+v0Wto1YhzrPu3JI7Q4AU333utGpk="; + hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y="; }; - cargoHash = "sha256-vMXmv8p839EPLCwX6So5ebgr5Z68AqdSaLiWqDoBAt4="; + cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8="; passthru.tests = { envfs = nixosTests.envfs; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ln -s envfs $out/bin/mount.fuse.envfs ''; meta = with lib; { - description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process."; + description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process"; homepage = "https://github.com/Mic92/envfs"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; From 04df6aa7bad237aeeb69f603e1f4ec1a2c28a4da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Dec 2023 10:18:01 +0000 Subject: [PATCH 169/170] organicmaps: 2023.11.17-17 -> 2023.12.20-4 --- pkgs/applications/misc/organicmaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index b70e34e73d3b..3d18c951c671 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.11.17-17"; + version = "2023.12.20-4"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-3oGcupO49+ZXyW+ii4T+wov4qweDnLO+VkXSAIh7qJ4="; + hash = "sha256-9yQMBP5Jta6P/FmYL6Ek3MzU1DKtVEwlwYAkNxC5pn4="; fetchSubmodules = true; }; From 5a500574ebf4747912e733435f39e4a6ffed2ea0 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 29 Dec 2023 20:50:14 +0100 Subject: [PATCH 170/170] luaPackages.toml-edit: 0.1.4 -> 0.1.5 --- .../lua-modules/generated-packages.nix | 16 ++++++++-------- pkgs/development/lua-modules/overrides.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 78edc3683afd..27e3c85695fa 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3290,18 +3290,18 @@ buildLuarocksPackage { toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; - version = "0.1.4-1"; + version = "0.1.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-edit-0.1.4-1.rockspec"; - sha256 = "05bcc1xafcspdf1rcka9bhg7b6z617b4jrcahs1r7grcp78w89vf"; + url = "mirror://luarocks/toml-edit-0.1.5-1.rockspec"; + sha256 = "1xgjh8x44kn24vc29si811zq2a7pr24zqj4w07pys5k6ccnv26qz"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/vhyrro/toml-edit.lua", - "rev": "f6efdab4ca6fab276f172060971781dc42a94f2d", - "date": "2023-10-02T16:54:10+02:00", - "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", - "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", - "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", + "rev": "34f072d8ff054b3124d9d2efc0263028d7425525", + "date": "2023-12-29T15:53:36+01:00", + "path": "/nix/store/z1gn59hz9ypk3icn3gmafaa19nzx7a1v-toml-edit.lua", + "sha256": "0jzzp4sd48haq1kmh2k85gkygfq39i10kvgjyqffcrv3frdihxvx", + "hash": "sha256-fXcYW3ZjZ+Yc9vLtCUJMA7vn5ytoClhnwAoi0jS5/0s=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 72334f6d0ff0..9ea1e6f19348 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -618,7 +618,7 @@ with prev; cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-pLAisfnSDoAToQO/kdKTdic6vEug7/WFNtgOfj0bRAE="; + hash = "sha256-gvUqkLOa0WvAK4GcTkufr0lC2BOs2FQ2bgFpB0qa47k="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];