Browse Source

Fix hydra.

Thomas Kerber 6 months ago
parent
commit
ee7b771c73
Signed by: Thomas Kerber <t.kerber@ed.ac.uk> GPG Key ID: 8489B911F9ED617B
2 changed files with 7 additions and 6 deletions
  1. 2
    3
      default.nix
  2. 5
    3
      hydra.nix

+ 2
- 3
default.nix View File

@@ -1,6 +1,5 @@
1
-{ nixpkgs ? import <nixpkgs> }:
2
-
3
-with nixpkgs { };
1
+{ pkgs ? import <nixpkgs> { }}:
2
+with pkgs;
4 3
 
5 4
 ((callPackage ./Cargo.nix { }).goblin { }).override {
6 5
   crateOverrides = defaultCrateOverrides // {

+ 5
- 3
hydra.nix View File

@@ -1,5 +1,7 @@
1
-{ nixpkgs ? import <nixpkgs> }:
1
+{ nixpkgs ? <nixpkgs> }:
2 2
 
3
-{
4
-  goblin = import ./. { inherit nixpkgs; };
3
+let
4
+  pkgs = import nixpkgs { };
5
+in {
6
+  goblin = import ./default.nix { inherit pkgs; };
5 7
 }

Loading…
Cancel
Save