nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192852 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2022-09-28 12:27:35 +02:00 committed by GitHub
commit f201ee917d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 566 additions and 364 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": "12bd870a1ed095ff74dbe08ef4d5d930821e878d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/12bd870a1ed095ff74dbe08ef4d5d930821e878d.tar.gz",
"sha256": "196pl60xyv4ij1nxz4hv5fhmliisb5dmxl8w1jfl07z22cpd92p5",
"msg": "Update from Hackage at 2022-09-21T15:25:15Z"
"commit": "2712aaf8b4e5941ccc467326be418c19f4192703",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2712aaf8b4e5941ccc467326be418c19f4192703.tar.gz",
"sha256": "0gsy99iqazv1cg0vznvdzf8q3zm5flv5645jx3q78fmq1rdzqwny",
"msg": "Update from Hackage at 2022-09-25T05:09:53Z"
}

28
pkgs/development/compilers/ghc/9.2.2-binary.nix → pkgs/development/compilers/ghc/9.2.4-binary.nix
View File

@ -19,8 +19,8 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
let
downloadsUrl = "https://downloads.haskell.org/ghc";
# Copy sha256 from https://downloads.haskell.org/~ghc/9.2.2/SHA256SUMS
version = "9.2.2";
# Copy sha256 from https://downloads.haskell.org/~ghc/9.2.4/SHA256SUMS
version = "9.2.4";
# Information about available bindists that we use in the build.
#
@ -46,7 +46,7 @@ let
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
sha256 = "24234486ed4508161c6f88f4750a36d38b135b0c6e5fe78efe2d85c612ecaf9e";
sha256 = "5dc1eb9c65f01b1e5c5693af72af07a4e9e75c6920e620fd598daeefa804487a";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -61,19 +61,7 @@ let
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
sha256 = "fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
{ nixPackage = gmp; fileToCheckFor = null; }
{ nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; }
];
};
armv7l-linux = {
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz";
sha256 = "ce5a7c3beb19d8c13a9e60bd39d3ba8ef0060b954ea42eb23f1ef8d077fa9e8b";
sha256 = "a77a91a39d9b0167124b7e97648b2b52973ae0978cb259e0d44f0752a75037cb";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -85,7 +73,7 @@ let
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
sha256 = "f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98";
sha256 = "fc7dbc6bae36ea5ac30b7e9a263b7e5be3b45b0eb3e893ad0bc2c950a61f14ec";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -98,7 +86,7 @@ let
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "934abbd6083d3aeb5ff081955682d7711d9e79db57b1613eb229c325dd06f83f";
sha256 = "f2e8366fd3754dd9388510792aba2d2abecb1c2f7f1e5555f6065c3c5e2ffec4";
};
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [
@ -111,7 +99,7 @@ let
variantSuffix = "";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
sha256 = "d1f04f7cc062ed134f863305c67dfe2c42df46ed658dd34f9dd552186f194e5c";
sha256 = "8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224";
};
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [
@ -127,7 +115,7 @@ let
variantSuffix = "-musl";
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz";
sha256 = "624523826e24eae33c03490267cddecc1d80c047f2a3f4b03580f1040112d5c0";
sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481";
};
isStatic = true;
# We can't check the RPATH for statically linked executable

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

@ -121,6 +121,9 @@ self: super: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
}) super.shell-conduit;
# https://github.com/cachix/cachix/pull/451
cachix = appendPatch ./patches/cachix.patch super.cachix;
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;

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

@ -454,6 +454,7 @@ broken-packages:
- BPS
- braid
- brain-bleep
- brassica
- Bravo
- brians-brain
- brick-dropdownmenu
@ -3944,7 +3945,6 @@ broken-packages:
- polysemy-mocks
- polysemy-readline
- polysemy-scoped-fs
- polysemy-zoo
- polytypeable
- pomaps
- pomohoro
@ -3959,6 +3959,8 @@ broken-packages:
- portager
- porte
- PortFusion
- portray-pretty
- portray-prettyprinter
- positron
- posix-acl
- posix-api
@ -4216,6 +4218,7 @@ broken-packages:
- reanimate-svg
- reasonable-lens
- reason-export
- rec-def
- record
- record-encode
- record-impl
@ -4357,6 +4360,7 @@ broken-packages:
- rivet-simple-deploy
- RJson
- Rlang-QQ
- rle
- rlglue
- RLP
- rl-satton
@ -4525,6 +4529,7 @@ broken-packages:
- servant-namedargs
- servant-nix
- servant-pandoc
- servant-polysemy
- servant-pool
- servant-proto-lens
- servant-purescript
@ -4649,6 +4654,7 @@ broken-packages:
- singnal
- singular-factory
- sink
- sint
- sitepipe
- sixfiguregroup
- sized-grid
@ -5055,6 +5061,7 @@ broken-packages:
- tempodb
- temporal-csound
- tempus
- ten
- tensor
- tensorflow
- tensorflow-opgen
@ -5202,6 +5209,7 @@ broken-packages:
- tomato-rubato-openal
- toml
- toml-parser
- toml-reader-parse
- tonalude
- tonaparser
- toodles

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

