fix: make the boehm patch content addressed to avoid rebuilds

.gitignore

@@ -1,2 +0,0 @@
-result
-result-*

LICENSE

@@ -1,19 +0,0 @@
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

flake.lock

@@ -33,29 +33,14 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1711325813,
-        "narHash": "sha256-ygJR5VikyCfK0CUJHboOKJVr6s9HQ1RXcvFEFnv+KIk=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "3b32c4a71f89b874fe0be2dc125eacb9c3473204",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1712180067,
-        "narHash": "sha256-XU32CuKt0wXB8Ws5P3pZFMlYIMVx9om1GycYpITAwZ0=",
+        "lastModified": 1710623569,
+        "narHash": "sha256-AUvlDCtq8ITFVHhy2SOboKSDC829LPciA/AAFD6zIyo=",
         "ref": "refs/heads/main",
-        "rev": "89c31953c58d8089c85ae7ab43a5c59bb0f9f69b",
-        "revCount": 15311,
+        "rev": "11f35afa6f7933d1640e55473a8c7a153bf89b14",
+        "revCount": 15181,
         "type": "git",
         "url": "ssh://git@git.lix.systems/lix-project/lix.git"
       },
@@ -84,7 +69,6 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "flakey-profile": "flakey-profile",
         "lix": "lix",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -6,26 +6,20 @@
   };
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
-  inputs.flakey-profile.url = "github:lf-/flakey-profile";
 
-  outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }:
-    let versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
-    in {
-      inherit inputs;
-      nixosModules.default = import ./module.nix { inherit lix versionSuffix; };
-      overlays.default = import ./overlay.nix { inherit lix versionSuffix; };
-    } // flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ self.overlays.default ];
-        };
-      in
-      {
-        inherit pkgs;
-        packages.default = pkgs.nixVersions.nix_2_18;
-        packages.nix-doc = pkgs.nix-doc;
-
-        packages.system-profile = import ./system-profile.nix { inherit pkgs flakey-profile; };
-      });
+  outputs = { self, nixpkgs, lix, flake-utils, ... }: {
+    nixosModules.default = import ./module.nix { inherit lix; };
+    overlays.default = import ./overlay.nix { inherit lix; };
+  } // flake-utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ self.overlays.default ];
+      };
+    in
+    {
+      inherit pkgs;
+      packages.default = pkgs.nixVersions.nix_2_18;
+      packages.nix-doc = pkgs.nix-doc;
+    });
 }

module.nix

@@ -1,5 +1,5 @@
-{ lix, versionSuffix ? "" }:
+{ lix }:
 { pkgs, config, ... }:
 {
-  nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
+  nixpkgs.overlays = [ (import ./overlay.nix { inherit lix; }) ];
 }

overlay.nix

@@ -1,4 +1,4 @@
-{ lix, versionSuffix ? "" }:
+{ lix }:
 final: prev:
 let
   boehmgc-patched = ((final.boehmgc.override {
@@ -14,9 +14,6 @@ let
     ];
   })
   );
-
-  # Internal nix-doc used by Lix.
-  lix-doc = final.callPackage (lix + "/lix-doc/package.nix") { };
 in
 {
   nixVersions = prev.nixVersions // rec {
@@ -24,24 +21,13 @@ in
     nix_2_18 = (prev.nixVersions.nix_2_18.override { boehmgc = boehmgc-patched; }).overrideAttrs (old: {
       src = lix;
       # FIXME: fake version so that nixpkgs will not try to use nix config >_>
-      version = "2.18.3-lix${versionSuffix}";
-      VERSION_SUFFIX = "-lix${versionSuffix}";
-
-      # We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
-      dontUseCmakeConfigure = true;
+      version = "2.18.3-lix";
+      VERSION_SUFFIX = "-lix";
 
       patches = [ ];
-      buildInputs = old.buildInputs or [ ] ++ [
-        final.toml11
-        lix-doc
-      ];
-      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
-        final.buildPackages.cmake
-        # FIXME: we don't know why this was not being picked up properly when
-        # included in nativeCheckInputs.
-        final.buildPackages.git
-        final.buildPackages.python3
-      ];
+      # FIXME: we don't know why this was not being picked up properly when
+      # included in nativeCheckInputs.
+      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ];
     });
     stable = nix_2_18;
     nix_2_18_upstream = prev.nixVersions.nix_2_18;
@@ -63,12 +49,4 @@ in
   };
 
   nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; };
-
-  nix-init = prev.nix-init.override {
-    nix = final.nixVersions.nix_2_18_upstream;
-  };
-
-  nurl = prev.nurl.override {
-    nix = final.nixVersions.nix_2_18_upstream;
-  };
 }

system-profile.nix

@@ -1,10 +0,0 @@
-{ pkgs, flakey-profile }:
-flakey-profile.lib.mkProfile {
-  inherit pkgs;
-  paths = with pkgs; [
-    cacert
-    nix
-  ];
-  name = "system-profile";
-  extraSwitchArgs = [ "--profile" "/nix/var/nix/profiles/default" ];
-}