diff options
-rw-r--r-- | bragi.nix | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -82,11 +82,10 @@ in rec { | |||
82 | wantedBy = [ "network.target" ]; | 82 | wantedBy = [ "network.target" ]; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | nixpkgs.config.packageOverrides = oldPkgs: | 85 | nixpkgs.config.packageOverrides = oldPkgs: { |
86 | rec { | ||
87 | haskellPackages = oldPkgs.haskellPackages.override { | 86 | haskellPackages = oldPkgs.haskellPackages.override { |
88 | overrides = self: super: rec { | 87 | overrides = self: super: { |
89 | encoding = oldPkgs.haskell.lib.overrideCabal encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); | 88 | encoding = pkgs.haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); |
90 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; | 89 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; |
91 | inherit | 90 | inherit |
92 | (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) | 91 | (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) |
@@ -101,7 +100,7 @@ in rec { | |||
101 | 100 | ||
102 | mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; | 101 | mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; |
103 | 102 | ||
104 | inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; | 103 | inherit (pkgs.haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; |
105 | }; | 104 | }; |
106 | 105 | ||
107 | nixpkgs.config.allowUnfree = true; | 106 | nixpkgs.config.allowUnfree = true; |