From 26032cda0e92d31b45a97014fa2c00990922f55a Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sun, 26 Oct 2025 07:16:33 +0100 Subject: [PATCH 1/2] lixPackageSets.git: 2.94.0-pre-20251018_6e2edbff930d -> 2.95.0-pre-20251121_b707403a3080 --- pkgs/tools/package-management/lix/common-lix.nix | 4 +++- pkgs/tools/package-management/lix/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index d34a4590823a9..f792ad9b561d6 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -67,6 +67,7 @@ assert lib.assertMsg ( removeReferencesTo, xz, yq, + zstd, nixosTests, rustPlatform, # Only used for versions before 2.92. @@ -185,7 +186,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals pastaFod [ passt ] ++ lib.optionals parseToYAML [ yq ] ++ lib.optionals usesCapnp [ capnproto ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ] + ++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]; buildInputs = [ boost diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 7f4fd1a3ee8d4..81fdfafdc0bc8 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -217,14 +217,14 @@ lib.makeExtensible ( attrName = "git"; lix-args = rec { - version = "2.94.0-pre-20251018_${builtins.substring 0 12 src.rev}"; + version = "2.95.0-pre-20251121_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "6e2edbff930dbf5b17a23e23f0b563e1db201f5b"; - hash = "sha256-t2f3YDiRTi6GTHc940lwozaxY7RFE1CW7EeNtVYG+FE="; + rev = "b707403a308030739dfeacc5b0aaaeef8ba3f633"; + hash = "sha256-kas7FT2J86DVJlPH5dNNHM56OgdQQyfCE/dX/EOKDp8="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 0518f011db04993b1aba84f5861a0a8ca1a8c3d1 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Wed, 19 Nov 2025 18:48:22 +0100 Subject: [PATCH 2/2] lixPackageSets.lix_2_94: init at 2.94.0 --- pkgs/tools/package-management/lix/default.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 81fdfafdc0bc8..3d402d6fd06e8 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -213,6 +213,28 @@ lib.makeExtensible ( }; }; + lix_2_94 = self.makeLixScope { + attrName = "lix_2_94"; + + lix-args = rec { + version = "2.94.0"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = version; + hash = "sha256-X6X3NhgLnpkgWUbLs0nLjusNx/el3L1EkVm6OHqY2z8="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; + }; + }; + }; + git = self.makeLixScope { attrName = "git"; @@ -235,7 +257,7 @@ lib.makeExtensible ( }; }; - latest = self.lix_2_93; + latest = self.lix_2_94; stable = self.lix_2_93;