From 0122a1530c5ee224707ccfe13a51591ea5063553 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 21 Apr 2018 13:45:47 +0200 Subject: extend haskellPackages --- bragi.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/bragi.nix b/bragi.nix index 8ccb6b2b..44d9b7af 100644 --- a/bragi.nix +++ b/bragi.nix @@ -87,20 +87,18 @@ in rec { nixpkgs.config = { overlays = [ (selfPkgs: superPkgs: { - haskellPackages = superPkgs.haskellPackages.override { - overrides = selfH: superH: { - encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: { - src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; - }); - inherit - (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) - Glob filelock hedgehog; - inherit - (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) - thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; - bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; - }; - }; + haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: { + encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: { + src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; + }); + inherit + (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) + Glob filelock hedgehog; + inherit + (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) + thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; + bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; + }); jack2Full = superPkgs.jack2Full.override { dbus = null; }; -- cgit v1.2.3