@ -1,4 +1,4 @@
# Stackage LTS 19.24
# Stackage LTS 19.25
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -352,7 +352,7 @@ default-package-overrides:
- clumpiness ==0.17.0.2
- ClustalParser ==1.3.0
- cmark ==0.6
- cmark-gfm ==0.2.3
- cmark-gfm ==0.2.4
- cmark-lucid ==0.1.0.0
- cmdargs ==0.10.21
- codec-beam ==0.2.0
@ -408,7 +408,7 @@ default-package-overrides:
- conferer-aeson ==1.1.0.2
- conferer-warp ==1.1.0.0
- ConfigFile ==1.1.4
- config-ini ==0.2.4.0
- config-ini ==0.2.5.0
- configuration-tools ==0.6.1
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
@ -622,7 +622,7 @@ default-package-overrides:
- drifter ==0.3.0
- drifter-postgresql ==0.2.1
- drifter-sqlite ==0.1.0.0
- dsp ==0.2.5.1
- dsp ==0.2.5.2
- dual ==0.1.1.1
- dual-tree ==0.2.3.1
- dublincore-xml-conduit ==0.1.0.2
@ -708,7 +708,7 @@ default-package-overrides:
- exomizer ==1.0.0
- experimenter ==0.1.0.12
- expiring-cache-map ==0.0.6.1
- explainable-predicates ==0.1.2.2
- explainable-predicates ==0.1.2.3
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
- express ==1.0.10
@ -846,7 +846,7 @@ default-package-overrides:
- genvalidity-bytestring ==1.0.0.0
- genvalidity-containers ==1.0.0.0
- genvalidity-criterion ==1.0.0.0
- genvalidity-hspec ==1.0.0.1
- genvalidity-hspec ==1.0.0.2
- genvalidity-hspec-aeson ==1.0.0.0
- genvalidity-hspec-binary ==1.0.0.0
- genvalidity-hspec-cereal ==1.0.0.0
@ -2135,8 +2135,8 @@ default-package-overrides:
- search-algorithms ==0.3.2
- secp256k1-haskell ==0.6.1
- securemem ==0.1.10
- selda ==0.5.1.0
- selda-sqlite ==0.1.7.1
- selda ==0.5.2.0
- selda-sqlite ==0.1.7.2
- selections ==0.3.0.0
- selective ==0.5
- semialign ==1.2.0.1
@ -2360,7 +2360,7 @@ default-package-overrides:
- string-conversions ==0.4.0.1
- string-interpolate ==0.3.1.2
- string-qq ==0.0.4
- string-random ==0.1.4.2
- string-random ==0.1.4.3
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- stripe-concepts ==1.0.3.1
@ -2510,7 +2510,7 @@ default-package-overrides:
- through-text ==0.1.0.0
- th-strict-compat ==0.1.0.1
- th-test-utils ==1.1.1
- th-utilities ==0.2.4.3
- th-utilities ==0.2.5.0
- tidal ==1.7.10
- tile ==0.3.0.0
- time-compat ==1.9.6.1
@ -2841,7 +2841,7 @@ with-compiler: ghc-9.0.2
- yesod-bin ==1.6.2.2
- yesod-core ==1.6.24.0
- yesod-eventsource ==1.6.0.1
- yesod-form ==1.7.0
- yesod-form ==1.7.2
- yesod-form-bootstrap4 ==3.0.1
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.2
@ -2854,7 +2854,7 @@ with-compiler: ghc-9.0.2
- yesod-routes-flow ==3.0.0.2
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.14
- yesod-test ==1.6.15
- yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3
- yi-rope ==0.11

14
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -1168,6 +1168,7 @@ dont-distribute-packages:
- dep-t-advice
- dep-t-dynamic
- dep-t-value
- dependent-literals
- dependent-literals-plugin
- dependent-state
- depends
@ -1201,7 +1202,6 @@ dont-distribute-packages:
- direct-rocksdb
- directory-contents
- dirfiles
- disco
- discogs-haskell
- discord-gateway
- discord-hs
@ -1283,6 +1283,7 @@ dont-distribute-packages:
- edge
- edges
- editable
- edits
- effective-aspects-mzv
- eflint
- egison
@ -1413,6 +1414,7 @@ dont-distribute-packages:
- filepath-io-access
- filesystem-abstractions
- filesystem-enumerator
- fin-int
- find-clumpiness
- findhttp
- finitary-derive
@ -2024,6 +2026,7 @@ dont-distribute-packages:
- hedgehog-gen-json
- hedis-pile
- heist-aeson
- heist-extra
- helic
- helics
- helics-wai
@ -2564,6 +2567,7 @@ dont-distribute-packages:
- ltext
- luachunk
- lucid-colonnade
- lucid2-htmx
- lucienne
- luhn
- lui
@ -2992,9 +2996,7 @@ dont-distribute-packages:
- poke
- polh-lexicon
- polydata
- polysemy-RandomFu
- polysemy-http
- polysemy-optics
- polyseq
- polytypeable-utils
- pomodoro
@ -3003,6 +3005,8 @@ dont-distribute-packages:
- porcupine-core
- porcupine-http
- porcupine-s3
- portray-diff-hunit
- portray-diff-quickcheck
- ports
- poseidon
- poseidon-postgis
@ -3390,7 +3394,6 @@ dont-distribute-packages:
- servant-matrix-param
- servant-oauth2
- servant-oauth2-examples
- servant-polysemy
- servant-postgresql
- servant-pushbullet-client
- servant-rate-limit
@ -3675,10 +3678,11 @@ dont-distribute-packages:
- tdlib
- tdlib-gen
- tdlib-types
- techlab
- telega
- telegram-bot
- telegram-raw-api
- ten-lens
- ten-unordered-containers
- tensorflow-core-ops
- tensorflow-logging
- tensorflow-ops

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

