diff --git a/pkgs/tools/package-management/lix/2.94.nix b/pkgs/tools/package-management/lix/2.94.nix new file mode 100644 index 000000000000..978712923cca --- /dev/null +++ b/pkgs/tools/package-management/lix/2.94.nix @@ -0,0 +1,21 @@ +{ + fetchFromGitea, + rustPlatform, +}: +rec { + version = "2.94.2"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = version; + hash = "sha256-Nmqsl/YCnBW5U3TUfFWHGVUbyS2/Ll655BAE3qZilC4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; + }; +} diff --git a/pkgs/tools/package-management/lix/2.95.nix b/pkgs/tools/package-management/lix/2.95.nix new file mode 100644 index 000000000000..ee81bcbb5081 --- /dev/null +++ b/pkgs/tools/package-management/lix/2.95.nix @@ -0,0 +1,30 @@ +{ + fetchFromGitea, + nix-update-script, + rustPlatform, +}: +rec { + version = "2.95.3"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = version; + hash = "sha256-rEhhsqccghnnJHjsqCCBzdD7PyF/ibDe8zadnajBmjI="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; + }; + + updateScript = nix-update-script { + attrPath = "lixPackageSets.lix_2_95.lix"; + extraArgs = [ + "--override-filename=pkgs/tools/package-management/lix/2.95.nix" + "--version-regex=^(2[.]95[.][0-9]+)$" + ]; + }; +} diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index a785d8cf2abc..95249b3a591a 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -10,6 +10,7 @@ docCargoDeps ? null, patches ? [ ], knownVulnerabilities ? [ ], + updateScript ? null, }@args: assert lib.assertMsg ( @@ -492,6 +493,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit aws-sdk-cpp boehmgc; + inherit updateScript; tests = { misc = nixosTests.nix-misc.default.passthru.override { nixPackage = finalAttrs.finalPackage; }; installer = nixosTests.installer.simple.override { selectNixPackage = _: finalAttrs.finalPackage; }; @@ -513,6 +515,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://lix.systems"; license = lib.licenses.lgpl21Plus; teams = [ lib.teams.lix ]; + maintainers = [ lib.maintainers.tyceherrman ]; platforms = lib.platforms.unix; outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; mainProgram = "nix"; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 6e3ea64c0b22..a4a491affd51 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -28,6 +28,7 @@ nixos-rebuild-ng, colmena, nix-update, + nix-update-script, nix-init, nurl, @@ -189,23 +190,7 @@ lib.makeExtensible ( lix_2_94 = self.makeLixScope { attrName = "lix_2_94"; - lix-args = rec { - version = "2.94.2"; - - src = fetchFromGitea { - domain = "git.lix.systems"; - owner = "lix-project"; - repo = "lix"; - rev = version; - hash = "sha256-Nmqsl/YCnBW5U3TUfFWHGVUbyS2/Ll655BAE3qZilC4="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - name = "lix-${version}"; - inherit src; - hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; - }; - + lix-args = (import ./2.94.nix { inherit fetchFromGitea rustPlatform; }) // { patches = [ lixMdbookPatch ]; @@ -215,23 +200,7 @@ lib.makeExtensible ( lix_2_95 = self.makeLixScope { attrName = "lix_2_95"; - lix-args = rec { - version = "2.95.2"; - - src = fetchFromGitea { - domain = "git.lix.systems"; - owner = "lix-project"; - repo = "lix"; - rev = version; - hash = "sha256-nFxJMIdcGTI9NiHAa5HZ2BmcGFLwC2pTq+V4Gjc499I="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - name = "lix-${version}"; - inherit src; - hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; - }; - + lix-args = (import ./2.95.nix { inherit fetchFromGitea rustPlatform nix-update-script; }) // { patches = [ lixFunctional2TimeoutPatch ]; @@ -241,23 +210,7 @@ lib.makeExtensible ( git = self.makeLixScope { attrName = "git"; - lix-args = rec { - version = "2.96.0-pre-20260408_${builtins.substring 0 12 src.rev}"; - - src = fetchFromGitea { - domain = "git.lix.systems"; - owner = "lix-project"; - repo = "lix"; - rev = "bc9fb560ac2d36cd317a856ee96785ea2055fbff"; - hash = "sha256-bONRPjhk5OZdnkQZexZNJzlvwIPg31Gy7fNiwGoX3BQ="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - name = "lix-${version}"; - inherit src; - hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; - }; - }; + lix-args = import ./git.nix { inherit fetchFromGitea rustPlatform; }; }; latest = self.lix_2_95; diff --git a/pkgs/tools/package-management/lix/git.nix b/pkgs/tools/package-management/lix/git.nix new file mode 100644 index 000000000000..541a2bbac196 --- /dev/null +++ b/pkgs/tools/package-management/lix/git.nix @@ -0,0 +1,21 @@ +{ + fetchFromGitea, + rustPlatform, +}: +rec { + version = "2.96.0-pre-20260408_${builtins.substring 0 12 src.rev}"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = "bc9fb560ac2d36cd317a856ee96785ea2055fbff"; + hash = "sha256-bONRPjhk5OZdnkQZexZNJzlvwIPg31Gy7fNiwGoX3BQ="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; + }; +}