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: 8d2896b36b49
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0b972bdd015
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 4, 2019

  1. Use the overlay from the nix flake

    @edolstra
    edolstra committed Oct 4, 2019
    Copy the full SHA
    d0b972b View commit details
Showing with 12 additions and 18 deletions.
  1. +5 −5 flake.lock
  2. +7 −13 flake.nix
10 changes: 5 additions & 5 deletions flake.lock
View file

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

20 changes: 7 additions & 13 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -10,14 +10,9 @@

version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModified}.${self.shortRev}";

# FIXME: use nix overlay?
nix' = nix.hydraJobs.build.x86_64-linux // {
perl-bindings = nix.hydraJobs.perlBindings.x86_64-linux;
};

pkgs = import nixpkgs {
system = "x86_64-linux";
overlays = [ self.overlay ];
overlays = [ self.overlay nix.overlay ];
};

# NixOS configuration used for VM tests.
@@ -94,8 +89,8 @@
TextDiff
TextTable
XMLSimple
nix'
nix'.perl-bindings
final.nix
final.nix.perl-bindings
git
boehmgc
];
@@ -111,14 +106,14 @@
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix'
perlDeps perl final.nix
postgresql95 # for running the tests
boost
nlohmann_json
];

hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix' coreutils findutils pixz
[ sqlite subversion openssh final.nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );

@@ -151,7 +146,7 @@
--prefix PATH ':' $out/bin:$hydraPath \
--set HYDRA_RELEASE ${version} \
--set HYDRA_HOME $out/libexec/hydra \
--set NIX_RELEASE ${nix'.name or "unknown"}
--set NIX_RELEASE ${final.nix.name or "unknown"}
done
'';

@@ -282,8 +277,7 @@

nixosModules.hydra = {
imports = [ ./hydra-module.nix ];
nixpkgs.overlays = [ self.overlay ];
nix.package = nix';
nixpkgs.overlays = [ self.overlay nix.overlay ];
};

nixosModules.hydraTest = {