Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b7be2bf9adc8
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 517acb4ca855
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 3, 2019

  1. Update flake.nix

    @edolstra
    edolstra committed Jun 3, 2019
    Copy the full SHA
    bc11ab2 View commit details

  2. Fix build

    @edolstra
    edolstra committed Jun 3, 2019
    Copy the full SHA
    0042183 View commit details

  3. Add some flake checks

    @edolstra
    edolstra committed Jun 3, 2019
    Copy the full SHA
    517acb4 View commit details
Showing with 22 additions and 18 deletions.
  1. +9 −9 flake.lock
  2. +11 −8 flake.nix
  3. +2 −1 src/hydra-eval-jobs/hydra-eval-jobs.cc
18 changes: 9 additions & 9 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -5,25 +5,28 @@

epoch = 2019;

requires = [ "nixpkgs" "nix" ];
inputs = [ "nixpkgs" "nix" ];

provides = deps: rec {
outputs = inputs: rec {

hydraJobs = import ./release.nix {
hydraSrc = deps.self;
nixpkgs = deps.nixpkgs;
nix = deps.nix.provides.hydraJobs.build.x86_64-linux // {
perl-bindings = deps.nix.provides.hydraJobs.perlBindings.x86_64-linux;
hydraSrc = inputs.self;
nixpkgs = inputs.nixpkgs;
nix = inputs.nix.outputs.hydraJobs.build.x86_64-linux // {
perl-bindings = inputs.nix.outputs.hydraJobs.perlBindings.x86_64-linux;
};
};

checks.build = hydraJobs.build.x86_64-linux;
checks.install = hydraJobs.tests.install.x86_64-linux;

packages.hydra = hydraJobs.build.x86_64-linux;

defaultPackage = packages.hydra;

devShell = (import ./release.nix {
hydraSrc = deps.self;
nixpkgs = deps.nixpkgs;
hydraSrc = inputs.self;
nixpkgs = inputs.nixpkgs;
shell = true;
}).build.x86_64-linux;

3 changes: 2 additions & 1 deletion src/hydra-eval-jobs/hydra-eval-jobs.cc
View file
Original file line number Diff line number Diff line change
@@ -245,9 +245,10 @@ int main(int argc, char * * argv)
Value v;

if (myArgs.flake) {
using namespace flake;
FlakeRef flakeRef(myArgs.releaseExpr);
auto vFlake = state.allocValue();
makeFlakeValue(state, flakeRef, AllPure, *vFlake);
callFlake(state, resolveFlake(state, flakeRef, AllPure), *vFlake);

auto vProvides = (*vFlake->attrs->get(state.symbols.create("provides")))->value;
state.forceValue(*vProvides);