Merge pull request #121627 from NixOS/haskell-updates

This commit is contained in:
maralorn
2021-05-07 23:55:19 +02:00
committed by GitHub
46 changed files with 4672 additions and 4071 deletions
@@ -1,7 +1,9 @@
{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
let
taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
taffybarEnv = haskellPackages.ghc.withPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
name = "taffybar-with-packages-${taffybarEnv.version}";
@@ -13,8 +15,5 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.bsd3;
};
inherit (haskellPackages.taffybar) meta;
}