From 5d4210ba4e9e0a5b100c3b84c7e5c8b6e17f5aa0 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 10 Sep 2025 20:53:41 +0200 Subject: [PATCH] lixPackageSets.lix_2_92: drop After discussing with the nixpkgs developers and Lix developers, we came to the conclusion that we could also drop directly 2.92 as this is not a much used version and 2.93 has no known regression over 2.92 (only advantages). To reduce the maintenance churn on the Lix team, we drop this version for 25.11 and will maintain only for the lifetime of 25.05. Change-Id: I4ee310df31d36b92e394ff2dfebd589d10b12228 Signed-off-by: Raito Bezarius --- pkgs/tools/package-management/lix/default.nix | 76 ++++--------------- 1 file changed, 15 insertions(+), 61 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 22534b5336e9..2cfab091c302 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -128,70 +128,24 @@ let }; }; in -lib.makeExtensible (self: { - inherit makeLixScope; +lib.makeExtensible ( + self: + { + inherit makeLixScope; - lix_2_92 = self.makeLixScope { - attrName = "lix_2_92"; + lix_2_93 = self.makeLixScope { + attrName = "lix_2_93"; - lix-args = rec { - version = "2.92.3"; + lix-args = rec { + version = "2.93.3"; - src = fetchFromGitHub { - owner = "lix-project"; - repo = "lix"; - rev = version; - hash = "sha256-iP2iUDxA99RcgQyZROs7bQw8pqxa1vFudRqjAIHg9Iw="; - }; - - patches = [ - # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 - (fetchpatch2 { - name = "lix-lowdown-1.4.0.patch"; - url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch"; - hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY="; - }) - ]; - - cargoDeps = rustPlatform.fetchCargoVendor { - name = "lix-${version}"; - inherit src; - hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8="; - }; - }; - - nix-eval-jobs-args = rec { - version = "2.92.0"; - src = fetchgit { - url = "https://git.lix.systems/lix-project/nix-eval-jobs.git"; - rev = version; - hash = "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48="; - }; - }; - }; - - lix_2_93 = self.makeLixScope { - attrName = "lix_2_93"; - - lix-args = rec { - version = "2.93.3"; - - src = fetchFromGitea { - domain = "git.lix.systems"; - owner = "lix-project"; - repo = "lix"; - rev = version; - hash = "sha256-Oqw04eboDM8rrUgAXiT7w5F2uGrQdt8sGX+Mk6mVXZQ="; - }; - - patches = [ - # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 - (fetchpatch2 { - name = "lix-lowdown-1.4.0.patch"; - url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch"; - hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY="; - }) - ]; + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = version; + hash = "sha256-Oqw04eboDM8rrUgAXiT7w5F2uGrQdt8sGX+Mk6mVXZQ="; + }; cargoDeps = rustPlatform.fetchCargoVendor { name = "lix-${version}";