teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

flake: use same nixos versions for inputs

Browse source
This commit is contained in:
Timothy DeHerrera 2021-02-07 14:24:41 -07:00
parent 77952d08c5
commit 850cb21124
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
2 changed files with 12 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
flake.lock
View file

@ -3,8 +3,12 @@
"ci-agent": { "ci-agent": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixos-20_09": "nixos-20_09", "nixos-20_09": [
"nixos-unstable": "nixos-unstable", "nixos"
],
"nixos-unstable": [
"master"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
@ -70,7 +74,9 @@
}, },
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixos"
]
}, },
"locked": { "locked": {
"lastModified": 1611323638, "lastModified": 1611323638,
@ -117,22 +123,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixos-20_09": {
"locked": {
"lastModified": 1610870190,
"narHash": "sha256-G0fY7YVFpMw7lLb9HgpZufpeAVmCCZkzZ+WDscy4ImY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f5f66148b28b3d9b9b8381532052ad93a35d5d67",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1612644173, "lastModified": 1612644173,
@ -148,35 +138,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-unstable": {
"locked": {
"lastModified": 1610842533,
"narHash": "sha256-6hW8CML8RnNrRJMv7E56rXAhsCNgUM97HIVSqWxnO64=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "68398d2dd50efc2d878bf0f83bbc8bc323b6b0e0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1612241354,
"narHash": "sha256-OepU8m0D4ZfgsPHt+QL5IGieGRCoA+b6RPqGRHkt9dg=",
"path": "/nix/store/ni76x56hwqch7c6lybf1vfh1cm4lqmp7-source",
"rev": "8cef6531ff83c940d8be117011a667269e829338",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1612702080, "lastModified": 1612702080,

3
flake.nix
View file

@ -8,10 +8,13 @@
master.url = "nixpkgs/master"; master.url = "nixpkgs/master";
nixos.url = "nixpkgs/release-20.09"; nixos.url = "nixpkgs/release-20.09";
home.url = "github:nix-community/home-manager/release-20.09"; home.url = "github:nix-community/home-manager/release-20.09";
home.inputs.nixpkgs.follows = "nixos";
flake-utils.url = "github:numtide/flake-utils/flatten-tree-system"; flake-utils.url = "github:numtide/flake-utils/flatten-tree-system";
devshell.url = "github:numtide/devshell"; devshell.url = "github:numtide/devshell";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
ci-agent.url = "github:hercules-ci/hercules-ci-agent"; ci-agent.url = "github:hercules-ci/hercules-ci-agent";
ci-agent.inputs.nixos-20_09.follows = "nixos";
ci-agent.inputs.nixos-unstable.follows = "master";
}; };
outputs = outputs =