public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
This commit is contained in:
Dmitry Kalinkin
2019-09-25 18:52:30 -04:00
parent eab41878ac 96ac71d680
commit c455adcc42
106 changed files with 2823 additions and 5605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -322,7 +322,6 @@ self: super: {
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
matplotlib = dontCheck super.matplotlib;
memcache = dontCheck super.memcache;
MemoTrie = dontHaddock (dontCheck super.MemoTrie);
metrics = dontCheck super.metrics;
milena = dontCheck super.milena;
modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)

3
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@@ -95,4 +95,7 @@ self: super: {
# Newer versions don't compile.
resolv = self.resolv_0_1_1_2;
# cabal2nix needs the latest version of Cabal.
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
}

63
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@@ -42,6 +42,7 @@ self: super: {
xhtml = null;
# Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff;
async = doJailbreak super.async;
cabal-install = doJailbreak super.cabal-install;
ChasingBottoms = doJailbreak super.ChasingBottoms;
@@ -57,8 +58,11 @@ self: super: {
quickcheck-instances = doJailbreak super.quickcheck-instances;
setlocale = doJailbreak super.setlocale;
split = doJailbreak super.split;
system-fileio = doJailbreak super.system-fileio;
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
test-framework = doJailbreak super.test-framework;
th-expand-syns = doJailbreak super.th-expand-syns;
# These packages don't work and need patching and/or an update.
primitive = overrideSrc (doJailbreak super.primitive) {
@@ -96,8 +100,6 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
});
easytest = markBroken super.easytest;
easytest_0_3 = markBroken super.easytest_0_3;
regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
@@ -106,38 +108,14 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
});
lens = self.lens_4_18_1;
xmonad-contrib = self.xmonad-contrib_0_16;
polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
});
foundation = dontCheck super.foundation;
memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch";
sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29";
})) (drv: {
editedCabalFile = null;
preConfigure = ''
cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
'';
});
chell = overrideCabal (doJailbreak super.chell) (_drv: {
broken = false;
});
th-expand-syns = doJailbreak super.th-expand-syns;
shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch";
sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc";
})) (drv: {
editedCabalFile = null;
preConfigure = ''
cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal
sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version
'';
});
system-fileio = doJailbreak super.system-fileio;
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
@@ -146,7 +124,6 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
});
tls = self.tls_1_5_1;
vault = dontHaddock super.vault;
monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8
@@ -162,23 +139,29 @@ self: super: {
sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
});
# over-specified version constraints
aeson-diff = doJailbreak super.aeson-diff;
# https://github.com/sol/hpack/issues/371
hpack = markBrokenVersion "0.32.0" super.hpack;
hpack = appendPatch super.hpack (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
});
# Upstream ships a broken Setup.hs file.
csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
# Upstream ships a broken Setup.hs file.
string-qq = overrideSrc (dontCheck super.string-qq) {
src = pkgs.fetchFromGitHub {
owner = "dmwit";
repo = "string-qq";
rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe";
sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s";
};
};
# mark broken packages
bencode = markBrokenVersion "0.6.0.0" super.bencode;
easytest = markBroken super.easytest;
easytest_0_3 = markBroken super.easytest_0_3;
haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
# use latest version to fix the build
hackage-db = self.hackage-db_2_1_0;
lens = self.lens_4_18_1;
memory = self.memory_0_15_0;
microlens = self.microlens_0_4_11_2;
shelly = self.shelly_1_9_0;
string-qq = self.string-qq_0_0_4;
tls = self.tls_1_5_1;
xmonad-contrib = self.xmonad-contrib_0_16;
}

