diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 19:17:25 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 19:17:25 +0200 |
commit | a2fa9c97db76e79d57876e5ec5f9b0db624d7200 (patch) | |
tree | b3ab731ff90b956b2234135d3ec38b3759ab536a | |
parent | 8638b06c1314fd8d8780329911ae0a6607232c48 (diff) | |
download | nixos-a2fa9c97db76e79d57876e5ec5f9b0db624d7200.tar nixos-a2fa9c97db76e79d57876e5ec5f9b0db624d7200.tar.gz nixos-a2fa9c97db76e79d57876e5ec5f9b0db624d7200.tar.bz2 nixos-a2fa9c97db76e79d57876e5ec5f9b0db624d7200.tar.xz nixos-a2fa9c97db76e79d57876e5ec5f9b0db624d7200.zip |
bragi
-rw-r--r-- | bragi.nix | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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; [ |