summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index 44d9b7af..61051827 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -84,10 +84,10 @@ in rec {
84 wantedBy = [ "network.target" ]; 84 wantedBy = [ "network.target" ];
85 }; 85 };
86 86
87 nixpkgs.config = { 87 nixpkgs = {
88 overlays = [ 88 overlays = [
89 (selfPkgs: superPkgs: { 89 (selfPkgs: superPkgs: {
90 haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: { 90 haskellPackages = superPkgs.haskell.ghc822.packages.extend (selfH: superH: {
91 encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: { 91 encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {
92 src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; 92 src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
93 }); 93 });
@@ -104,11 +104,13 @@ in rec {
104 104
105 mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 105 mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
106 106
107 inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint bar; 107 inherit (selfPkgs.haskell.ghc822.packages) thermoprint-server thermoprint-webgui tprint bar;
108 }) 108 })
109 ]; 109 ];
110 110
111 allowUnfree = true; 111 config = {
112 allowUnfree = true;
113 };
112 }; 114 };
113 115
114 environment.systemPackages = with pkgs; [ 116 environment.systemPackages = with pkgs; [