Skip to content

Commit ac64e86

Browse files
committed
fixup! Add nix-tools
- Use the build expressions from the nix-tools repo.
1 parent a889376 commit ac64e86

File tree

7 files changed

+5
-870
lines changed

7 files changed

+5
-870
lines changed

nix-tools/default.nix

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,13 @@
1-
{ lib, symlinkJoin
2-
, fetchExternal
3-
, mkPkgSet
4-
}:
1+
{ symlinkJoin, fetchExternal, mkPkgSet }:
52

63
let
7-
84
src = fetchExternal {
95
name = "nix-tools-src";
106
specJSON = ./nix-tools-src.json;
117
override = "nix-tools";
128
};
139

14-
plan = import ./plan.nix;
15-
16-
pkgSet = mkPkgSet {
17-
pkg-def = plan;
18-
pkg-def-overlays = [
19-
{ nix-tools = ./nix-tools.nix;
20-
# these are generated with cabal-to-nix
21-
# $ cabal-to-nix https://github.com/galenhuntington/haskell-src-meta.git 109ee29d5fd0f4e23fdd2f80eb122d66341b64a9 > haskell-src-meta.nix
22-
hackage-db = ./hackage-db.nix;
23-
haskell-src-meta = ./haskell-src-meta.nix;
24-
hnix = ./hnix.nix;
25-
}
26-
];
27-
modules = [
28-
{ packages.nix-tools.src = src; }
29-
];
30-
};
31-
32-
hsPkgs = pkgSet.config.hsPkgs;
10+
hsPkgs = import (src + "/pkgs.nix") { inherit mkPkgSet; };
3311
in
3412
symlinkJoin {
3513
name = "nix-tools";

nix-tools/hackage-db.nix

Lines changed: 0 additions & 78 deletions
This file was deleted.

nix-tools/haskell-src-meta.nix

Lines changed: 0 additions & 50 deletions
This file was deleted.

nix-tools/hnix.nix

Lines changed: 0 additions & 197 deletions
This file was deleted.

nix-tools/nix-tools-src.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"url": "https://github.com/input-output-hk/nix-tools",
3-
"owner": "input-output-hk",
4-
"repo": "nix-tools",
5-
"rev": "11186ed3b8109b98b38bcd0e33a9530e59868510",
6-
"date": "2019-01-16T16:14:55+08:00",
7-
"sha256": "1s26nk24iqzbmzixwv7sgm982kbzqgprn5snrhzzxya2zvyhzp4i",
3+
"rev": "fd56254dde13edfe97985d8125d7bccc9758b6af",
4+
"date": "2019-02-11T14:03:56+10:00",
5+
"sha256": "1bw24njd0nh17v0cb3shl31g0n1j1m0ydd9yl3kwmqyrxf3pm2ml",
86
"fetchSubmodules": false
97
}

0 commit comments

Comments
 (0)