diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:49:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:49:10 +0100 |
| commit | 8aaf2e60e54409dfa06011077991d20600365386 (patch) | |
| tree | 1ad3e485bec393e4295d23a890492850d5c92e73 /pkgs/data/misc | |
| parent | b5ca1a173104157e32798a9a7a3b13924e745ab0 (diff) | |
| parent | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c9950d9fcd11..3c9a531ab62f 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; - sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; + sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index dc80580ff5ec..5065e3718cb2 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" + "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" "cc=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ]; |