diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-16 13:01:28 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-16 13:01:28 +0200 |
| commit | 423d3061b1e00767e594136260fee966502b477f (patch) | |
| tree | 2ae96db28c3cb41c9ac1a95f8aeda4b37fff08c7 | |
| parent | 8606bd8fb05bb7ed110671418d469fd9f1186bd5 (diff) | |
| download | nixos-423d3061b1e00767e594136260fee966502b477f.tar nixos-423d3061b1e00767e594136260fee966502b477f.tar.gz nixos-423d3061b1e00767e594136260fee966502b477f.tar.bz2 nixos-423d3061b1e00767e594136260fee966502b477f.tar.xz nixos-423d3061b1e00767e594136260fee966502b477f.zip | |
…
| -rw-r--r-- | bragi.nix | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -82,7 +82,8 @@ in rec { | |||
| 82 | wantedBy = [ "network.target" ]; | 82 | wantedBy = [ "network.target" ]; |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | nixpkgs.config.packageOverrides = pkgs: with pkgs; { | 85 | nixpkgs.config = { |
| 86 | packageOverrides = pkgs: with pkgs; { | ||
| 86 | haskellPackages = haskellPackages.override { | 87 | haskellPackages = haskellPackages.override { |
| 87 | overrides = self: super: { | 88 | overrides = self: super: { |
| 88 | encoding = haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); | 89 | encoding = haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); |
| @@ -103,7 +104,8 @@ in rec { | |||
| 103 | inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; | 104 | inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; |
| 104 | }; | 105 | }; |
| 105 | 106 | ||
| 106 | nixpkgs.config.allowUnfree = true; | 107 | allowUnfree = true; |
| 108 | }; | ||
| 107 | 109 | ||
| 108 | environment.systemPackages = with pkgs; [ | 110 | environment.systemPackages = with pkgs; [ |
| 109 | git | 111 | git |
