From 5a66f75402207e563567635cd39608ad7da5c334 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 14 Mar 2026 16:54:01 -0400 Subject: [PATCH 1/2] lixPackageSets.lix_2_94.lix: 2.94.0 -> 2.94.1 --- pkgs/tools/package-management/lix/common-lix.nix | 7 ++++++- pkgs/tools/package-management/lix/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index ec806a25ceeb..c03cfa952ad4 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -367,7 +367,12 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals (stdenv.hostPlatform.isLinux && finalAttrs.doInstallCheck && lib.versionAtLeast version "2.95") [ - (lib.mesonOption "build-test-env" "${pkgsStatic.busybox}/bin") + (lib.mesonOption "build-test-env" ( + lib.makeBinPath [ + pkgsStatic.busybox + pkgsStatic.acl + ] + )) (lib.mesonOption "build-test-shell" "${pkgsStatic.bash}/bin") ] ++ lib.optionals (lib.versionAtLeast version "2.95") [ diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 2640659d43d0..c064517dcd61 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -238,14 +238,14 @@ lib.makeExtensible ( attrName = "lix_2_94"; lix-args = rec { - version = "2.94.0"; + version = "2.94.1"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-X6X3NhgLnpkgWUbLs0nLjusNx/el3L1EkVm6OHqY2z8="; + hash = "sha256-+VJmizrdZPygtffgS/yfMb4PkZUUK5JmyGGzn0GPsKc="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 35bb7d4770f4784b660c5ff5a66bda6e1175198e Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 19 Mar 2026 09:17:32 -0400 Subject: [PATCH 2/2] lixPackageSets.lix_2_95: init at 2.95.1 --- 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 c064517dcd61..e307fcf7e7be 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -258,6 +258,28 @@ lib.makeExtensible ( }; }; + lix_2_95 = self.makeLixScope { + attrName = "lix_2_95"; + + lix-args = rec { + version = "2.95.1"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = version; + hash = "sha256-eZEynXdDcrjDMjGVfDhFJJrU5ENal7wlx7bn/wkggTg="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; + }; + }; + }; + git = self.makeLixScope { attrName = "git"; @@ -280,7 +302,7 @@ lib.makeExtensible ( }; }; - latest = self.lix_2_94; + latest = self.lix_2_95; stable = self.lix_2_94;