diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 13:45:47 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 13:45:47 +0200 |
| commit | 0122a1530c5ee224707ccfe13a51591ea5063553 (patch) | |
| tree | ddbd823834b75a06d2f902beb5699c932434a678 | |
| parent | d82382736a514289a824f4055dfa09f5dc36ea99 (diff) | |
| download | nixos-0122a1530c5ee224707ccfe13a51591ea5063553.tar nixos-0122a1530c5ee224707ccfe13a51591ea5063553.tar.gz nixos-0122a1530c5ee224707ccfe13a51591ea5063553.tar.bz2 nixos-0122a1530c5ee224707ccfe13a51591ea5063553.tar.xz nixos-0122a1530c5ee224707ccfe13a51591ea5063553.zip | |
extend haskellPackages
| -rw-r--r-- | bragi.nix | 26 |
1 files changed, 12 insertions, 14 deletions
| @@ -87,20 +87,18 @@ in rec { | |||
| 87 | nixpkgs.config = { | 87 | nixpkgs.config = { |
| 88 | overlays = [ | 88 | overlays = [ |
| 89 | (selfPkgs: superPkgs: { | 89 | (selfPkgs: superPkgs: { |
| 90 | haskellPackages = superPkgs.haskellPackages.override { | 90 | haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: { |
| 91 | overrides = selfH: superH: { | 91 | encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: { |
| 92 | encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: { | 92 | src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; |
| 93 | src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; | 93 | }); |
| 94 | }); | 94 | inherit |
| 95 | inherit | 95 | (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) |
| 96 | (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) | 96 | Glob filelock hedgehog; |
| 97 | Glob filelock hedgehog; | 97 | inherit |
| 98 | inherit | 98 | (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) |
| 99 | (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) | 99 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; |
| 100 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; | 100 | bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; |
| 101 | bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; | 101 | }); |
| 102 | }; | ||
| 103 | }; | ||
| 104 | 102 | ||
| 105 | jack2Full = superPkgs.jack2Full.override { dbus = null; }; | 103 | jack2Full = superPkgs.jack2Full.override { dbus = null; }; |
| 106 | 104 | ||