Merge pull request 'overlay: fix bug where prev should have been final' (#38 ) from fabianhjr/nixos-module:fix-bug-between-prev-final into main

Reviewed-on: lix-project/nixos-module#38
overlay: fix bug where prev should have been final
2024-10-01 03:21:01 +00:00 · 2024-09-30 18:51:33 -06:00 · 2024-09-30 13:49:18 -07:00 · 2024-09-30 13:35:21 -07:00 · 2024-09-30 13:34:26 -07:00 · 2024-09-26 17:54:28 -06:00
4 changed files with 12 additions and 11 deletions
--- a/flake.lock
+++ b/flake.lock
@ -36,24 +36,24 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "lastModified": 1727712632,
+        "narHash": "sha256-7kaZRZCWG8PmxwIDTVKjJo3VtAGDun7mqfAMlucQbdQ=",
+        "rev": "a16ceb9411c57993d811c6bebb517742fe3d34e3",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a16ceb9411c57993d811c6bebb517742fe3d34e3.tar.gz?rev=a16ceb9411c57993d811c6bebb517742fe3d34e3"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1729070438,
-        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+        "lastModified": 1727634051,
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
        "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/2.91.1.tar.gz";
+    url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
    flake = false;
  };
  inputs.flake-utils.url = "github:numtide/flake-utils";
--- a/overlay.nix
+++ b/overlay.nix
@ -3,6 +3,7 @@ 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
@ -106,7 +107,7 @@ let
    }).overrideAttrs (old:
      let src = final.lix-sources.nix-eval-jobs;
      in {
-        version = "2.91.0-lix-${builtins.substring 0 7 src.rev}";
+        version = "2.92.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.91.0"
+    "version": "2.92.0-dev"
 }
Author	SHA1	Message	Date
jade	fd186f535a	Merge pull request 'overlay: fix bug where prev should have been final' (#38 ) from fabianhjr/nixos-module:fix-bug-between-prev-final into main Reviewed-on: lix-project/nixos-module#38	2024-10-01 03:21:01 +00:00
Fabián Heredia Montiel	81d9ff97c9	overlay: fix bug where prev should have been final	2024-09-30 18:51:33 -06:00
jade	7dd3d652a3	Fix up the flake checks	2024-09-30 13:49:18 -07:00
jade	ca0cc16273	Merge pull request #37 into main Closes lix-project/nixos-module#37	2024-09-30 13:35:21 -07:00
jade	bb51b2d161	jade revision pass	2024-09-30 13:34:26 -07:00
Fabián Heredia Montiel	b3457b78ac	overlay: make finalNix depend on the nix version being used by a package This should address both of the following (were 35 is more general and 36 a specific case) - lix-project/nixos-module#35 - lix-project/nixos-module#36	2024-09-26 17:54:28 -06:00
jade	b0e6f35950	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.	2024-09-17 20:47:29 -07:00
jade	daeb420858	Merge pull request 'fix: check package arguments before applying Nix 2.18 override' (#34 ) from devusb/nixos-module:remove-devenv-overlay into main Reviewed-on: lix-project/nixos-module#34	2024-09-18 03:39:56 +00:00
Morgan Helton	0dda988746	fix: check package arguments before applying nix 2.18 override	2024-09-15 14:40:36 -05:00
eldritch horrors	353b25f0b6	always use clang to build lix	2024-09-09 01:05:28 +02:00
jade	cecf70b775	Merge branch 'release-2.91' to mainline This is a fake commit to trick Git into thinking the 2.91.0 tag is in mainline.	2024-08-12 18:11:23 -07:00
jade	542fb09131	Update version to 2.92	2024-08-12 18:11:20 -07:00