Compare commits

..

2 commits

Author SHA1 Message Date
jade 6390b2de41 fix: make the boehm patch content addressed to avoid rebuilds 2024-03-18 13:16:19 -07:00
jade c6193dbc89 update lix 2024-03-16 16:37:28 -07:00
4 changed files with 9 additions and 42 deletions

View file

@ -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": 1711305922,
"narHash": "sha256-SNeKGjzDQX0W9iC8S3R17MDh+WuErNmE10vQAJv7P68=",
"lastModified": 1710623569,
"narHash": "sha256-AUvlDCtq8ITFVHhy2SOboKSDC829LPciA/AAFD6zIyo=",
"ref": "refs/heads/main",
"rev": "d26eccebfc1f0d3f5b77e781ffc6455f05f8f90c",
"revCount": 15216,
"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"
}

View file

@ -6,15 +6,10 @@
};
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, ... }: {
inherit inputs;
outputs = { self, nixpkgs, lix, flake-utils, ... }: {
nixosModules.default = import ./module.nix { inherit lix; };
overlays.default = import ./overlay.nix {
inherit lix;
versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
};
overlays.default = import ./overlay.nix { inherit lix; };
} // flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
@ -26,7 +21,5 @@
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; };
});
}

View file

@ -1,4 +1,4 @@
{ lix, versionSuffix ? "" }:
{ lix }:
final: prev:
let
boehmgc-patched = ((final.boehmgc.override {
@ -21,8 +21,8 @@ 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}";
version = "2.18.3-lix";
VERSION_SUFFIX = "-lix";
patches = [ ];
# FIXME: we don't know why this was not being picked up properly when

View file

@ -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" ];
}