…

1 files 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;