diff options
author | makefu <github@syntax-fehler.de> | 2018-02-26 16:57:03 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-02-26 16:57:16 +0100 |
commit | d52ba7c1ce49dbfc327ac98b8ecce70fa76cf797 (patch) | |
tree | a67ba9f41e7f012be72649656f57700ab446ae6f | |
parent | 32f95ea8351b747760d5004fb6a5f994da51912a (diff) |
new pkgs
-rw-r--r-- | default.nix | 5 | ||||
-rw-r--r-- | pkgs.nix | 7 | ||||
-rw-r--r-- | release.nix | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/default.nix b/default.nix index 74966bb..4fc7f15 100644 --- a/default.nix +++ b/default.nix @@ -45,8 +45,8 @@ "enabled": 1, "hidden": false, "description": "pkgs build", - "nixexprinput": "stockholm", - "nixexprpath": "makefu/5pkgs/default.nix", + "nixexprinput": "src", + "nixexprpath": "pkgs.nix", "checkinterval": 15, "schedulingshares": 100, "enableemail": false, @@ -55,6 +55,7 @@ "inputs": { "src": { "type": "git", "value": "http://cgit.euer.krebsco.de/hydra-stockholm", "emailresponsible": false }, "stockholm": { "type": "git", "value": "http://cgit.krebsco.de/stockholm", "emailresponsible": false }, + "owner": { "type": "string", "value": "makefu", "emailresponsible": false } "nixpkgs": { "type": "git", "value": "https://github.com/makefu/nixpkgs 51810e0", "emailresponsible": false } } } diff --git a/pkgs.nix b/pkgs.nix new file mode 100644 index 0000000..8afffdb --- /dev/null +++ b/pkgs.nix @@ -0,0 +1,7 @@ +{ nixpkgs, owner, ... }: +let pkgs = import nixpkgs { + overlays = [ (import ./krebs/5pkgs) ]; +}; +in + # build all packages in the owners 5pkgs + (import "./${owner}/5pkgs/" {self=pkgs; super=pkgs;} ) diff --git a/release.nix b/release.nix deleted file mode 100644 index 0a12bc0..0000000 --- a/release.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ nixpkgs }: let pkgs = import nixpkgs {}; in { - inherit (pkgs) hello; -} |