axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: manage flake-compate as input

Browse source
This commit is contained in:
Timothy DeHerrera 2021-02-14 22:08:24 -07:00
parent 1b12c78c0e
commit b42f7b514d
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
compat/default.nix
View file

@ -1,9 +1,12 @@
let let
inherit (lock.nodes.flake-compat.locked) rev narHash;
lock = builtins.fromJSON (builtins.readFile ../flake.lock);
flake = (import flake = (import
( (
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
sha256 = "sha256:0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; sha256 = narHash;
} }
) )
{ {

11
flake.lock
View file

@ -2,7 +2,9 @@
"nodes": { "nodes": {
"ci-agent": { "ci-agent": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": [
"flake-compat"
],
"nixos-20_09": [ "nixos-20_09": [
"nixos" "nixos"
], ],
@ -43,11 +45,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1603796912, "lastModified": 1606424373,
"narHash": "sha256-6ayqpH/4XiEXylNdWI3AghubqS6XuiPg3Y60jY8RTo4=", "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "19576c2aea7f074ff0da818b21a8b0950ff6ec86", "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,6 +174,7 @@
"ci-agent": "ci-agent", "ci-agent": "ci-agent",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flake-compat": "flake-compat",
"home": "home", "home": "home",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

4
flake.nix
View file

@ -13,6 +13,9 @@
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-20_09.follows = "nixos";
ci-agent.inputs.nixos-unstable.follows = "override"; ci-agent.inputs.nixos-unstable.follows = "override";
ci-agent.inputs.flake-compat.follows = "flake-compat";
flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false;
}; };
outputs = outputs =
@ -25,6 +28,7 @@
, nur , nur
, devshell , devshell
, nixos-hardware , nixos-hardware
, ...
}: }:
let let
inherit (flake-utils.lib) eachDefaultSystem flattenTreeSystem; inherit (flake-utils.lib) eachDefaultSystem flattenTreeSystem;