diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-16 13:01:07 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-16 13:01:07 +0200 |
| commit | 8606bd8fb05bb7ed110671418d469fd9f1186bd5 (patch) | |
| tree | 4abaeaa23915c367267457d22dc9c064e8bafdda | |
| parent | 907554c15a1b7ed02e54688eb8ffe2b9cff39e25 (diff) | |
| download | nixos-8606bd8fb05bb7ed110671418d469fd9f1186bd5.tar nixos-8606bd8fb05bb7ed110671418d469fd9f1186bd5.tar.gz nixos-8606bd8fb05bb7ed110671418d469fd9f1186bd5.tar.bz2 nixos-8606bd8fb05bb7ed110671418d469fd9f1186bd5.tar.xz nixos-8606bd8fb05bb7ed110671418d469fd9f1186bd5.zip | |
…
| -rw-r--r-- | bragi.nix | 16 |
1 files changed, 8 insertions, 8 deletions
| @@ -82,25 +82,25 @@ in rec { | |||
| 82 | wantedBy = [ "network.target" ]; | 82 | wantedBy = [ "network.target" ]; |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | nixpkgs.config.packageOverrides = oldPkgs: { | 85 | nixpkgs.config.packageOverrides = pkgs: with pkgs; { |
| 86 | haskellPackages = oldPkgs.haskellPackages.override { | 86 | haskellPackages = haskellPackages.override { |
| 87 | overrides = self: super: { | 87 | overrides = self: super: { |
| 88 | encoding = pkgs.haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = pkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); | 88 | encoding = haskell.lib.overrideCabal super.encoding ( oldAttrs: { src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; } ); |
| 89 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; | 89 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; |
| 90 | inherit | 90 | inherit |
| 91 | (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) | 91 | (lib.mapAttrs (name: haskell.lib.dontCheck) super) |
| 92 | Glob filelock hedgehog; | 92 | Glob filelock hedgehog; |
| 93 | inherit | 93 | inherit |
| 94 | (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) | 94 | (self.callPackage ./custom/thermoprint { inherit runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) |
| 95 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; | 95 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; |
| 96 | }; | 96 | }; |
| 97 | }; | 97 | }; |
| 98 | 98 | ||
| 99 | jack2Full = oldPkgs.jack2Full.override { dbus = null; }; | 99 | jack2Full = jack2Full.override { dbus = null; }; |
| 100 | 100 | ||
| 101 | mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; | 101 | mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; }; |
| 102 | 102 | ||
| 103 | inherit (pkgs.haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; | 103 | inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; |
| 104 | }; | 104 | }; |
| 105 | 105 | ||
| 106 | nixpkgs.config.allowUnfree = true; | 106 | nixpkgs.config.allowUnfree = true; |