summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-09-04 11:45:34 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2017-09-04 11:45:34 +0200
commitf24bb44da07f5712f17d820a6afa2769b1b8caf7 (patch)
treede1b5d053dba62ce01e38727a9bbc79e299dced2
parentad05f81de525230c22b4034058e71d3c71c09cea (diff)
downloadnixos-f24bb44da07f5712f17d820a6afa2769b1b8caf7.tar
nixos-f24bb44da07f5712f17d820a6afa2769b1b8caf7.tar.gz
nixos-f24bb44da07f5712f17d820a6afa2769b1b8caf7.tar.bz2
nixos-f24bb44da07f5712f17d820a6afa2769b1b8caf7.tar.xz
nixos-f24bb44da07f5712f17d820a6afa2769b1b8caf7.zip
?
-rw-r--r--bragi.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/bragi.nix b/bragi.nix
index 1be1cfc0..2fda697e 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,13 +28,13 @@ in rec {
28 nixpkgs.config.packageOverrides = oldPkgs: 28 nixpkgs.config.packageOverrides = oldPkgs:
29 rec { 29 rec {
30 haskellPackages = oldPkgs.haskellPackages.override { 30 haskellPackages = oldPkgs.haskellPackages.override {
31 overrides = self: super: { 31 overrides = self: super: rec {
32 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 32 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
33 inherit 33 inherit
34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) 34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
35 Glob filelock; 35 Glob filelock;
36 inherit 36 inherit
37 (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) 37 (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { inherit filelock; extraPackages = (p: with p; [ persistent-postgresql ]); })
38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
39 }; 39 };
40 }; 40 };