3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #142641 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
Dennis Gosnell 2021-11-05 15:41:57 +09:00 committed by GitHub
commit 4269070d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 1298 additions and 400 deletions

View file

@ -1,6 +1,6 @@
{
"commit": "b60d5f4b773d16857c105718faad9699e145edcd",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b60d5f4b773d16857c105718faad9699e145edcd.tar.gz",
"sha256": "19avxynbjhkhvjy5kcxgd3fp0b2nczsk213s1za488r6kksj90f5",
"msg": "Update from Hackage at 2021-10-18T14:27:09Z"
"commit": "f2537d46db49014726f8ad00dcc60f5e41213397",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f2537d46db49014726f8ad00dcc60f5e41213397.tar.gz",
"sha256": "021j2xn1xk8fqs7648si42n7z6rjzp4jnags4jkfnk1f81swns6h",
"msg": "Update from Hackage at 2021-10-23T04:57:02Z"
}

View file

@ -142,24 +142,14 @@ let
in
stdenv.mkDerivation (rec {
version = "9.2.0.20210821";
version = "9.2.1";
pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw";
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "f444012f97a136d9940f77cdff03fda48f9475e2ed0fec966c4d35c4df55f746";
};
patches = [
# picked from release branch, remove with the next release candidate,
# see https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726
(fetchpatch {
name = "fix-darwin-link-failure.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/77456387025ca74299ecc70621cbdb62b1b6ffc9.patch";
sha256 = "1g8smrn7hj8cbp9fhrylvmrb15s0xd8lhdgxqnx0asnd4az82gj8";
})
];
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
@ -255,7 +245,7 @@ stdenv.mkDerivation (rec {
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): use XATTR env var after backport of
# TODO(@sternenseemann): backport addition of XATTR env var like
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
];

View file

@ -1,14 +0,0 @@
diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs
index 8b538bc..2b74fce 100644
--- a/Data/Vector/Storable/Mutable.hs
+++ b/Data/Vector/Storable/Mutable.hs
@@ -197,7 +197,9 @@ storableSet (MVector n fp) x
1 -> storableSetAsPrim n fp x (undefined :: Word8)
2 -> storableSetAsPrim n fp x (undefined :: Word16)
4 -> storableSetAsPrim n fp x (undefined :: Word32)
+#if !defined(ghcjs_HOST_OS)
8 -> storableSetAsPrim n fp x (undefined :: Word64)
+#endif
_ -> unsafeWithForeignPtr fp $ \p -> do
poke p x

View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-09-28";
version = "unstable-2021-10-23";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b4d893ed1a7a66b0046dd8a48f62b81de670ab02.tar.gz";
sha256 = "0xl5a0gfxrqz8pkx43zrj84xvcg15723lgvirxdcvc4zqa732zjg";
url = "https://github.com/NixOS/cabal2nix/archive/8aeef87436468a416e5908b48ec82ac3f15eb885.tar.gz";
sha256 = "1w6wabp0v2fii5i28nsp0ss6dsz222p94mmxrrns3q0df82s2cm1";
};
isLibrary = true;
isExecutable = true;

View file

