aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-07 14:21:31 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-07 14:21:31 +0100
commitba2e44af40746f339e1ed652ea233c739790556b (patch)
tree29f48ef02325f7c6f0f5c68d1c27d8cea79ce26c
parent7065a8cc1b8b01cd32d4b1d5317b323fec5238bd (diff)
downloadthermoprint-ba2e44af40746f339e1ed652ea233c739790556b.tar
thermoprint-ba2e44af40746f339e1ed652ea233c739790556b.tar.gz
thermoprint-ba2e44af40746f339e1ed652ea233c739790556b.tar.bz2
thermoprint-ba2e44af40746f339e1ed652ea233c739790556b.tar.xz
thermoprint-ba2e44af40746f339e1ed652ea233c739790556b.zip
Supply extraPackages to server wrapper
-rw-r--r--default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/default.nix b/default.nix
index f883c52..6f6f442 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,6 @@
1{ pkgs ? (import <nixpkgs> {}) 1{ pkgs ? (import <nixpkgs> {})
2, compilerName ? "ghc801" 2, compilerName ? "ghc801"
3, extraPackages ? (p: [])
3}: 4}:
4 5
5rec { 6rec {
@@ -20,6 +21,7 @@ rec {
20 }; 21 };
21 thermoprint-server = pkgs.callPackage ./server/wrapped.nix { 22 thermoprint-server = pkgs.callPackage ./server/wrapped.nix {
22 inherit (haskellPackages) ghcWithPackages; 23 inherit (haskellPackages) ghcWithPackages;
24 inherit extraPackages;
23 thermoprint-server = haskellPackages.callPackage ./server/thermoprint-server.nix { 25 thermoprint-server = haskellPackages.callPackage ./server/thermoprint-server.nix {
24 inherit thermoprint-spec thermoprint-client; 26 inherit thermoprint-spec thermoprint-client;
25 }; 27 };