SelfPrivacy/selfprivacy-nixos-config
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git synced 2024-11-22 19:41:30 +00:00
Code Issues Projects Releases Wiki Activity

do not import selfprivacy overlay path, but use flake overlay output

Browse source
This commit is contained in:
Alexander Tomokhov 2023-09-18 17:22:08 +04:00
parent 50c554e6e7
commit e4473ec733
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.lock
View file

@ -32,11 +32,11 @@
"inputs": { "inputs": {
"hardware-configuration-nix": "hardware-configuration-nix", "hardware-configuration-nix": "hardware-configuration-nix",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"selfprivacy-overlay-path": "selfprivacy-overlay-path", "selfprivacy-overlay": "selfprivacy-overlay",
"userdata-json": "userdata-json" "userdata-json": "userdata-json"
} }
}, },
"selfprivacy-overlay-path": { "selfprivacy-overlay": {
"locked": { "locked": {
"lastModified": 1689554432, "lastModified": 1689554432,
"narHash": "sha256-hegMIgxBHUuRFbCecQpbjFfTHpduV3VZWr8OINtQO6k=", "narHash": "sha256-hegMIgxBHUuRFbCecQpbjFfTHpduV3VZWr8OINtQO6k=",

7
flake.nix
View file

@ -4,7 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs";
selfprivacy-overlay-path.url = selfprivacy-overlay.url =
"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git"; "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git";
# these inputs are expected to be set by the caller # these inputs are expected to be set by the caller
@ -16,13 +16,12 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, selfprivacy-overlay-path , selfprivacy-overlay
, userdata-json , userdata-json
, hardware-configuration-nix , hardware-configuration-nix
}: }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
selfprivacy-overlay = import selfprivacy-overlay-path;
userdata = builtins.fromJSON (builtins.readFile userdata-json); userdata = builtins.fromJSON (builtins.readFile userdata-json);
hardware-configuration = import hardware-configuration-nix; hardware-configuration = import hardware-configuration-nix;
in in
@ -31,7 +30,7 @@
just-nixos = nixpkgs.lib.nixosSystem { just-nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system userdata; }; specialArgs = { inherit system userdata; };
modules = [ modules = [
{ nixpkgs.overlays = [ selfprivacy-overlay ]; } { nixpkgs.overlays = [ selfprivacy-overlay.overlay ]; }
hardware-configuration hardware-configuration
./configuration.nix ./configuration.nix
]; ];