1 files 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 {
+        haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: {
-          overrides = selfH: superH: {
+          encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {
-            encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {
+            src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
-              src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
+          });
-            });
+          inherit
-            inherit
+            (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH)
-              (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH)
+            Glob filelock hedgehog;
-              Glob filelock hedgehog;
+          inherit
-            inherit
+            (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
-              (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;
-              thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
+          bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };
-            bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };
+        });
-          };
-        };
        jack2Full = superPkgs.jack2Full.override { dbus = null; };

diff --git a/bragi.nix b/bragi.nix index 8ccb6b2b..44d9b7af 100644 --- a/bragi.nix +++ b/bragi.nix
@@ -87,20 +87,18 @@ in rec {
87	nixpkgs.config = {	87	nixpkgs.config = {
88	overlays = [	88	overlays = [
89	(selfPkgs: superPkgs: {	89	(selfPkgs: superPkgs: {
90	haskellPackages = superPkgs.haskellPackages.override {	90	haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: {
91	overrides = selfH: superH: {	91	encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {
92	encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {	92	src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
93	src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };	93	});
94	});	94	inherit
95	inherit	95	(lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH)
96	(lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH)	96	Glob filelock hedgehog;
97	Glob filelock hedgehog;	97	inherit
98	inherit	98	(selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
99	(selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })	99	thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
100	thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;	100	bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };
101	bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };	101	});
102	};
103	};
104		102
105	jack2Full = superPkgs.jack2Full.override { dbus = null; };	103	jack2Full = superPkgs.jack2Full.override { dbus = null; };
106		104