From 907554c15a1b7ed02e54688eb8ffe2b9cff39e25 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 Apr 2018 12:53:53 +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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bragi.nix b/bragi.nix index a97859ba..076f91bc 100644 --- a/bragi.nix +++ b/bragi.nix @@ -82,11 +82,10 @@ in rec { wantedBy = [ "network.target" ]; }; - nixpkgs.config.packageOverrides = oldPkgs: - rec { + nixpkgs.config.packageOverrides = oldPkgs: { haskellPackages = oldPkgs.haskellPackages.override { - overrides = self: super: rec { - encoding = oldPkgs.haskell.lib.overrideCabal encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); + overrides = self: super: { + encoding = pkgs.haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; inherit (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) @@ -101,7 +100,7 @@ in rec { mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; - inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; + inherit (pkgs.haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; }; nixpkgs.config.allowUnfree = true; -- cgit v1.2.3