cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #145582 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
sterni 2021-11-18 21:32:44 +01:00 committed by GitHub
commit 511a519da1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 1510 additions and 532 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "da98cdcb5ec11aea3b1979174b3b1cab24014908",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/da98cdcb5ec11aea3b1979174b3b1cab24014908.tar.gz",
"sha256": "14qdmvlqkaixv331g1lfr8hghrvzdx45xhn69fz1g7zhv4w88jix",
"msg": "Update from Hackage at 2021-11-05T06:34:09Z"
"commit": "f38385b8e3e064360be513204f114418ea0206de",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f38385b8e3e064360be513204f114418ea0206de.tar.gz",
"sha256": "08yrxx2cslwbbrcrjn13va2vbynjrwfbkc3fs4mf9qc17bdvxmgj",
"msg": "Update from Hackage at 2021-11-12T03:22:57Z"
}

6
pkgs/development/compilers/ghc/head.nix
View file

@ -41,7 +41,7 @@
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "9.3.20210913"
, version ? "9.3.20211111"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -160,8 +160,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "64923cf295ea914db458547432237a5ed1eff571";
sha256 = "1s9sm4gf4r71lk0s7h9v217rxfwjf435q1jji90hlxz23wvmhr6d";
rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
};
enableParallelBuilding = true;

2
pkgs/development/compilers/ghcjs/8.10/default.nix
View file

@ -3,7 +3,7 @@
, callPackage
, fetchgit
, ghcjsSrcJson ? null
, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson
, ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson)
, bootPkgs
, stage0
, haskellLib

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

