summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-09-03 21:34:21 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2017-09-03 21:34:21 +0200
commit739fbfc609b74754186ef29bf041e792f1c72148 (patch)
treec8a7d2949261d202f780659385f7861d055e6e3e
parent0b6155a5734f95c3982430f3500e0c6e4ae274e2 (diff)
downloadnixos-739fbfc609b74754186ef29bf041e792f1c72148.tar
nixos-739fbfc609b74754186ef29bf041e792f1c72148.tar.gz
nixos-739fbfc609b74754186ef29bf041e792f1c72148.tar.bz2
nixos-739fbfc609b74754186ef29bf041e792f1c72148.tar.xz
nixos-739fbfc609b74754186ef29bf041e792f1c72148.zip
-rw-r--r--bragi.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/bragi.nix b/bragi.nix
index de87a761..4d61b61a 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,11 +28,11 @@ in rec {
28 28
29 nixpkgs.config.packageOverrides = oldPkgs: 29 nixpkgs.config.packageOverrides = oldPkgs:
30 rec { 30 rec {
31 haskellPackages = oldPkgs.haskellPackages { 31 haskellPackages = oldPkgs.haskellPackages.override {
32 overrides = self: super: { 32 overrides = self: super: {
33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
34 inherit 34 inherit
35 (lib.mapAttrs (name: drv: oldPkgs.haskell.lib.dontCheck drv) super) 35 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
36 Glob filelock; 36 Glob filelock;
37 inherit 37 inherit
38 (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) 38 (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); })