From 07651a1ef1643098004f30a0b347b985d68880cb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 31 Aug 2017 15:27:54 +0200 Subject: =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bragi.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/bragi.nix b/bragi.nix index 9bb4d702..d6cb7b71 100644 --- a/bragi.nix +++ b/bragi.nix @@ -30,19 +30,13 @@ in rec { rec { haskellPackages = pkgs.recurseIntoAttrs ( pkgs.haskellPackages.override { - overrides = self: super: let - callPackage = pkgs.lib.callPackageWith ( pkgs // self ); - in { - trivmix = callPackage ./custom/trivmix {}; + overrides = self: super: { + trivmix = self.callPackage ./custom/trivmix {}; inherit (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) Glob filelock; inherit - ((import ./custom/thermoprint) { - inherit (pkgs) stdenv; - haskellPackages = self; - extraPackages = (p: with p; [ persistent-postgresql ]); - }) + ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; }; } -- cgit v1.2.3