parent
697be1cbd2
commit
f0060d4847
4 changed files with 15 additions and 60 deletions
1
ci.nix
1
ci.nix
|
@ -1 +0,0 @@
|
|||
(import ./flake-compat.nix).defaultNix.ciNix
|
|
@ -1,9 +0,0 @@
|
|||
let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
|
||||
flake-compat = builtins.fetchTarball {
|
||||
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
|
||||
sha256 = narHash;
|
||||
};
|
||||
in
|
||||
import flake-compat { src = ./.; }
|
47
flake.lock
generated
47
flake.lock
generated
|
@ -136,21 +136,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat-ci": {
|
||||
"locked": {
|
||||
"lastModified": 1646664117,
|
||||
"narHash": "sha256-AX2VewPcS9eRsoirVHfnk07MHAOH6CTDiD10XtRaZbk=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-compat-ci",
|
||||
"rev": "e588637b2eec4261ed0d36335c83a117f2744dea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-compat-ci",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -168,22 +153,6 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1648199409,
|
||||
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1641205782,
|
||||
|
@ -284,6 +253,17 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos": {
|
||||
"locked": {
|
||||
"narHash": "sha256-obk4aD7DmB0yyKsw1tL8Pd1WQLFp/arZETIIMKTVx+E=",
|
||||
"path": "/nix/store/r4y8hrjiix7zj2m2jgn2bjiqj2hd4rd4-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixos",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixos-generators": {
|
||||
"inputs": {
|
||||
"nixlib": "nixlib",
|
||||
|
@ -339,7 +319,7 @@
|
|||
"cachix": [
|
||||
"unstable"
|
||||
],
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nixpkgs": [
|
||||
"unstable"
|
||||
]
|
||||
|
@ -429,9 +409,8 @@
|
|||
],
|
||||
"digga": "digga",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat-ci": "flake-compat-ci",
|
||||
"home": "home",
|
||||
"nixos": "nixos",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"nur": "nur",
|
||||
|
|
18
flake.nix
18
flake.nix
|
@ -13,12 +13,6 @@
|
|||
digga.inputs.nixlib.follows = "unstable";
|
||||
digga.inputs.home-manager.follows = "unstable";
|
||||
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
};
|
||||
flake-compat-ci.url = github:hercules-ci/flake-compat-ci;
|
||||
|
||||
home.url = "github:nix-community/home-manager/release-21.11";
|
||||
home.inputs.nixpkgs.follows = "unstable";
|
||||
|
||||
|
@ -45,8 +39,7 @@
|
|||
outputs =
|
||||
{ self
|
||||
, digga
|
||||
, flake-compat-ci
|
||||
, unstable
|
||||
, nixos
|
||||
, home
|
||||
, nixos-hardware
|
||||
, darwin
|
||||
|
@ -88,7 +81,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
lib = import ./lib { lib = digga.lib // unstable.lib; };
|
||||
lib = import ./lib { lib = digga.lib // nixos.lib; };
|
||||
|
||||
sharedOverlays = [
|
||||
(
|
||||
|
@ -184,12 +177,5 @@
|
|||
inherit emacs-overlay; unstablePkgsInput = inputs.unstablePkgs;
|
||||
};
|
||||
};
|
||||
|
||||
ciNix = flake-compat-ci.lib.recurseIntoFlakeWith {
|
||||
flake = self;
|
||||
systems = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue