overlay: fix bug where prev should have been final

(cherry picked from commit 81d9ff97c9)
Update to Lix 2.91.1
2024-10-19 10:54:02 -07:00 · 2024-10-18 18:55:39 -07:00 · 2024-10-18 18:55:39 -07:00 · 2024-10-18 18:55:39 -07:00 · 2024-10-18 18:55:39 -07:00 · 2024-10-18 18:55:39 -07:00
4 changed files with 11 additions and 12 deletions
--- a/flake.lock
+++ b/flake.lock
@ -36,24 +36,24 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1727712632,
-        "narHash": "sha256-7kaZRZCWG8PmxwIDTVKjJo3VtAGDun7mqfAMlucQbdQ=",
-        "rev": "a16ceb9411c57993d811c6bebb517742fe3d34e3",
+        "lastModified": 1729298361,
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a16ceb9411c57993d811c6bebb517742fe3d34e3.tar.gz?rev=a16ceb9411c57993d811c6bebb517742fe3d34e3"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1727634051,
-        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "lastModified": 1729070438,
+        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,7 +1,7 @@
 {
  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
  inputs.lix = {
-    url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+    url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
    flake = false;
  };
  inputs.flake-utils.url = "github:numtide/flake-utils";
--- a/overlay.nix
+++ b/overlay.nix
@ -3,7 +3,6 @@ final: prev:
 let
  lixPackageFromSource = final.callPackage (lix + "/package.nix") ({
    inherit versionSuffix;
-    stdenv = final.clangStdenv;
  });

  # These packages should receive CppNix since they may link to it or otherwise
@ -107,7 +106,7 @@ let
    }).overrideAttrs (old:
      let src = final.lix-sources.nix-eval-jobs;
      in {
-        version = "2.92.0-lix-${builtins.substring 0 7 src.rev}";
+        version = "2.91.0-lix-${builtins.substring 0 7 src.rev}";

        # FIXME: should this be patches instead?
        inherit src;
--- a/version.json
+++ b/version.json
@ -1,3 +1,3 @@
 {
-    "version": "2.92.0-dev"
+    "version": "2.91.0"
 }
Author	SHA1	Message	Date
Fabián Heredia Montiel	2bbdcd73b9	overlay: fix bug where prev should have been final (cherry picked from commit `81d9ff97c9`)	2024-10-19 10:54:02 -07:00
jade	efbb3769cb	Update to Lix 2.91.1 • Updated input 'lix': '`bcaeb6388b`.tar.gz?narHash=sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s%3D&rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2' (2024-08-12) → '`ad9d06f783`.tar.gz?narHash=sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U%3D&rev=ad9d06f7838a25beec425ff406fe68721fef73be' (2024-10-19)	2024-10-18 18:55:39 -07:00
jade	2b8c2f73ec	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09) → 'github:nixos/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827' (2024-10-16)	2024-10-18 18:55:39 -07:00
jade	593d825a99	Fix up the flake checks (cherry picked from commit `7dd3d652a3`)	2024-10-18 18:55:39 -07:00
jade	31f4f25f6a	Merge pull request #37 into main Closes lix-project/nixos-module#37 (cherry picked from commit `ca0cc16273`)	2024-10-18 18:55:39 -07:00
jade	30e488a7d5	overlay: clean up 2.18 stuff Since Nix 2.24 is now the default in nixpkgs, we should remove the stuff that assumes it's 2.18. Nothing breaks with this change, unless someone is specifically depending on nixVersions.nix_2_18 being Lix. (cherry-picked from commit `b0e6f35950`)	2024-10-18 18:55:39 -07:00