diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-11-05 22:05:56 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-11-05 22:05:56 +0100 |
| commit | d6b32102cb63b88f57596f71b309f1fa72854366 (patch) | |
| tree | 6efbe7aca170bbdc2b3bb3df346fa0ecb22e8aa6 | |
| parent | ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a (diff) | |
| download | nixos-d6b32102cb63b88f57596f71b309f1fa72854366.tar nixos-d6b32102cb63b88f57596f71b309f1fa72854366.tar.gz nixos-d6b32102cb63b88f57596f71b309f1fa72854366.tar.bz2 nixos-d6b32102cb63b88f57596f71b309f1fa72854366.tar.xz nixos-d6b32102cb63b88f57596f71b309f1fa72854366.zip | |
Revert "…"
This reverts commit ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.
| -rw-r--r-- | bragi.nix | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -29,12 +29,12 @@ in rec { | |||
| 29 | rec { | 29 | rec { |
| 30 | haskellPackages = oldPkgs.haskellPackages.override { | 30 | haskellPackages = oldPkgs.haskellPackages.override { |
| 31 | overrides = self: super: rec { | 31 | overrides = self: super: rec { |
| 32 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix { inherit (self) Glob; }; | 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 | (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; inherit (self) Glob; extraPackages = (p: with p; [ persistent-postgresql ]); }) | 37 | (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; 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 | }; |