forked from lix-project/nixos-module
Compare commits
10 commits
Author | SHA1 | Date | |
---|---|---|---|
jade | 5d2b325d3a | ||
jade | 1062d3c1ff | ||
jade | f8b5d0bc9c | ||
Qyriad | adbbecb518 | ||
Emily Trau | ebdf6e66ae | ||
jade | 30a7b8f7c8 | ||
jade | 41990c5d80 | ||
jade | f173ccc0aa | ||
jade | 4d09a927b0 | ||
jade | 7278990b5a |
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
result
|
||||
result-*
|
24
flake.lock
24
flake.lock
|
@ -33,14 +33,29 @@
|
|||
"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": 1709967830,
|
||||
"narHash": "sha256-4AwZcUa6crNSSbsIVr7dMlk851ElnAN5BDi4NH6UEKc=",
|
||||
"lastModified": 1711380636,
|
||||
"narHash": "sha256-ZyCTgvZxr6YRt/Lq+XEfqWsbMG6hiGozMwmlRveamA0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "896e525681bbf696c330af4e51c5e161d3818350",
|
||||
"revCount": 15092,
|
||||
"rev": "0be766c12de6badbbfa4fb9f76b6688b04d81059",
|
||||
"revCount": 15222,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.lix.systems/lix-project/lix.git"
|
||||
},
|
||||
|
@ -69,6 +84,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
|
|
36
flake.nix
36
flake.nix
|
@ -6,20 +6,26 @@
|
|||
};
|
||||
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 = { 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;
|
||||
});
|
||||
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; };
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lix }:
|
||||
{ lix, versionSuffix ? "" }:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix; }) ];
|
||||
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lix }:
|
||||
{ lix, versionSuffix ? "" }:
|
||||
final: prev:
|
||||
let
|
||||
boehmgc-patched = ((final.boehmgc.override {
|
||||
|
@ -10,7 +10,7 @@ let
|
|||
(prev.path + "/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch")
|
||||
|
||||
# https://github.com/ivmai/bdwgc/pull/586
|
||||
(lix + "/boehmgc-traceable_allocator-public.diff")
|
||||
(builtins.path { path = lix + "/boehmgc-traceable_allocator-public.diff"; name = "boehmgc-traceable_allocator-public.patch"; })
|
||||
];
|
||||
})
|
||||
);
|
||||
|
@ -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";
|
||||
VERSION_SUFFIX = "-lix";
|
||||
version = "2.18.3-lix${versionSuffix}";
|
||||
VERSION_SUFFIX = "-lix${versionSuffix}";
|
||||
|
||||
patches = [ ];
|
||||
# FIXME: we don't know why this was not being picked up properly when
|
||||
|
|
10
system-profile.nix
Normal file
10
system-profile.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{ pkgs, flakey-profile }:
|
||||
flakey-profile.lib.mkProfile {
|
||||
inherit pkgs;
|
||||
paths = with pkgs; [
|
||||
cacert
|
||||
nix
|
||||
];
|
||||
name = "system-profile";
|
||||
extraSwitchArgs = [ "--profile" "/nix/var/nix/profiles/default" ];
|
||||
}
|
Loading…
Reference in a new issue