summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-08-31 15:47:23 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2017-08-31 15:47:23 +0200
commit89044cdc83202a9439f0faaae0b33965044b0a59 (patch)
tree094f3a199029bafb301d26f3469685ec4b522ab5
parentf48fba790d3c60b457d8a5760e77e52bf88d95ae (diff)
downloadnixos-89044cdc83202a9439f0faaae0b33965044b0a59.tar
nixos-89044cdc83202a9439f0faaae0b33965044b0a59.tar.gz
nixos-89044cdc83202a9439f0faaae0b33965044b0a59.tar.bz2
nixos-89044cdc83202a9439f0faaae0b33965044b0a59.tar.xz
nixos-89044cdc83202a9439f0faaae0b33965044b0a59.zip
-rw-r--r--bragi.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/bragi.nix b/bragi.nix
index 086c391e..538324ec 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -30,10 +30,11 @@ in rec {
30 rec { 30 rec {
31 haskellPackages = pkgs.haskellPackages.override { 31 haskellPackages = pkgs.haskellPackages.override {
32 overrides = self: super: { 32 overrides = self: super: {
33 filelock = pkgs.haskell.lib.dontCheck super.filelock;
33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 34 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
34 inherit 35 inherit
35 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) 36 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
36 Glob filelock; 37 Glob;
37 inherit 38 inherit
38 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) 39 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
39 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 40 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;