lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Update flake.nix

Browse source
This commit is contained in:
Eelco Dolstra 2019-08-30 17:23:05 +02:00
parent 2de52d8538
commit ada640d340
2 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
flake.lock
View file

@ -1,28 +1,21 @@
{ {
"inputs": { "inputs": {
"nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557": { "nix": {
"id": "nix",
"inputs": { "inputs": {
"nixpkgs": { "nixpkgs": {
"id": "nixpkgs",
"inputs": {}, "inputs": {},
"narHash": "sha256-5/HXWs25BLukwG9VaxmdmUf/9o79e32aW/tmhcWEbKk=", "narHash": "sha256-TrLhI3xPkTTznE9gcMHhkHirGNN7N02zM4DxJ/U3WRs=",
"nonFlakeInputs": {}, "uri": "github:edolstra/nixpkgs/24bf27fc215e8300877dfa1c426b9966bbfbd150"
"uri": "github:edolstra/nixpkgs/62ac6f7f504c8d3998558d9b269d22d26f13f1f0"
} }
}, },
"narHash": "sha256-I9YtUO9Ia5CwiTFo4QzSYdZHO2G+BQ7sM4MSq29NDqc=", "narHash": "sha256-oj3c5cpfoiwoKEaevSfOLGdcyS3LynAZkM9tuUNWcdE=",
"nonFlakeInputs": {}, "uri": "github:NixOS/nix/80c36d4562af71a90c67b3adb886a1003834890e"
"uri": "github:NixOS/nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557"
}, },
"nixpkgs": { "nixpkgs": {
"id": "nixpkgs",
"inputs": {}, "inputs": {},
"narHash": "sha256-5/HXWs25BLukwG9VaxmdmUf/9o79e32aW/tmhcWEbKk=", "narHash": "sha256-TrLhI3xPkTTznE9gcMHhkHirGNN7N02zM4DxJ/U3WRs=",
"nonFlakeInputs": {}, "uri": "github:edolstra/nixpkgs/24bf27fc215e8300877dfa1c426b9966bbfbd150"
"uri": "github:edolstra/nixpkgs/62ac6f7f504c8d3998558d9b269d22d26f13f1f0"
} }
}, },
"nonFlakeInputs": {},
"version": 2 "version": 2
} }

23
flake.nix
View file

@ -1,25 +1,20 @@
{ {
name = "hydra";
description = "A Nix-based continuous build system"; description = "A Nix-based continuous build system";
epoch = 201906; epoch = 201909;
inputs = inputs.nix.uri = "nix/80c36d4562af71a90c67b3adb886a1003834890e";
[ "nixpkgs"
"nix/ab16b3d076e9cd3ecfdcde128f43dd486b072557"
];
outputs = inputs: outputs = { self, nixpkgs, nix }@inputs:
let let
nix = inputs.nix.outputs.hydraJobs.build.x86_64-linux // { nix = inputs.nix.hydraJobs.build.x86_64-linux // {
perl-bindings = inputs.nix.outputs.hydraJobs.perlBindings.x86_64-linux; perl-bindings = inputs.nix.hydraJobs.perlBindings.x86_64-linux;
}; };
in rec { in rec {
hydraJobs = import ./release.nix { hydraJobs = import ./release.nix {
hydraSrc = inputs.self; hydraSrc = self;
nixpkgs = inputs.nixpkgs; nixpkgs = nixpkgs;
inherit nix; inherit nix;
}; };
@ -31,8 +26,8 @@
defaultPackage = packages.hydra; defaultPackage = packages.hydra;
devShell = (import ./release.nix { devShell = (import ./release.nix {
hydraSrc = inputs.self; hydraSrc = self;
nixpkgs = inputs.nixpkgs; nixpkgs = nixpkgs;
shell = true; shell = true;
inherit nix; inherit nix;
}).build.x86_64-linux; }).build.x86_64-linux;