1 files changed, 8 insertions, 8 deletions

diff --git a/bragi.nix b/bragi.nix
index 076f91bc..a7059836 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -82,25 +82,25 @@ in rec {
     wantedBy = [ "network.target" ];
   };
 
-  nixpkgs.config.packageOverrides = oldPkgs: {
-      haskellPackages = oldPkgs.haskellPackages.override {
+  nixpkgs.config.packageOverrides = pkgs: with pkgs; {
+      haskellPackages = haskellPackages.override {
         overrides = self: super: {
-          encoding = pkgs.haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } );
+          encoding = haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = 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)
+            (lib.mapAttrs (name: haskell.lib.dontCheck) super)
             Glob filelock hedgehog;
           inherit
-            (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
+            (self.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 = oldPkgs.jack2Full.override { dbus = null; };
+      jack2Full = jack2Full.override { dbus = null; };
 
-      mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
+      mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-      inherit (pkgs.haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
+      inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
     };
 
   nixpkgs.config.allowUnfree = true;