From d6b32102cb63b88f57596f71b309f1fa72854366 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 5 Nov 2017 22:05:56 +0100 Subject: =?UTF-8?q?Revert=20"=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a. --- bragi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bragi.nix') diff --git a/bragi.nix b/bragi.nix index 1e970548..6b93f152 100644 --- a/bragi.nix +++ b/bragi.nix @@ -29,12 +29,12 @@ in rec { rec { haskellPackages = oldPkgs.haskellPackages.override { overrides = self: super: rec { - trivmix = self.callPackage ./custom/trivmix/trivmix.nix { inherit (self) Glob; }; + trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; inherit (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) Glob filelock; inherit - (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; inherit (self) Glob; extraPackages = (p: with p; [ persistent-postgresql ]); }) + (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; }; }; -- cgit v1.2.3