diff options
| author | Ben Sima <ben@bsima.me> | 2020-04-19 18:10:16 -0700 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2020-04-19 18:10:16 -0700 |
| commit | 5781e0ca2188f39d388aabada7d80a1a315a0752 (patch) | |
| tree | c69cf40e378a00b2182738edee3c8fff5213f43f | |
| parent | 32fd9bd3fe6d9e3b52d85cf701bc9b0998a54412 (diff) | |
Rename some Haskell nix files
| -rw-r--r-- | nix/build.nix | 4 | ||||
| -rw-r--r-- | nix/haskell-deps.nix (renamed from nix/deps.nix) | 0 | ||||
| -rw-r--r-- | nix/haskell-overlay.nix (renamed from nix/haskell-packages.nix) | 0 | ||||
| -rw-r--r-- | nix/nixpkgs.nix | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/nix/build.nix b/nix/build.nix index 6f979d7..dd16df6 100644 --- a/nix/build.nix +++ b/nix/build.nix @@ -17,7 +17,7 @@ let subset = a: b: builtins.all (x: builtins.elem x b) a; - allDeps = import ./deps.nix; + allDeps = import ./haskell-deps.nix; # gather data needed for compiling by analyzing the main module analyze = main: rec { @@ -42,7 +42,7 @@ let if (subset deps allDeps) then depsToPackageSet hp deps else throw '' - missing from deps.nix: + missing from nix/haskell-deps.nix: ${toString (lib.lists.subtractLists allDeps deps)} '')); diff --git a/nix/deps.nix b/nix/haskell-deps.nix index 44c2050..44c2050 100644 --- a/nix/deps.nix +++ b/nix/haskell-deps.nix diff --git a/nix/haskell-packages.nix b/nix/haskell-overlay.nix index b496cd4..b496cd4 100644 --- a/nix/haskell-packages.nix +++ b/nix/haskell-overlay.nix diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 74039e0..864511b 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -5,7 +5,7 @@ let overlays = [ (_: _: { inherit sources; }) (_: _: { niv = import sources.niv {}; }) - (import ./haskell-packages.nix) + (import ./haskell-overlay.nix) (_: pkgs: { wemux = pkgs.callPackage ./wemux.nix {}; }) ]; }; |