From 11e9fc6418f91682583c505feff0ab13f3dcd442 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 18 Oct 2024 18:56:59 -0700 Subject: [PATCH] lixVersions.lix_2_91: 2.91.0 -> 2.91.1 This release comprises really only a couple of commits: Fix build bugs found immediately following release: - cross fix: https://gerrit.lix.systems/c/lix/+/1781 - musl fix: https://gerrit.lix.systems/c/lix/+/1823 Check TLS certificates in builtins:fetchurl: https://gerrit.lix.systems/c/lix/+/1966 Yes, the latter is a bit delayed, sorry. --- pkgs/tools/package-management/lix/default.nix | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 6cead94f56179..4a100c337ffbe 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -63,26 +63,9 @@ lib.makeExtensible (self: { lix_2_91 = ( common { - version = "2.91.0"; - hash = "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s="; - docCargoHash = "sha256-KOn1fXF7k7c/0e5ZCNZwt3YZmjL1oi5A2mhwxQWKaUo="; - - patches = [ - # Fix meson to not use target_machine, fixing cross. This commit is in release-2.91: remove when updating to 2.91.1 (if any). - # https://gerrit.lix.systems/c/lix/+/1781 - # https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401 - (fetchpatch { - url = "https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401.patch"; - hash = "sha256-TZauU4RIsn07xv9vZ33amrDvCLMbrtcHs1ozOTLgu98="; - }) - # Fix musl builds. This commit is in release-2.91: remove when updating to 2.91.1 (if any). - # https://gerrit.lix.systems/c/lix/+/1823 - # https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8 - (fetchpatch { - url = "https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8.patch"; - hash = "sha256-X59N+tOQ2GN17p9sXvo9OiuEexzB23ieuOvtq2sre5c="; - }) - ]; + version = "2.91.1"; + hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U="; + docCargoHash = "sha256-F6Ld0HfRvW9r5zn8eMTP6djnV/jvwjYQet4Ghp2T90k="; } );