@ -281,7 +281,9 @@ self: super: {
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
matplotlib = dontCheck super.matplotlib;
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_64_2;
}));
memcache = dontCheck super.memcache;
metrics = dontCheck super.metrics;
milena = dontCheck super.milena;
@ -631,20 +633,7 @@ self: super: {
# removed when the next idris release (1.3.4 probably) comes
# around.
idris = generateOptparseApplicativeCompletion "idris"
(doJailbreak (dontCheck
(appendPatches super.idris [
# compatibility with haskeline >= 0.8
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/commit/89a87cf666eb8b27190c779e72d0d76eadc1bc14.patch";
sha256 = "0fv493zlpgjsf57w0sncd4vqfkabfczp3xazjjmqw54m9rsfix35";
})
# compatibility with megaparsec >= 0.9
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/commit/6ea9bc913877d765048d7cdb7fc5aec60b196fac.patch";
sha256 = "0yms74d1xdxd1c08dnp45nb1ddzq54n6hqgzxx0r494wy614ir8q";
})
])
));
(doJailbreak (dontCheck super.idris));
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
@ -692,19 +681,17 @@ self: super: {
# For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
size-based = doJailbreak super.size-based;
# Remove as soon as we update to monoid-extras 0.6 and unpin these packages
dual-tree = doJailbreak super.dual-tree;
diagrams-core = doJailbreak super.diagrams-core;
# https://github.com/diagrams/diagrams-braille/issues/1
diagrams-braille = doJailbreak super.diagrams-braille;
# Apply patch from master to add compat with optparse-applicative >= 0.16.
# We unfortunately can't upgrade to 1.4.4 which includes this patch yet
# since it would require monoid-extras 0.6 which breaks other diagrams libs.
diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
(pkgs.fetchpatch {
url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ];
}));
# https://github.com/timbod7/haskell-chart/pull/231#issuecomment-953745932
Chart-diagrams = doJailbreak super.Chart-diagrams;
# https://github.com/xu-hao/namespace/issues/1
namespace = doJailbreak super.namespace;
# https://github.com/cchalmers/plots/issues/46
plots = doJailbreak super.plots;
# https://github.com/diagrams/diagrams-solve/issues/4
diagrams-solve = dontCheck super.diagrams-solve;
@ -1132,8 +1119,10 @@ self: super: {
});
# Chart-tests needs and compiles some modules from Chart itself
Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: {
preCheck = old.postPatch or "" + ''
Chart-tests = overrideCabal (addExtraLibrary super.Chart-tests self.QuickCheck) (old: {
# https://github.com/timbod7/haskell-chart/issues/233
jailbreak = true;
preCheck = old.preCheck or "" + ''
tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src}
'';
});
@ -2071,4 +2060,12 @@ EOT
# file revision on hackage was gifted CRLF line endings
gogol-core = appendPatch super.gogol-core ./patches/gogol-core-144.patch;
# cabal tries to install files we're supplying from the system
# https://github.com/hslua/hslua/pull/103
lua = appendPatch super.lua (pkgs.fetchpatch {
url = "https://github.com/hslua/hslua/pull/103/commits/814bf1bb284151e827b1c11a7277819ed2779dd2.patch";
sha256 = "1kj0g51lkjyf6jv2ikayb3cfh0dcr669swmxl9a2mcrizxcbkrhy";
stripLen = 1;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -43,6 +43,11 @@ self: super: {
unix = null;
xhtml = null;
# Workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/20594
tf-random = overrideCabal super.tf-random {
doHaddock = !pkgs.stdenv.isAarch64;
};
aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch";
sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl";
@ -239,12 +244,10 @@ self: super: {
# https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry;
# Disable tests pending resolution of
# https://github.com/haskell/text/issues/380 or https://github.com/fpco/streaming-commons/issues/60
streaming-commons = dontCheck (appendPatch super.streaming-commons (pkgs.fetchpatch {
streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch";
sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";
}));
});
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_4.overrideScope (self: super: {

View file

@ -101,9 +101,6 @@ self: super:
# still present here https://github.com/glguy/th-abstraction/issues/53
th-abstraction = dontCheck super.th-abstraction;
# https://github.com/haskell/vector/issues/410
vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch) ;
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
zenc = dontCheck super.zenc;
}

View file

@ -88,7 +88,6 @@ broken-packages:
- aeson-tiled
- aeson-typescript
- aeson-utils
- aeson-via
- affection
- affine-invariant-ensemble-mcmc
- Agata
@ -128,6 +127,7 @@ broken-packages:
- alure
- amazon-emailer
- amazonka-contrib-rds-utils
- amazonka-mediaconvert
- amazonka-s3-streaming
- amazon-products
- amby
@ -499,7 +499,6 @@ broken-packages:
- bytestring-show
- bytestring-substring
- bytestring-time
- bytestring-trie
- bytestring-typenats
- c0parser
- c10k
@ -841,6 +840,7 @@ broken-packages:
- CoreErlang
- core-haskell
- corenlp-parser
- core-telemetry
- Coroutine
- coroutine-object
- CouchDB
@ -1051,7 +1051,6 @@ broken-packages:
- dia-base
- diagrams-boolean
- diagrams-builder
- diagrams-canvas
- diagrams-graphviz
- diagrams-gtk
- diagrams-pdf
@ -1330,6 +1329,7 @@ broken-packages:
- expresso
- extcore
- extended-categories
- extensible
- extensible-effects-concurrent
- extensible-skeleton
- external-sort
@ -1921,6 +1921,7 @@ broken-packages:
- hashable-orphans
- hashabler
- hashed-storage
- hashes
- hashring
- hashtables-plus
- hasim
@ -2339,6 +2340,8 @@ broken-packages:
- hslogger-reader
- hslogger-template
- hs-logo
- hslua-examples
- hslua-module-version
- hsluv-haskell
- hsmagick
- hsmodetweaks
@ -2470,7 +2473,6 @@ broken-packages:
- hw-json-simd
- hw-mquery
- hworker
- hw-prim-bits
- hw-simd
- hwsl2
- hx
@ -2845,6 +2847,7 @@ broken-packages:
- libtagc
- libxls
- libxslt
- libyaml-streamly
- lie
- life-sync
- lifted-protolude
@ -3656,6 +3659,7 @@ broken-packages:
- persistent-mongoDB
- persistent-mysql-haskell
- persistent-odbc
- persistent-postgresql-streaming
- persistent-protobuf
- persistent-ratelimit
- persistent-redis
@ -3757,6 +3761,7 @@ broken-packages:
- pointful
- pointless-haskell
- pokemon-go-protobuf-types
- poker-base
- poker-eval
- pokitdok
- polar-configfile
@ -4123,6 +4128,7 @@ broken-packages:
- resource-effect
- resource-embed
- restartable
- rest-rewrite
- restyle
- resumable-exceptions
- rethinkdb
@ -4810,7 +4816,6 @@ broken-packages:
- tapioca
- TaskMonad
- tasty-auto
- tasty-checklist
- tasty-fail-fast
- tasty-grading-system
- tasty-hedgehog-coverage
@ -4827,6 +4832,7 @@ broken-packages:
- tds
- teams
- teeth
- telega
- telegram
- telegram-api
- telegram-bot-simple

View file

@ -72,18 +72,6 @@ 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
# 2021-05-11: not all diagrams libraries have adjusted to
# monoid-extras 0.6 yet, keep them pinned to lower versions
# until we can do a full migration, see
# https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin at most until base 4.15
# Since the monoid-extras adjustment was combined with
# a major release in some cases, we need to wait for
# diagrams 1.5 to be released.
- monoid-extras < 0.6
- dual-tree < 0.2.3.0
- diagrams-core < 1.5.0
- diagrams-lib < 1.4.4
# streamly-* packages which are not in stackage and to be constrained
# as long as we have streamly < 0.8.0
- streamly-archive < 0.1.0

View file

@ -221,9 +221,6 @@ dont-distribute-packages:
- IORefCAS
- IndexedList
- InfixApplicative
- JSON-Combinator
- JSON-Combinator-Examples
- JSONb
- Javasf
- JsContracts
- JsonGrammar
@ -234,7 +231,6 @@ dont-distribute-packages:
- KiCS-debugger
- KiCS-prophecy
- LDAPv3
- LambdaDesigner
- LambdaINet
- LambdaPrettyQuote
- LambdaShell
@ -408,7 +404,6 @@ dont-distribute-packages:
- agda-snippets-hakyll
- agentx
- aip
- airship
- aivika-distributed
- algebra-checkers
- algebra-driven-design
@ -1003,7 +998,6 @@ dont-distribute-packages:
- dph-prim-interface
- dph-prim-par
- dph-prim-seq
- dprox
- dropbox-sdk
- dropsolve
- dsh-sql
@ -1045,6 +1039,7 @@ dont-distribute-packages:
- enumeration
- enumerator-fd
- enumerator-tf
- envy-extensible
- ephemeral
- erf-native
- eros-client
@ -1053,6 +1048,7 @@ dont-distribute-packages:
- errors-ext
- ersatz-toysat
- esotericbot
- esqueleto-streaming
- estreps
- eternity
- eternity-timestamped
@ -1724,8 +1720,6 @@ dont-distribute-packages:
- iException
- ice40-prim
- ide-backend
- ide-backend-common
- ide-backend-server
- ideas-math
- ideas-math-types
- ideas-statistics
@ -1832,7 +1826,6 @@ dont-distribute-packages:
- json-tokens
- json2-hdbc
- jsons-to-schema
- jspath
- jvm
- jvm-batching
- jvm-streaming
@ -1904,10 +1897,6 @@ dont-distribute-packages:
- lambdacube
- lambdacube-bullet
- lambdacube-compiler
- lambdacube-core
- lambdacube-edsl
- lambdacube-engine
- lambdacube-examples
- lambdacube-gl
- lambdacube-samples
- lambdaya-bus
@ -2871,6 +2860,8 @@ dont-distribute-packages:
- sql-simple-postgresql
- sql-simple-sqlite
- sqlite-simple-typed
- squeal-postgresql-ltree
- squeal-postgresql-uuid-ossp
- squeeze
- sr-extra
- sscgi
@ -2995,7 +2986,6 @@ dont-distribute-packages:
- testbench
- text-json-qq
- text-plus
- text-trie
- text-xml-generic
- textmatetags
- th-alpha
@ -3097,7 +3087,6 @@ dont-distribute-packages:
- typson-esqueleto
- typson-selda
- u2f
- uber
- ucam-webauth
- uhc-light
- uhc-util
@ -3205,7 +3194,6 @@ dont-distribute-packages:
- web-routes-regular
- web-routing
- web3
- webapi
- webcrank-wai
- webdriver-w3c
- webserver
@ -3284,6 +3272,7 @@ dont-distribute-packages:
- yam-web
- yaml-rpc-scotty
- yaml-rpc-snap
- yaml-streamly
- yaml-unscrambler
- yarr-image-io
- yavie

File diff suppressed because it is too large Load diff

View file

@ -205,7 +205,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
let
filter = path: type:
pkgs.lib.hasSuffix "${name}.cabal" path ||
pkgs.lib.hasSuffix ".cabal" path ||
baseNameOf path == "package.yaml";
expr = self.haskellSrc2nix {
inherit name extraCabal2nixOptions;

View file

@ -49,5 +49,8 @@ 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;
};
}

View file

@ -182,7 +182,7 @@ let
hledger-web
hlint
hpack
hyper-haskell
# hyper-haskell # depends on electron-10.4.7 which is marked as insecure
hyper-haskell-server-with-packages
icepeak
idris