From a0f300bcc503457a2ebeb380e800617e608653eb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 21 Apr 2018 13:19:42 +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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bragi.nix b/bragi.nix index e3835fc6..570f202a 100644 --- a/bragi.nix +++ b/bragi.nix @@ -86,26 +86,26 @@ in rec { nixpkgs.config = { overlays = [ - (selfPkgs: superPkgs: with superPkgs; { + (selfPkgs: superPkgs: { haskellPackages = haskellPackages.override { - overrides = self: super: with self; { - encoding = haskell.lib.overrideCabal encoding ( oldAttrs: { + overrides = selfH: superH: { + encoding = superPkgs.haskell.lib.overrideCabal encoding ( oldAttrs: { src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; }); inherit - (lib.mapAttrs (name: haskell.lib.dontCheck) super) + (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) Glob filelock hedgehog; inherit - (callPackage ./custom/thermoprint { inherit runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) + (selfH.callPackage ./custom/thermoprint { inherit runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; }; }; - jack2Full = jack2Full.override { dbus = null; }; + jack2Full = superPkgs.jack2Full.override { dbus = null; }; - mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; }; + mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; - inherit (pkgs.haskellPackages) thermoprint-server thermoprint-client thermoprint-webgui tprint; + inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint; }) ]; -- cgit v1.2.3