@ -15,6 +15,9 @@ with haskellLib;
self: super: {
# There are numerical tests on random data, that may fail occasionally
lapack = dontCheck super.lapack;
# Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
# itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
# store. Testing is done upstream.
@ -60,7 +63,7 @@ self: super: {
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
git-annex = (overrideSrc {
git-annex = overrideCabal (drv: {
src = pkgs.fetchgit {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
@ -74,11 +77,15 @@ self: super: {
rm -r $out/doc/?ndroid*
'';
};
} super.git-annex).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
patches = [
# Allows compilation with git-lfs 1.2.0
(pkgs.fetchpatch {
url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=f3326b8b5ae4d1caa5c6e3e192c58c6e064c425a";
sha256 = "1nzg4mna462ndylisyy3nfih49aznhzzf7b3krb4p9p0j1zrcy2s";
excludes = [ "doc/**" "CHANGELOG" ];
})
] ++ (drv.patches or []);
}) super.git-annex;
# Fix test trying to access /home directory
shell-conduit = overrideCabal (drv: {
@ -844,7 +851,7 @@ self: super: {
# hledger-lib 1.23 depends on doctest >= 0.18
hledger-lib_1_23 = super.hledger-lib_1_23.override {
doctest = self.doctest_0_18_1;
doctest = self.doctest_0_18_2;
};
# Copy hledger man pages from data directory into the proper place. This code
@ -1338,21 +1345,21 @@ self: super: {
resource-pool = self.hasura-resource-pool;
ekg-core = self.hasura-ekg-core;
ekg-json = self.hasura-ekg-json;
hspec = dontCheck self.hspec_2_8_3;
hspec-core = dontCheck self.hspec-core_2_8_3;
hspec-discover = dontCheck super.hspec-discover_2_8_3;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
tasty-hspec = self.tasty-hspec_1_2;
}));
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
hspec = dontCheck self.hspec_2_8_3;
hspec-core = dontCheck self.hspec-core_2_8_3;
hspec-discover = dontCheck super.hspec-discover_2_8_3;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
});
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
ekg-core = self.hasura-ekg-core;
hspec = dontCheck self.hspec_2_8_3;
hspec-core = dontCheck self.hspec-core_2_8_3;
hspec-discover = dontCheck super.hspec-discover_2_8_3;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
});
pg-client = overrideCabal (drv: {
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
@ -1427,9 +1434,10 @@ self: super: {
# 2021-09-14: Tests are broken because of undeterministic variable names
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
# 2021-03-21 Test hangs
# 2021-03-21: Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
ghcide = dontCheck super.ghcide;
# 2021-11-13: Too strict upper bound on implicit-hie-cradle
ghcide = doJailbreak (dontCheck super.ghcide);
data-tree-print = doJailbreak super.data-tree-print;
@ -2070,15 +2078,13 @@ EOT
# file revision on hackage was gifted CRLF line endings
gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core;
# 2021-11-05: patch to permit our language-docker version
# This is based on c931c0a9689cd6dff4d2083fa002414c1f08a586 from
# language-docker upstream
hadolint = appendPatch (pkgs.fetchpatch {
url = "https://github.com/hadolint/hadolint/commit/c931c0a9689cd6dff4d2083fa002414c1f08a586.patch";
sha256 = "1kv06hfn7lgrcrg56q8lq0pvdffqvmjbshazg3prlhl3kjs541f8";
excludes = [ "stack.yaml" "package.yaml" "hadolint.cabal" ];
}) (super.hadolint.override {
# Jailbreak isn't sufficient, but this is ok as it's a leaf package.
hadolint = super.hadolint.overrideScope (self: super: {
language-docker = self.language-docker_10_3_0;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck self.hspec-discover_2_8_4;
colourista = doJailbreak super.colourista;
});
# These should be updated in lockstep
@ -2086,4 +2092,9 @@ EOT
hledger-lib = self.hledger-lib_1_23;
};
# Needs brick > 0.64
nix-tree = super.nix-tree.override {
brick = self.brick_0_64_2;
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -92,7 +92,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
}) (dontCheck super.alex);
doctest = dontCheck (doJailbreak super.doctest_0_18_1);
doctest = dontCheck (doJailbreak super.doctest_0_18_2);
language-haskell-extract = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";

14
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -66,11 +66,6 @@ self: super: {
sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z";
}) super.basement);
cereal = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch";
sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128";
}) (doJailbreak super.cereal);
# Tests fail because of typechecking changes
conduit = dontCheck super.conduit;
@ -84,10 +79,7 @@ self: super: {
Cabal = self.Cabal_3_6_2_0;
});
doctest = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch";
sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1";
}) (dontCheck (doJailbreak super.doctest_0_18_1));
doctest = dontCheck (doJailbreak super.doctest_0_18_2);
# Tests fail in GHC 9.2
extra = dontCheck super.extra;
@ -115,7 +107,7 @@ self: super: {
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_0_0;
hashable-time = doJailbreak super.hashable-time;
hashable-time = doJailbreak super.hashable-time_0_3;
hedgehog = doJailbreak super.hedgehog;
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);
@ -142,7 +134,7 @@ self: super: {
tasty-hspec = doJailbreak super.tasty-hspec;
th-desugar = self.th-desugar_1_13;
these = doJailbreak super.these;
time-compat = doJailbreak super.time-compat;
time-compat = doJailbreak super.time-compat_1_9_6_1;
type-equality = doJailbreak super.type-equality;
unordered-containers = doJailbreak super.unordered-containers;
vector = doJailbreak (dontCheck super.vector);

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

@ -834,6 +834,7 @@ broken-packages:
- contstuff-monads-tf
- contstuff-transformers
- convert-annotation
- copilot-core
- copilot-sbv
- copr
- COrdering
@ -1841,7 +1842,6 @@ broken-packages:
- haddock-cheatsheet
- haddock-leksah
- haddock-test
- hadolint
- hadoop-formats
- hadoop-rpc
- hafar
@ -2790,7 +2790,7 @@ broken-packages:
- language-typescript
- language-vhdl
- language-webidl
- lapack
- lapack-hmatrix
- LargeCardinalHierarchy
- Lastik
- latest-npm-version
@ -2918,10 +2918,8 @@ broken-packages:
- llsd
- llvm-base
- llvm-ffi
- llvm-ffi-tools
- llvm-general-pure
- llvm-ht
- llvm-pkg-config
- llvm-pretty
- lmonad
- load-balancing
@ -3205,6 +3203,7 @@ broken-packages:
- morfette
- morfeusz
- morpheus-graphql-cli
- morpheus-graphql-code-gen
- morphisms-functors
- morphisms-objects
- morte
@ -4034,6 +4033,7 @@ broken-packages:
- read-bounded
- read-ctags
- read-io
- readline-in-other-words
- readline-statevar
- readme-lhs
- readshp
@ -4792,7 +4792,6 @@ broken-packages:
- syntax-trees
- syntax-trees-fork-bairyn
- synthesizer
- synthesizer-alsa
- Sysmon
- sys-process
- system-canonicalpath
@ -5354,6 +5353,7 @@ broken-packages:
- web-encodings
- WeberLogic
- webfinger-client
- webkitgtk3
- webkit-javascriptcore
- webmention
- web-output

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

@ -98,6 +98,9 @@ default-package-overrides:
- futhark < 0.20.6
# 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1
- ghc-bignum == 1.0
# 2021-11-18: lucid-{alpine, htmx} are not in stackage, so we need to downgrade them
- lucid-alpine == 0.1.0.2
- lucid-htmx == 0.1.0.2
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.

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

@ -1,4 +1,4 @@
# Stackage LTS 18.15
# Stackage LTS 18.16
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -363,7 +363,7 @@ default-package-overrides:
- cborg-json ==0.2.3.0
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.0.1
- cereal ==0.5.8.1
- cereal ==0.5.8.2
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
- cereal-vector ==0.2.0.1
@ -716,7 +716,7 @@ default-package-overrides:
- event-list ==0.1.2
- eventstore ==1.4.1
- every ==0.0.1
- exact-combinatorics ==0.2.0.10
- exact-combinatorics ==0.2.0.11
- exact-pi ==0.5.0.1
- exception-hierarchy ==0.1.0.4
- exception-mtl ==0.4.0.1
@ -835,7 +835,7 @@ default-package-overrides:
- gd ==3000.7.3
- gdp ==0.0.3.0
- general-games ==1.1.1
- generic-aeson ==0.2.0.12
- generic-aeson ==0.2.0.13
- generic-arbitrary ==0.1.0
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.1
@ -1090,7 +1090,7 @@ default-package-overrides:
- hruby ==0.3.8.1
- hsass ==0.8.0
- hs-bibutils ==6.10.0.0
- hsc2hs ==0.68.7
- hsc2hs ==0.68.8
- hscolour ==1.24.4
- hsdns ==1.8
- hsebaysdk ==0.4.1.0
@ -1269,7 +1269,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2
- ipa ==0.3.1.1
- iproute ==1.7.11
- iproute ==1.7.12
- IPv6Addr ==2.0.3
- ipynb ==0.1.0.2
- ipython-kernel ==0.10.2.1
@ -1313,7 +1313,7 @@ default-package-overrides:
- jwt ==0.10.0
- kan-extensions ==5.2.3
- kanji ==3.4.1
- katip ==0.8.6.0
- katip ==0.8.7.0
- katip-logstash ==0.1.0.0
- kawhi ==0.3.0
- kazura-queue ==0.1.0.4
@ -1458,7 +1458,7 @@ default-package-overrides:
- mathexpr ==0.3.0.0
- math-extras ==0.1.1.0
- math-functions ==0.3.4.2
- matplotlib ==0.7.5
- matplotlib ==0.7.6
- matrices ==0.5.0
- matrix ==0.3.6.1
- matrix-as-xyz ==0.1.2.2
@ -1875,7 +1875,7 @@ default-package-overrides:
- protocol-radius-test ==0.1.0.1
- protolude ==0.3.0
- proxied ==0.3.1
- psqueues ==0.2.7.2
- psqueues ==0.2.7.3
- ptr-poker ==0.1.1.4
- publicsuffix ==0.20200526
- pulse-simple ==0.1.14
@ -1946,7 +1946,7 @@ default-package-overrides:
- reanimate ==1.1.4.0
- reanimate-svg ==0.13.0.1
- rebase ==1.13.0.1
- record-dot-preprocessor ==0.2.12
- record-dot-preprocessor ==0.2.13
- record-hasfield ==1.0
- records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
@ -2386,7 +2386,7 @@ default-package-overrides:
- th-constraint-compat ==0.0.1.0
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
- th-env ==0.1.0.2
- th-env ==0.1.0.3
- these ==1.1.1.1
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
@ -2520,7 +2520,7 @@ default-package-overrides:
- universe-reverse-instances ==1.1.1
- universe-some ==1.2.1
- universum ==1.7.2
- unix-bytestring ==0.3.7.5
- unix-bytestring ==0.3.7.6
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.20

18
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -822,6 +822,7 @@ dont-distribute-packages:
- convertible-text
- coordinate
- copilot
- copilot-c99
- copilot-cbmc
- copilot-language
- copilot-libraries
@ -948,6 +949,7 @@ dont-distribute-packages:
- diagrams-pgf
- diagrams-reflex
- diagrams-wx
- dialog
- difference-monoid
- digestive-functors-hsp
- dingo-core
@ -1222,6 +1224,7 @@ dont-distribute-packages:
- ghc-mod
- ghc-tags-plugin
- ghci-pretty
- ghcjs-dom-webkit
- ghcjs-hplay
- ght
- gi-cairo-again
@ -1485,6 +1488,8 @@ dont-distribute-packages:
- hbb
- hbcd
- hbf
- hbro
- hbro-contrib
- hcg-minus-cairo
- hcheat
- hcheckers
@ -1570,7 +1575,6 @@ dont-distribute-packages:
- hmeap
- hmeap-utils
- hmep
- hmm-lapack
- hmm-lapack_0_4_1
- hmt
- hmt-diagrams
@ -1917,7 +1921,7 @@ dont-distribute-packages:
- language-python-colour
- language-qux
- language-spelling
- lapack-hmatrix
- lapack_0_4
- lat
- latex-formulae-hakyll
- latex-formulae-pandoc
@ -1962,8 +1966,6 @@ dont-distribute-packages:
- lightstep-haskell
- lighttpd-conf
- lighttpd-conf-qq
- linear-circuit
- linear-circuit_0_1_0_3
- linearmap-category
- linearscan-hoopl
- linkchk
@ -2043,8 +2045,6 @@ dont-distribute-packages:
- macosx-make-standalone
- magic-wormhole
- magicbane
- magico
- magico_0_0_2_2
- mahoro
- maid
- mail-pool
@ -2122,6 +2122,7 @@ dont-distribute-packages:
- mmark-cli
- mmark-cli_0_0_5_1
- mmark-ext
- mmark-ext_0_2_1_4
- mmtl-base
- moan
- modify-fasta
@ -2143,6 +2144,8 @@ dont-distribute-packages:
- moo-nad
- morley
- morloc
- morpheus-graphql-client_0_18_0
- morpheus-graphql_0_18_0
- morphisms-functors-inventory
- mosaico-lib
- motor-diagrams
@ -2333,6 +2336,7 @@ dont-distribute-packages:
- persona-idp
- peyotls
- peyotls-codec
- pg-entity
- pgsql-simple
- phonetic-languages-examples
- phonetic-languages-general
@ -2577,8 +2581,6 @@ dont-distribute-packages:
- replicant
- repr
- representable-tries
- resistor-cube
- resistor-cube_0_0_1_3
- resource-pool-catchio
- resource-simple
- respond

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

@ -155,6 +155,7 @@ self: super: builtins.intersectAttrs super {
github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql
hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema;
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
@ -516,25 +517,30 @@ self: super: builtins.intersectAttrs super {
})
(addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark);
git-annex = with pkgs;
if (!stdenv.isLinux) then
let path = lib.makeBinPath [ coreutils ];
in overrideCabal (_drv: {
# This is an instance of https://github.com/NixOS/nix/pull/1085
# Fails with:
# gpg: can't connect to the agent: File name too long
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Test.hs \
--replace ', testCase "crypto" test_crypto' ""
'';
# On Darwin, git-annex mis-detects options to `cp`, so we wrap the
# binary to ensure it uses Nixpkgs' coreutils.
postFixup = ''
wrapProgram $out/bin/git-annex \
--prefix PATH : "${path}"
'';
}) (addBuildTool buildPackages.makeWrapper super.git-annex)
else super.git-annex;
git-annex = let
pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ];
in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) {
# This is an instance of https://github.com/NixOS/nix/pull/1085
# Fails with:
# gpg: can't connect to the agent: File name too long
postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
substituteInPlace Test.hs \
--replace ', testCase "crypto" test_crypto' ""
'' + (drv.postPatch or "");
# On Darwin, git-annex mis-detects options to `cp`, so we wrap the
# binary to ensure it uses Nixpkgs' coreutils.
postFixup = ''
wrapProgram $out/bin/git-annex \
--prefix PATH : "${pathForDarwin}"
'' + (drv.postFixup or "");
buildTools = [
pkgs.buildPackages.makeWrapper
] ++ (drv.buildTools or []);
}) (super.git-annex.override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
});
# The test suite has undeclared dependencies on git.
githash = dontCheck super.githash;

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

File diff suppressed because it is too large Load diff

3
pkgs/development/tools/haskell/hyper-haskell/default.nix
View file

@ -49,8 +49,5 @@ in stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/HeinrichApfelmus/hyper-haskell";
license = licenses.bsd3;
maintainers = [ maintainers.rvl ];
# depends on electron-10.4.7 which is marked as insecure:
# https://github.com/NixOS/nixpkgs/pull/142641#issuecomment-957358476
broken = true;
};
}

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

@ -128,7 +128,7 @@ in {
llvmPackages = pkgs.llvmPackages_10;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc901; # no binary yet
bootPkgs = packages.ghc8107Binary;
inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and