forked from c3d2/nix-config
Update flake inputs
This commit is contained in:
parent
91078207fb
commit
59a85a3f3d
65
flake.lock
65
flake.lock
|
@ -1,39 +1,33 @@
|
|||
{
|
||||
"nodes": {
|
||||
"hydra": {
|
||||
"info": {
|
||||
"lastModified": 1587883324,
|
||||
"narHash": "sha256-WQxv9rrG2HX8j2UfXjifeBkMjgea3uIAEB3Swv+IIus="
|
||||
},
|
||||
"inputs": {
|
||||
"nix": "nix",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"owner": "ehmry",
|
||||
"lastModified": 1593509723,
|
||||
"narHash": "sha256-ESv86LNnQQy5cYqeC1S4otpvkA8ABgs/zbge8xp35aE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "hydra",
|
||||
"rev": "e93c36aab1bf96cf392ab0e40157b0620638b599",
|
||||
"rev": "d0deebc4fc95dbeb0249f7b774b03d366596fbed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ehmry",
|
||||
"ref": "sotest",
|
||||
"repo": "hydra",
|
||||
"type": "github"
|
||||
"id": "hydra",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nix": {
|
||||
"info": {
|
||||
"lastModified": 1586440843,
|
||||
"narHash": "sha256-7YxrpRPmAOoCSl6KtepKCXcae5MUm1Pl+lwDunBFGoo="
|
||||
},
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1592818267,
|
||||
"narHash": "sha256-t66Ny6NDA9sQa0U79iqo4w7tEBitUGgio9U/H6z3QpE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef",
|
||||
"rev": "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -42,14 +36,12 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"info": {
|
||||
"lastModified": 1585405475,
|
||||
"narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1591633336,
|
||||
"narHash": "sha256-oVXv4xAnDJB03LvZGbC72vSVlIbbJr8tpjEW5o/Fdek=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be",
|
||||
"rev": "70717a337f7ae4e486ba71a500367cad697e5f09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -59,14 +51,12 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"info": {
|
||||
"lastModified": 1586219474,
|
||||
"narHash": "sha256-fvfrMnEA2lDnXvH/eInGV5i0sO/EGLVHa4pOek8VG78="
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1592263354,
|
||||
"narHash": "sha256-1wHPn5qKfzfG06dZhpXDEg5Zt6HwvfyPPgW1tkYFejg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "29eddfc36d720dcc4822581175217543b387b1e8",
|
||||
"rev": "a84b797b28eb104db758b5cb2b61ba8face6744b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -75,31 +65,16 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"info": {
|
||||
"lastModified": 1586724123,
|
||||
"narHash": "sha256-VQ7zZy2xpz6dULpjar4jxNaQ0N/2q68l+EYO2nXaXDo="
|
||||
},
|
||||
"locked": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs-channels",
|
||||
"rev": "708cb6b307b04ad862cc50de792e57e7a4a8bb5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-20.03",
|
||||
"repo": "nixpkgs-channels",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"hydra": "hydra",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": [
|
||||
"hydra",
|
||||
"nixpkgs"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 5
|
||||
"version": 7
|
||||
}
|
||||
|
|
24
flake.nix
24
flake.nix
|
@ -1,27 +1,21 @@
|
|||
{
|
||||
description = "C3D2 NixOS configurations";
|
||||
|
||||
edition = 201909;
|
||||
|
||||
inputs.nixpkgs.url = "github:nixos/nixpkgs-channels/nixos-20.03";
|
||||
inputs.hydra.url = "github:ehmry/hydra/sotest";
|
||||
inputs = {
|
||||
nixpkgs.follows = "hydra/nixpkgs";
|
||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
# secrets.url = "git+file:///etc/nixos/secrets";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, hydra }: {
|
||||
|
||||
nixosConfigurations = {
|
||||
|
||||
server7 = nixpkgs.lib.nixosSystem {
|
||||
modules = [ ./hosts/server7 hydra.nixosModules.hydra ];
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
|
||||
hydra = nixpkgs.lib.nixosSystem {
|
||||
modules = [ ./hosts/hydra/configuration.nix ];
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
|
||||
pulsebert = nixpkgs.lib.nixosSystem {
|
||||
modules = [ ./hosts/pulsebert/configuration.nix ];
|
||||
modules = [
|
||||
./hosts/server7
|
||||
hydra.nixosModules.hydra
|
||||
];
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue