mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge pull request #115256 from NixOS/haskell-updates

Browse source 
Update Haskell package set to Stackage Nightly 2021-03-06 (plus other fixes)
This commit is contained in:
Peter Simons 2021-03-12 20:53:42 +01:00 committed by GitHub
parent 7ba904b85e 5966fa1845
commit 795ef4f46f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1665 additions and 1340 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl";
sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -727,8 +727,19 @@ self: super: {
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
# 2021-03-12: All of this libraries have to restrictive upper bounds
# https://github.com/diagrams/diagrams-core/issues/112
active = doJailbreak super.active;
statestack = doJailbreak super.statestack;
force-layout = doJailbreak super.force-layout;
size-based = doJailbreak super.size-based;
dual-tree = doJailbreak super.dual-tree;
diagrams-core = doJailbreak super.diagrams-core;
diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib;
# https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }));
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
@ -1413,17 +1424,21 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
# 2021-02-11: Jailbreaking because of syntax error on bound revision
hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
# 2021-02-08: Overrides because nightly is to old for hls 0.9.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
# 2021-03-09: Golden tests seem to be missing in hackage release:
# https://github.com/haskell/haskell-language-server/issues/1536
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
# 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
ghcide = dontCheck super.ghcide;
# 2020-03-09: Tests broken in hackage release
# fixed on upstream, but not released in hiedb 0.3.0.1
# https://github.com/wz1000/HieDb/issues/30
hiedb = dontCheck super.hiedb;
data-tree-print = doJailbreak super.data-tree-print;
@ -1515,8 +1530,25 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
hercules-ci-agent = super.hercules-ci-agent.override {
cachix =
# https://github.com/cachix/cachix/pull/361
(appendPatch
(addBuildDepend super.cachix super.hercules-ci-cnix-store)
(pkgs.fetchpatch {
name = "cachix-361.patch";
url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
stripLen = 1;
includes = ["*.cabal" "*.hs"];
})
);
};
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
# See hercules-ci-optparse-applicative in non-hackage-packages.nix.
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
);
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
@ -1602,4 +1634,31 @@ self: super: {
];
});
# cabal-install switched to build type simple in 3.2.0.0
# as a result, the cabal(1) man page is no longer installed
# automatically. Instead we need to use the `cabal man`
# command which generates the man page on the fly and
# install it to $out/share/man/man1 ourselves in this
# override.
# The commit that introduced this change:
# https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
cabal-install = overrideCabal super.cabal-install (old: {
postInstall = old.postInstall + ''
mkdir -p "$out/share/man/man1"
"$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
'';
});
# while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
amazonka = appendPatches (doJailbreak super.amazonka) [
(pkgs.fetchpatch {
stripLen = 1;
url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
})
];
# Test suite does not compile.
feed = dontCheck super.feed;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

6
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file

@ -50,6 +50,12 @@ self: super: {
random = super.random_1_2_0;
};
# cabal-install-parsers is written for Cabal 3.4
cabal-install-parsers = super.cabal-install-parsers.override {
Cabal = super.Cabal_3_4_0_0;
base16-bytestring = super.base16-bytestring_1_0_1_0;
};
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;
system-fileio = doJailbreak super.system-fileio;

10
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -52,9 +52,15 @@ self: super: {
haddock = self.haddock_2_23_1;
haddock-api = self.haddock-api_2_23_1;
# These builds need Cabal 3.2.x.
# These builds need newer versions of Cabal.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
cabal-install = super.cabal-install.override {
Cabal = super.Cabal_3_4_0_0;
hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
# Using dontCheck to break test dependency cycles
edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
random = super.random_1_2_0;
};
# Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff;

3
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -93,4 +93,7 @@ self: super: {
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
}

148
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -73,15 +73,8 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
# Don't update yet to remain compatible with haskell-language-server-0.9.0.
- ghcide < 0.7.4
- hls-class-plugin < 1
- hls-explicit-imports-plugin < 0.1.0.1
- hls-haddock-comments-plugin < 1
- hls-plugin-api < 0.7.1.0
- hls-retrie-plugin < 0.1.1.1
- hls-tactics-plugin < 1
# Stackage Nightly 2021-03-01
# Stackage Nightly 2021-03-12
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -215,8 +208,8 @@ default-package-overrides:
- amazonka-waf ==1.6.1
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.20.0.1
- amqp-utils ==0.4.5.1
- amqp ==0.21.0
- amqp-utils ==0.6.1.0
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.10.3
- ansi-wl-pprint ==0.6.9
@ -229,7 +222,7 @@ default-package-overrides:
- ap-normalize ==0.1.0.0
- appar ==0.1.8
- appendmap ==0.1.5
- apply-refact ==0.9.1.0
- apply-refact ==0.9.2.0
- apportionment ==0.0.0.3
- approximate ==0.3.4
- approximate-equality ==1.1.0.2
@ -271,7 +264,7 @@ default-package-overrides:
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- aur ==7.0.6
- aura ==3.2.3
- aura ==3.2.4
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
@ -306,6 +299,8 @@ default-package-overrides:
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
- bcp47 ==0.2.0.3
- bcp47-orphans ==0.1.0.2
- bcrypt ==0.0.11
- bech32 ==1.1.0
- bech32-th ==1.0.2
@ -348,11 +343,11 @@ default-package-overrides:
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.2.1
- blaze-html ==0.9.1.2
- blaze-markup ==0.8.2.7
- blaze-markup ==0.8.2.8
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
- BNFC ==2.9.0
- BNFC ==2.9.1
- board-games ==0.3
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
@ -427,7 +422,7 @@ default-package-overrides:
- cassava-megaparsec ==2.0.2
- cast ==0.1.0.2
- category ==0.2.5.0
- cayley-client ==0.4.13
- cayley-client ==0.4.14
- cborg ==0.2.4.0
- cborg-json ==0.2.2.0
- cereal ==0.5.8.1
@ -462,7 +457,7 @@ default-package-overrides:
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
- citeproc ==0.3.0.7
- citeproc ==0.3.0.8
- clash-ghc ==1.2.5
- clash-lib ==1.2.5
- clash-prelude ==1.2.5
@ -525,17 +520,17 @@ default-package-overrides:
- concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.3.4
- conduit ==1.3.4.1
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0
- conduit-zstd ==0.0.2.0
- conferer ==1.0.0.1
- conferer-aeson ==1.0.0.0
- conferer-hspec ==1.0.0.0
- conferer-warp ==1.0.0.0
- conferer ==1.1.0.0
- conferer-aeson ==1.1.0.0
- conferer-hspec ==1.1.0.0
- conferer-warp ==1.1.0.0
- ConfigFile ==1.1.4
- config-ini ==0.2.4.0
- configurator ==0.3.0.0
@ -547,7 +542,7 @@ default-package-overrides:
- constraint ==0.1.4.0
- constraints ==0.12
- constraint-tuples ==0.1.2
- construct ==0.3
- construct ==0.3.0.1
- contravariant ==1.5.3
- contravariant-extras ==0.3.5.2
- control-bool ==0.2.1
@ -658,7 +653,7 @@ default-package-overrides:
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.16
- deferred-folds ==0.9.17
- dejafu ==2.4.0.1
- dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0
@ -700,6 +695,7 @@ default-package-overrides:
- doctemplates ==0.9
- doctest ==0.16.3
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.3
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doldol ==0.4.1.2
@ -815,6 +811,7 @@ default-package-overrides:
- fakedata-parser ==0.1.0.0
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- faktory ==1.0.2.1
- fast-digits ==0.3.0.0
- fast-logger ==3.0.3
- fast-math ==1.0.2
@ -823,7 +820,7 @@ default-package-overrides:
- feature-flags ==0.1.0.1
- fedora-dists ==1.1.2
- fedora-haskell-tools ==0.9
- feed ==1.3.0.1
- feed ==1.3.2.0
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fgl ==5.7.0.3
@ -840,7 +837,7 @@ default-package-overrides:
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
- first-class-families ==0.8.0.0
- first-class-families ==0.8.0.1
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.8
- fixed ==0.3
@ -916,6 +913,7 @@ default-package-overrides:
- generic-optics ==2.0.0.0
- GenericPretty ==1.2.2
- generic-random ==1.3.0.1
- generics-eot ==0.4.0.1
- generics-sop ==0.5.1.1
- generics-sop-lens ==0.2.0.1
- geniplate-mirror ==0.7.7
@ -934,8 +932,14 @@ default-package-overrides:
- genvalidity-mergeful ==0.2.0.0
- genvalidity-mergeless ==0.2.0.0
- genvalidity-path ==0.3.0.4
- genvalidity-persistent ==0.0.0.0
- genvalidity-property ==0.5.0.1
- genvalidity-scientific ==0.2.1.1
- genvalidity-sydtest ==0.0.0.0
- genvalidity-sydtest-aeson ==0.0.0.0
- genvalidity-sydtest-hashable ==0.0.0.0
- genvalidity-sydtest-lens ==0.0.0.0
- genvalidity-sydtest-persistent ==0.0.0.1
- genvalidity-text ==0.7.0.2
- genvalidity-time ==0.3.0.0
- genvalidity-typed-uuid ==0.0.0.2
@ -1006,7 +1010,7 @@ default-package-overrides:
- gluturtle ==0.0.58.1
- gnuplot ==0.5.6.1
- google-isbn ==1.0.3
- gothic ==0.1.5
- gothic ==0.1.6
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
@ -1028,9 +1032,9 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- hadolint ==1.22.1
- hadolint ==1.23.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.3
- hakyll-convert ==0.3.0.4
- half ==0.3.1
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
@ -1074,7 +1078,7 @@ default-package-overrides:
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-session ==0.1.2.0
- headroom ==0.3.2.0
- headroom ==0.4.0.0
- heap ==1.0.4
- heaps ==0.3.6.1
- hebrew-time ==0.1.2
@ -1109,7 +1113,7 @@ default-package-overrides:
- hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1
- hmatrix ==0.20.1
- hmatrix ==0.20.2
- hmatrix-backprop ==0.1.3.0
- hmatrix-gsl ==0.19.0.1
- hmatrix-gsl-stats ==0.4.1.8
@ -1163,6 +1167,7 @@ default-package-overrides:
- hspec-core ==2.7.8
- hspec-discover ==2.7.8
- hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.2
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.1.0.3
@ -1274,7 +1279,7 @@ default-package-overrides:
- immortal-queue ==0.1.0.1
- inbox ==0.1.0
- include-file ==0.1.0.4
- incremental-parser ==0.5.0.1
- incremental-parser ==0.5.0.2
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-containers ==0.1.0.2
@ -1290,7 +1295,7 @@ default-package-overrides:
- inline-c-cpp ==0.4.0.3
- inline-r ==0.10.4
- inliterate ==0.1.0
- input-parsers ==0.1.0.1
- input-parsers ==0.2.1
- insert-ordered-containers ==0.2.4
- inspection-testing ==0.4.3.0
- instance-control ==0.1.2.0
@ -1317,7 +1322,7 @@ default-package-overrides:
- io-streams ==1.5.2.0
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.1
- iproute ==1.7.10
- iproute ==1.7.11
- IPv6Addr ==1.1.5
- ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1
@ -1546,16 +1551,16 @@ default-package-overrides:
- mixed-types-num ==0.4.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
- mmark ==0.0.7.3
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.2
- mmark-ext ==0.2.1.3
- mmorph ==1.1.5
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- mock-time ==0.1.0
- mod ==0.1.2.1
- model ==0.5
- modern-uri ==0.3.4.0
- modern-uri ==0.3.4.1
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
@ -1673,8 +1678,9 @@ default-package-overrides:
- no-value ==1.0.0.0
- nowdoc ==0.1.1.0
- nqe ==0.6.3
- nri-env-parser ==0.1.0.4
- nri-prelude ==0.4.0.0
- nri-env-parser ==0.1.0.5
- nri-observability ==0.1.0.0
- nri-prelude ==0.5.0.0
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@ -1690,7 +1696,7 @@ default-package-overrides:
- ObjectName ==1.1.0.1
- o-clock ==1.2.0.1
- odbc ==0.2.2
- oeis2 ==1.0.4
- oeis2 ==1.0.5
- ofx ==0.4.4.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.3
@ -1702,7 +1708,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- OpenAL ==1.7.0.5
- openapi3 ==3.0.1.0
- openapi3 ==3.0.2.0
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
@ -1733,10 +1739,10 @@ default-package-overrides:
- packcheck ==0.5.1
- packdeps ==0.6.0.0
- pager ==0.1.1.0
- pagination ==0.2.1
- pagination ==0.2.2
- pagure-cli ==0.2
- pandoc ==2.11.4
- pandoc-plot ==1.0.2.1
- pandoc-plot ==1.1.0
- pandoc-types ==1.22
- pantry ==0.5.1.4
- parallel ==3.2.2.0
@ -1907,7 +1913,7 @@ default-package-overrides:
- pureMD5 ==2.1.3
- purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==2.0.0.3
- pusher-http-haskell ==2.1.0.0
- pvar ==1.0.0.0
- PyF ==0.9.0.3
- qchas ==1.1.0.1
@ -1968,7 +1974,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.6.1
- record-dot-preprocessor ==0.2.9
- record-dot-preprocessor ==0.2.10
- record-hasfield ==1.0
- records-sop ==0.1.0.3
- record-wrangler ==0.1.1.0
@ -2042,6 +2048,7 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
- safe ==0.3.19
- safe-coloured-text ==0.0.0.0
- safecopy ==0.10.4.1
- safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1
@ -2095,7 +2102,7 @@ default-package-overrides:
- seqalign ==0.2.0.4
- seqid ==0.6.2
- seqid-streams ==0.7.2
- sequence-formats ==1.6.0
- sequence-formats ==1.6.1
- sequenceTools ==1.4.0.5
- serf ==0.1.1.0
- serialise ==0.2.3.0
@ -2216,7 +2223,7 @@ default-package-overrides:
- squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0
- srcloc ==0.5.1.2
- stache ==2.2.0
- stache ==2.2.1
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
@ -2265,14 +2272,14 @@ default-package-overrides:
- string-random ==0.1.4.0
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- stripe-concepts ==1.0.2.4
- stripe-concepts ==1.0.2.6
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- strive ==5.0.13
- structs ==0.1.5
- structured ==0.1
- structured ==0.1.0.1
- structured-cli ==2.6.0.0
- subcategories ==0.1.0.0
- sum-type-boilerplate ==0.1.1
@ -2284,6 +2291,12 @@ default-package-overrides:
- sweet-egison ==0.1.1.3
- swish ==0.10.0.4
- syb ==0.7.2.1
- sydtest ==0.1.0.0
- sydtest-discover ==0.0.0.0
- sydtest-persistent-sqlite ==0.0.0.0
- sydtest-servant ==0.0.0.0
- sydtest-wai ==0.0.0.0
- sydtest-yesod ==0.0.0.0
- symbol ==0.2.4
- symengine ==0.1.2.0
- symmetry-operations-symbols ==0.0.2.1
@ -2531,13 +2544,14 @@ default-package-overrides:
- utility-ht ==0.0.15
- uuid ==1.3.14
- uuid-types ==1.0.4
- validation ==1.1
- validation ==1.1.1
- validation-selective ==0.1.0.0
- validity ==0.11.0.0
- validity-aeson ==0.2.0.4
- validity-bytestring ==0.4.1.1
- validity-containers ==0.5.0.4
- validity-path ==0.4.0.1
- validity-persistent ==0.0.0.0
- validity-primitive ==0.0.0.1
- validity-scientific ==0.2.0.3
- validity-text ==0.3.1.1
@ -2669,16 +2683,17 @@ default-package-overrides:
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yamlparse-applicative ==0.1.0.2
- yamlparse-applicative ==0.1.0.3
- yesod ==1.6.1.0
- yesod-auth ==1.6.10.1
- yesod-auth-hashdb ==1.7.1.5
- yesod-auth-oauth2 ==0.6.1.7
- yesod-auth-oauth2 ==0.6.2.3
- yesod-bin ==1.6.1
- yesod-core ==1.6.18.8
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.6
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.4
- yesod-paginator ==1.1.1.0
@ -2790,8 +2805,12 @@ package-maintainers:
roberth:
- arion-compose
- hercules-ci-agent
- hercules-ci-api
- hercules-ci-api-agent
- hercules-ci-api-core
- hercules-ci-cli
- hercules-ci-cnix-expr
- hercules-ci-cnix-store
cdepillabout:
- pretty-simple
- spago
@ -2807,6 +2826,7 @@ package-maintainers:
- releaser
- taskwarrior
- haskell-language-server
- shake-bench
sorki:
- cayene-lpp
- data-stm32
@ -3070,7 +3090,6 @@ broken-packages:
- acme-zero
- acousticbrainz-client
- ActionKid
- active
- activehs
- activehs-base
- activitypub
@ -3181,7 +3200,6 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- amazonka
- amazonka-s3-streaming
- amby
- AMI
@ -3837,7 +3855,6 @@ broken-packages:
- cabal-install-bundle
- cabal-install-ghc72
- cabal-install-ghc74
- cabal-install-parsers
- cabal-lenses
- cabal-meta
- cabal-mon
@ -3988,7 +4005,6 @@ broken-packages:
- character-cases
- charade
- chart-cli
- Chart-diagrams
- Chart-fltkhs
- chart-histogram
- Chart-simple
@ -4679,27 +4695,21 @@ broken-packages:
- dhrun
- dia-base
- dia-functions
- diagrams
- diagrams-boolean
- diagrams-braille
- diagrams-builder
- diagrams-cairo
- diagrams-canvas
- diagrams-contrib
- diagrams-core
- diagrams-graphviz
- diagrams-gtk
- diagrams-haddock
- diagrams-html5
- diagrams-lib
- diagrams-pandoc
- diagrams-pdf
- diagrams-pgf
- diagrams-postscript
- diagrams-qrcode
- diagrams-rasterific
- diagrams-rubiks-cube
- diagrams-svg
- diagrams-tikz
- diagrams-wx
- dib
@ -4807,7 +4817,6 @@ broken-packages:
- docrecords
- DocTest
- doctest-discover-configurator
- doctest-driver-gen
- doctest-prop
- docusign-base
- docusign-base-minimal
@ -4870,7 +4879,6 @@ broken-packages:
- dtd
- dtd-text
- dtw
- dual-tree
- dualizer
- duet
- dumb-cas
@ -5151,8 +5159,6 @@ broken-packages:
- FailureT
- fake
- fake-type
- fakedata
- fakedata-quickcheck
- faktory
- falling-turnip
- fallingblocks
@ -5344,7 +5350,6 @@ broken-packages:
- foo
- for-free
- forbidden-fruit
- force-layout
- fordo
- forecast-io
- foreign-var
@ -6454,7 +6459,6 @@ broken-packages:
- hid-examples
- hidden-char
- hie-core
- hiedb
- hieraclus
- hierarchical-clustering-diagrams
- hierarchical-exceptions
@ -8165,7 +8169,6 @@ broken-packages:
- Monocle
- monoid
- monoid-absorbing
- monoid-extras
- monoid-owns
- monoidplus
- monoids
@ -10002,6 +10005,7 @@ broken-packages:
- sha1
- shade
- shadower
- shake-bench
- shake-bindist
- shake-cabal-build
- shake-dhall
@ -10115,7 +10119,6 @@ broken-packages:
- sirkel
- sitepipe
- sixfiguregroup
- size-based
- sized-grid
- sized-types
- sized-vector
@ -10395,7 +10398,6 @@ broken-packages:
- state-plus
- state-record
- stateful-mtl
- statestack
- static-canvas
- static-closure
- static-tensor
@ -10484,7 +10486,6 @@ broken-packages:
- strictly
- string-isos
- string-quote
- string-random
- string-typelits
- stringlike
- stringtable-atom
@ -10542,12 +10543,10 @@ broken-packages:
- sv-svfactor
- SVD2HS
- svfactor
- svg-builder
- svg-builder-fork
- SVG2Q
- svg2q
- svgcairo
- SVGFonts
- svgone
- svgutils
- svm-light-utils
@ -10746,7 +10745,6 @@ broken-packages:
- testbench
- testCom
- testcontainers
- testing-feat
- testloop
- testpack
- testpattern

10
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -446,9 +446,6 @@ self: super: builtins.intersectAttrs super {
# requires an X11 display in test suite
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
# depends on 'hie' executable
lsp-test = dontCheck super.lsp-test;
# tests depend on executable
ghcide = overrideCabal super.ghcide (drv: {
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';
@ -812,4 +809,11 @@ self: super: builtins.intersectAttrs super {
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
hadolint = disableCabalFlag super.hadolint "static";
# Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH.
doctest-driver-gen = dontCheck super.doctest-driver-gen;
# Tests access internet
prune-juice = dontCheck super.prune-juice;
}

2687
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/development/haskell-modules/non-hackage-packages.nix
View file

@ -28,4 +28,8 @@ self: super: {
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
# cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
}

21
pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
, transformers, transformers-compat
}:
mkDerivation {
pname = "hercules-ci-optparse-applicative";
version = "0.16.1.0";
src = fetchgit {
url = "https://github.com/hercules-ci/optparse-applicative.git";
sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48";
rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8";
fetchSubmodules = true;
};
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
testHaskellDepends = [ base QuickCheck ];
homepage = "https://github.com/hercules-ci/optparse-applicative";
description = "Utilities and combinators for parsing command line options (fork)";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ roberth ];
}

23
pkgs/development/tools/continuous-integration/hci/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let
inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath;
bundledBins = lib.optional stdenv.isLinux runc;
pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal
(addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ])
(o: {
postInstall = ''
${o.postInstall or ""}
mkdir -p $out/libexec
mv $out/bin/hci $out/libexec
makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins}
'';
});
in pkg // {
meta = pkg.meta // {
position = toString ./default.nix + ":1";
};
}

6
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
View file

@ -1,7 +1,9 @@
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }:
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let
inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath;
bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal
@ -11,7 +13,7 @@ let
${o.postInstall or ""}
mkdir -p $out/libexec
mv $out/bin/hercules-ci-agent $out/libexec
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]}
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins}
'';
});
in pkg // {

2
pkgs/top-level/all-packages.nix
View file

@ -13482,6 +13482,8 @@ in
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
hci = callPackage ../development/tools/continuous-integration/hci { };
niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv);
ormolu = haskellPackages.ormolu.bin;