forked from lix-project/nixos-module
Compare commits
1 commit
main
...
chase-fixe
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c2dd091bf0 |
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,2 +0,0 @@
|
||||||
result
|
|
||||||
result-*
|
|
19
LICENSE
19
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.
|
|
24
flake.lock
24
flake.lock
|
@ -33,29 +33,14 @@
|
||||||
"type": "github"
|
"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": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712180067,
|
"lastModified": 1710788611,
|
||||||
"narHash": "sha256-XU32CuKt0wXB8Ws5P3pZFMlYIMVx9om1GycYpITAwZ0=",
|
"narHash": "sha256-nBiCx4mfntmJNv1MxVS3KmDeFzusxWC4ZdwKCT4noQw=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "89c31953c58d8089c85ae7ab43a5c59bb0f9f69b",
|
"rev": "f256e3c5c69c7aa658ff6e8fd9c05063a1e9ace6",
|
||||||
"revCount": 15311,
|
"revCount": 15196,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@git.lix.systems/lix-project/lix.git"
|
"url": "ssh://git@git.lix.systems/lix-project/lix.git"
|
||||||
},
|
},
|
||||||
|
@ -84,7 +69,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"flakey-profile": "flakey-profile",
|
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
|
|
14
flake.nix
14
flake.nix
|
@ -6,14 +6,14 @@
|
||||||
};
|
};
|
||||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
|
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, ... }:
|
outputs = inputs@{ self, nixpkgs, lix, flake-utils, ... }: {
|
||||||
let versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
|
|
||||||
in {
|
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
nixosModules.default = import ./module.nix { inherit lix versionSuffix; };
|
nixosModules.default = import ./module.nix { inherit lix; };
|
||||||
overlays.default = import ./overlay.nix { inherit lix versionSuffix; };
|
overlays.default = import ./overlay.nix {
|
||||||
|
inherit lix;
|
||||||
|
versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
|
||||||
|
};
|
||||||
} // flake-utils.lib.eachDefaultSystem (system:
|
} // flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
@ -25,7 +25,5 @@
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
packages.default = pkgs.nixVersions.nix_2_18;
|
packages.default = pkgs.nixVersions.nix_2_18;
|
||||||
packages.nix-doc = pkgs.nix-doc;
|
packages.nix-doc = pkgs.nix-doc;
|
||||||
|
|
||||||
packages.system-profile = import ./system-profile.nix { inherit pkgs flakey-profile; };
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lix, versionSuffix ? "" }:
|
{ lix }:
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
|
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix; }) ];
|
||||||
}
|
}
|
||||||
|
|
26
overlay.nix
26
overlay.nix
|
@ -14,9 +14,6 @@ let
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
# Internal nix-doc used by Lix.
|
|
||||||
lix-doc = final.callPackage (lix + "/lix-doc/package.nix") { };
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixVersions = prev.nixVersions // rec {
|
nixVersions = prev.nixVersions // rec {
|
||||||
|
@ -27,28 +24,17 @@ in
|
||||||
version = "2.18.3-lix${versionSuffix}";
|
version = "2.18.3-lix${versionSuffix}";
|
||||||
VERSION_SUFFIX = "-lix${versionSuffix}";
|
VERSION_SUFFIX = "-lix${versionSuffix}";
|
||||||
|
|
||||||
# We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
|
|
||||||
dontUseCmakeConfigure = true;
|
|
||||||
|
|
||||||
patches = [ ];
|
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
|
# FIXME: we don't know why this was not being picked up properly when
|
||||||
# included in nativeCheckInputs.
|
# included in nativeCheckInputs.
|
||||||
final.buildPackages.git
|
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ];
|
||||||
final.buildPackages.python3
|
|
||||||
];
|
|
||||||
});
|
});
|
||||||
stable = nix_2_18;
|
stable = nix_2_18;
|
||||||
nix_2_18_upstream = prev.nixVersions.nix_2_18;
|
nix_2_18_upstream = prev.nixVersions.nix_2_18;
|
||||||
};
|
};
|
||||||
|
|
||||||
# force these onto upstream so we are not regularly rebuilding electron
|
# force these onto upstream so we are not regularly rebuilding electron
|
||||||
prefetch-yarn-deps = prev.prefetch-yarn-deps.override {
|
prefetch-yarn-deps = (final.lib.trace "overriding: ${toString (builtins.attrNames prev.prefetch-yarn-deps)}" prev.prefetch-yarn-deps).override {
|
||||||
nix = final.nixVersions.nix_2_18_upstream;
|
nix = final.nixVersions.nix_2_18_upstream;
|
||||||
};
|
};
|
||||||
prefetch-npm-deps = prev.prefetch-npm-deps.override {
|
prefetch-npm-deps = prev.prefetch-npm-deps.override {
|
||||||
|
@ -63,12 +49,4 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; };
|
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;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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" ];
|
|
||||||
}
|
|
Loading…
Reference in a new issue