@ -154,11 +154,18 @@ self: super: builtins.intersectAttrs super {
# Add necessary reference to gtk3 package
gi-dbusmenugtk3 = addPkgconfigDepend pkgs.gtk3 super.gi-dbusmenugtk3;
hs-mesos = overrideCabal (drv: {
# Pass _only_ mesos; the correct protobuf is propagated.
extraLibraries = [ pkgs.mesos ];
preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal";
}) super.hs-mesos;
# Doesn't declare boost dependency
nix-serve-ng = overrideSrc {
src = assert super.nix-serve-ng.version == "1.0.0";
# Workaround missing files in sdist
# https://github.com/aristanetworks/nix-serve-ng/issues/10
pkgs.fetchFromGitHub {
repo = "nix-serve-ng";
owner = "aristanetworks";
rev = "433f70f4daae156b84853f5aaa11987aa5ce7277";
sha256 = "0mqp67z5mi8rsjahdh395n7ppf0b65k8rd3pvnl281g02rbr69y2";
};
} (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng);
# These packages try to access the network.
amqp = dontCheck super.amqp;
@ -949,6 +956,19 @@ self: super: builtins.intersectAttrs super {
'';
}) super.fourmolu_0_8_2_0;
# Test suite needs to execute 'disco' binary
disco = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/disco:$PATH"
'';
testFlags = drv.testFlags or [] ++ [
# Needs network access
"-p" "!/oeis/"
];
# disco-examples needs network access
testTarget = "disco-tests";
}) super.disco;
# Apply a patch which hardcodes the store path of graphviz instead of using
# whatever graphviz is in PATH.
graphviz = overrideCabal (drv: {

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

File diff suppressed because it is too large Load Diff

10
pkgs/development/haskell-modules/patches/cachix.patch Executable file
View File

@ -0,0 +1,10 @@
--- a/src/Cachix/Client/OptionsParser.hs
+++ b/src/Cachix/Client/OptionsParser.hs
@@ -15,7 +15,7 @@
import qualified Cachix.Client.URI as URI
import qualified Cachix.Deploy.OptionsParser as DeployOptions
import Options.Applicative
-import Protolude hiding (toS)
+import Protolude hiding (option, toS)
import Protolude.Conv
import qualified URI.ByteString as URI

29
pkgs/top-level/haskell-packages.nix
View File

@ -8,8 +8,8 @@ let
"ghc8102BinaryMinimal"
"ghc8107Binary"
"ghc8107BinaryMinimal"
"ghc922Binary"
"ghc922BinaryMinimal"
"ghc924Binary"
"ghc924BinaryMinimal"
"ghcjs"
"ghcjs810"
"integer-simple"
@ -86,10 +86,10 @@ in {
minimal = true;
};
ghc922Binary = callPackage ../development/compilers/ghc/9.2.2-binary.nix {
ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix {
llvmPackages = pkgs.llvmPackages_12;
};
ghc922BinaryMinimal = callPackage ../development/compilers/ghc/9.2.2-binary.nix {
ghc924BinaryMinimal = callPackage ../development/compilers/ghc/9.2.4-binary.nix {
llvmPackages = pkgs.llvmPackages_12;
minimal = true;
};
@ -192,12 +192,15 @@ in {
ghc94 = ghc942;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs =
if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc922BinaryMinimal
# For GHC 9.2.3 and 9.2.4 no armv7l bindists are available.
if stdenv.hostPlatform.isAarch32 then
packages.ghc924
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc924
else if stdenv.isAarch64 then
packages.ghc924BinaryMinimal
else
packages.ghc922Binary;
packages.ghc924Binary;
inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
@ -272,15 +275,15 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
ghc922Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc922Binary;
ghc = bh.compiler.ghc922Binary;
ghc924Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc924Binary;
ghc = bh.compiler.ghc924Binary;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
ghc922BinaryMinimal = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc922BinaryMinimal;
ghc = bh.compiler.ghc922BinaryMinimal;
ghc924BinaryMinimal = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc924BinaryMinimal;
ghc = bh.compiler.ghc924BinaryMinimal;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
packageSetConfig = bootstrapPackageSet;
};