rename stable to nixpkgs

This commit is contained in:
Sean Buckley 2021-06-02 16:46:32 -04:00
parent c583ed5002
commit 6dfd986018
7 changed files with 24 additions and 26 deletions

View file

@ -1,25 +1,24 @@
{
"nodes": {
"root": {
"inputs": {
"stable2105": "stable2105",
"unstable": "unstable"
}
},
"stable2105": {
"nixpkgs": {
"locked": {
"lastModified": 1622449420,
"narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
"lastModified": 1622622179,
"narHash": "sha256-XCw/9QDuj9J6prVR8YrteTcFKj2sRWYIjwgs8qOOrYQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
"rev": "eaba7870ffc3400eca4407baa24184b7fe337ec1",
"type": "github"
},
"original": {
"owner": "NixOS",
"id": "nixpkgs",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
"type": "indirect"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"unstable": "unstable"
}
},
"unstable": {
@ -32,10 +31,9 @@
"type": "github"
},
"original": {
"owner": "NixOS",
"id": "nixpkgs",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "indirect"
}
}
},

View file

@ -1,11 +1,11 @@
{
inputs.unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.stable2105.url = "github:NixOS/nixpkgs/nixos-21.05";
inputs.nixpkgs.url = "nixpkgs/nixos-21.05";
inputs.unstable.url = "nixpkgs/nixos-unstable";
outputs = { self, unstable, stable2105 }: {
outputs = { self, unstable, nixpkgs }: {
nixosModule = { ... }: {
imports = [ ./. ];
};
nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2105; };
nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable nixpkgs; };
};
}

View file

@ -1,4 +1,4 @@
{ modules, unstable, stable2105 }:
{ modules, nixpkgs, unstable }:
let
hostMetadata =
@ -21,7 +21,7 @@ let
in
builtins.mapAttrs
(n: v:
let pkgs = { inherit unstable stable2105; }.${v.pkgs};
let pkgs = { inherit nixpkgs unstable; }.${v.pkgs};
in
pkgs.lib.nixosSystem {
inherit (v) system;

View file

@ -1,5 +1,5 @@
{
pkgs = "stable2105";
pkgs = "nixpkgs";
system = "x86_64-linux";
hardware = "physical";
}

View file

@ -1,5 +1,5 @@
{
pkgs = "stable2105";
pkgs = "nixpkgs";
system = "x86_64-linux";
hardware = "physical";
}

View file

@ -1,5 +1,5 @@
{
pkgs = "stable2105";
pkgs = "nixpkgs";
system = "x86_64-linux";
hardware = "physical";
}

View file

@ -1,5 +1,5 @@
{
pkgs = "stable2105";
pkgs = "nixpkgs";
system = "x86_64-linux";
hardware = "physical";
}