52
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 14.6
# LTS Haskell 14.7
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -370,7 +370,7 @@ default-package-overrides:
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.3.1.1
- conduit-algorithms ==0.0.10.1
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-extra ==1.3.4
@@ -393,7 +393,7 @@ default-package-overrides:
- control-bool ==0.2.1
- control-dsl ==0.2.1.3
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.1
- control-monad-omega ==0.3.2
- convertible ==1.1.1.0
- cookie ==0.4.4
- core-data ==0.2.0.0
@@ -646,7 +646,7 @@ default-package-overrides:
- failable ==1.2.2.0
- fakedata ==0.2.2
- farmhash ==0.1.0.5
- fast-builder ==0.1.1.0
- fast-builder ==0.1.2.0
- fast-digits ==0.2.1.0
- fast-logger ==2.4.17
- fast-math ==1.0.2
@@ -796,7 +796,7 @@ default-package-overrides:
- ginger ==0.9.1.0
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
- githash ==0.1.3.2
- githash ==0.1.3.3
- github-release ==1.2.4
- github-types ==0.2.1
- github-webhooks ==0.10.1
@@ -890,7 +890,7 @@ default-package-overrides:
- heap ==1.0.4
- heaps ==0.3.6.1
- hebrew-time ==0.1.2
- hedgehog ==1.0
- hedgehog ==1.0.1
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- hedis ==0.12.8
@@ -1045,7 +1045,7 @@ default-package-overrides:
- hw-mquery ==0.2.0.1
- hw-packed-vector ==0.0.0.3
- hw-parser ==0.1.0.1
- hw-prim ==0.6.2.31
- hw-prim ==0.6.2.32
- hw-rankselect ==0.13.0.0
- hw-rankselect-base ==0.3.2.1
- hw-simd ==0.1.1.4
@@ -1176,7 +1176,7 @@ default-package-overrides:
- lackey ==1.0.9
- LambdaHack ==0.9.5.0
- lame ==0.2.0
- language-c ==0.8.2
- language-c ==0.8.3
- language-c-quote ==0.12.2
- language-docker ==8.0.2
- language-ecmascript ==0.19
@@ -1250,7 +1250,7 @@ default-package-overrides:
- log-domain ==0.12
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- logging-effect ==1.3.4
- logging-effect ==1.3.6
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- logict ==0.7.0.2
@@ -1714,7 +1714,7 @@ default-package-overrides:
- Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.0
- rank2classes ==1.3
- rank2classes ==1.3.1
- Rasterific ==0.7.4.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.8
@@ -1731,7 +1731,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- reanimate ==0.1.5.0
- reanimate-svg ==0.9.1.1
- reanimate-svg ==0.9.2.1
- rebase ==1.3.1.1
- record-dot-preprocessor ==0.2
- record-hasfield ==1.0
@@ -1767,12 +1767,10 @@ default-package-overrides:
- repa ==3.4.1.4
- repa-algorithms ==3.4.1.3
- repa-io ==3.4.1.1
- replace-attoparsec ==1.0.1.0
- replace-megaparsec ==1.1.3.0
- repline ==0.2.1.0
- req ==2.1.0
- req-conduit ==1.0.0
- require ==0.4.2
- require ==0.4.3
- rerebase ==1.3.1.1
- resistor-cube ==0.0.1.2
- resource-pool ==0.2.3.2
@@ -1826,7 +1824,7 @@ default-package-overrides:
- scalpel ==0.6.0
- scalpel-core ==0.6.0
- scanf ==0.1.0.0
- scanner ==0.3
- scanner ==0.3.1
- scheduler ==1.4.2
- scientific ==0.3.6.2
- scotty ==0.11.5
@@ -1836,10 +1834,10 @@ default-package-overrides:
- sdl2-image ==2.0.0
- sdl2-mixer ==1.1.0
- sdl2-ttf ==2.1.0
- secp256k1-haskell ==0.1.4
- secp256k1-haskell ==0.1.5
- securemem ==0.1.10
- selda ==0.4.0.0
- selda-json ==0.1.0.0
- selda-json ==0.1.1.0
- selda-postgresql ==0.1.8.0
- selda-sqlite ==0.1.7.0
- selective ==0.3
@@ -1866,13 +1864,13 @@ default-package-overrides:
- servant-checked-exceptions ==2.2.0.0
- servant-checked-exceptions-core ==2.2.0.0
- servant-cli ==0.1.0.1
- servant-client ==0.16
- servant-client ==0.16.0.1
- servant-client-core ==0.16
- servant-conduit ==0.15
- servant-docs ==0.11.3
- servant-elm ==0.6.0.2
- servant-docs ==0.11.4
- servant-elm ==0.6.1
- servant-foreign ==0.15
- servant-http-streams ==0.16
- servant-http-streams ==0.16.0.1
- servant-js ==0.9.4
- servant-JuicyPixels ==0.3.0.4
- servant-kotlin ==0.1.1.9
@@ -1880,7 +1878,7 @@ default-package-overrides:
- servant-machines ==0.15
- servant-mock ==0.8.5
- servant-multipart ==0.11.4
- servant-pipes ==0.15
- servant-pipes ==0.15.1
- servant-ruby ==0.9.0.0
- servant-server ==0.16.2
- servant-static-th ==0.2.2.1
@@ -1982,7 +1980,7 @@ default-package-overrides:
- statestack ==0.2.0.5
- StateVar ==1.2
- static-text ==0.2.0.4
- statistics ==0.15.0.0
- statistics ==0.15.1.1
- stb-image-redux ==0.2.1.2
- step-function ==0.2
- stm-chans ==3.0.0.4
@@ -2201,7 +2199,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.14
- turtle ==1.5.15
- TypeCompose ==0.9.14
- typed-process ==0.2.6.0
- type-errors ==0.2.0.0
@@ -2309,7 +2307,7 @@ default-package-overrides:
- verbosity ==0.3.0.0
- versions ==3.5.1.1
- ViennaRNAParser ==1.3.3
- viewprof ==0.0.0.30
- viewprof ==0.0.0.31
- vinyl ==0.11.0
- vivid ==0.4.2.3
- vivid-osc ==0.5.0.0
@@ -2355,7 +2353,7 @@ default-package-overrides:
- websockets ==0.12.5.3
- websockets-snap ==0.10.3.1
- weigh ==0.0.14
- wide-word ==0.1.0.8
- wide-word ==0.1.0.9
- wikicfp-scraper ==0.1.0.11
- wild-bind ==0.1.2.4
- wild-bind-x11 ==0.2.0.7
@@ -5220,7 +5218,6 @@ broken-packages:
- haddock-leksah
- haddock-test
- haddocset
- hadolint
- hadoop-formats
- hadoop-rpc
- hadoop-tools
@@ -8098,7 +8095,6 @@ broken-packages:
- puzzle-draw
- puzzle-draw-cmdline
- pvd
- PyF
- pyffi
- pyfi
- python-pickle

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -593,4 +593,8 @@ self: super: builtins.intersectAttrs super {
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;
# Hadolint wants to build a statically linked binary by default.
hadolint = overrideCabal super.hadolint (drv: {
preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
});
}

1513
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff