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

Merge branch 'master' into staging-next

Browse Source 
(It's a little older version of master, to bring haskell updates now.)
This commit is contained in:
Vladimír Čunát 2021-09-07 08:21:02 +02:00
commit dbc3228248
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
20 changed files with 1924 additions and 757 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": "193a13be44c51ebfc8e991b7bb53a4065129ff4d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/193a13be44c51ebfc8e991b7bb53a4065129ff4d.tar.gz",
"sha256": "08j6qx3jqcw7ydwnpjr132l2mlpq6dqvwqgm3gq0ym4kjzrbdwsd",
"msg": "Update from Hackage at 2021-08-23T13:50:03Z"
"commit": "182ca4558e20c333fb3f4c659b2af4267d4d9b46",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/182ca4558e20c333fb3f4c659b2af4267d4d9b46.tar.gz",
"sha256": "123dr3lza56nj7s53m37zm2qfvwl2qvrr2prwl0q32wzidfc12w9",
"msg": "Update from Hackage at 2021-09-03T13:28:39Z"
}

4
pkgs/development/compilers/ghc/8.10.2-binary.nix
View File

@ -374,6 +374,8 @@ stdenv.mkDerivation rec {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
};
}

5
pkgs/development/compilers/ghc/8.10.7-binary.nix
View File

@ -386,6 +386,9 @@ stdenv.mkDerivation rec {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet ];
maintainers = with lib.maintainers; [
prusnak
domenkozar
] ++ lib.teams.haskell.members;
};
}

4
pkgs/development/compilers/ghc/8.10.7.nix
View File

@ -314,7 +314,9 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

4
pkgs/development/compilers/ghc/8.6.5-binary.nix
View File

@ -192,6 +192,8 @@ stdenv.mkDerivation rec {
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;
# build segfaults, use ghc8102Binary which has proper musl support instead
broken = stdenv.hostPlatform.isMusl;
maintainers = with lib.maintainers; [ guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
};
}

4
pkgs/development/compilers/ghc/8.8.4.nix
View File

@ -317,7 +317,9 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

4
pkgs/development/compilers/ghc/9.0.1.nix
View File

@ -298,7 +298,9 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

5
pkgs/development/compilers/ghc/9.2.1.nix
View File

@ -301,7 +301,9 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
@ -311,6 +313,7 @@ stdenv.mkDerivation (rec {
# https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726
broken = (enableIntegerSimple && hostPlatform.isMusl)
|| stdenv.hostPlatform.isDarwin;
hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms;
};
} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {

4
pkgs/development/compilers/ghc/head.nix
View File

@ -319,7 +319,9 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
maintainers = with lib.maintainers; [
guibou
] ++ lib.teams.haskell.members;
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
# ghcHEAD times out on aarch64-linux on Hydra.

2
pkgs/development/haskell-modules/HACKING.md
View File

@ -75,7 +75,7 @@ The short version is this:
---
This is the follow-up to #TODO.
This is the follow-up to #TODO. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.
```
Make sure to replace all TODO with the actual values.

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

@ -1112,34 +1112,13 @@ self: super: {
# Therefore we jailbreak it.
hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
# Jailbreak due to bounds on multiple dependencies,
# bound on pandoc needs to be patched since it is conditional
hakyll = doJailbreak (overrideCabal super.hakyll (drv: {
patches = [
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch";
sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ=";
})
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch";
sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44=";
})
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/e0c63558a82ac4347181d5d77dce7f763a1db410.patch";
sha256 = "sha256-wYlxJmq56YQ29vpVsQhO+JdL0GBezCAfkdhIdFnLYsc=";
})
];
}));
# 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
nixfmt = doJailbreak super.nixfmt;
# The test suite depends on an impure cabal-install installation in
# $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck super.cabal-install-parsers;
cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2;
# 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
gitit = doJailbreak super.gitit;
@ -1785,8 +1764,11 @@ self: super: {
# 2021-05-09 haskell-ci pins ShellCheck 0.7.1
# https://github.com/haskell-CI/haskell-ci/issues/507
# 2021-09-05 haskell-ci needs Cabal 3.4,
# cabal-install-parsers uses Cabal 3.6 since 0.4.3
haskell-ci = super.haskell-ci.override {
ShellCheck = self.ShellCheck_0_7_1;
cabal-install-parsers = self.cabal-install-parsers_0_4_2;
};
Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
@ -1950,12 +1932,9 @@ EOT
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;
distribution-nixpkgs = assert super.distribution-nixpkgs.version == "1.6.0";
overrideCabal super.distribution-nixpkgs {
version = "1.6.1";
revision = null;
sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm";
editedCabalFile = null;
};
# 2021-09-06: hadolint depends on language-docker >= 10.1
hadolint = super.hadolint.override {
language-docker = self.language-docker_10_1_1;
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

9
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -48,8 +48,13 @@ self: super: {
base16-bytestring = self.base16-bytestring_0_1_1_7;
});
# cabal-install-parsers is written for Cabal 3.4
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; };
# cabal-install-parsers is written for Cabal 3.6
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; };
# older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4
cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override {
Cabal = self.Cabal_3_4_0_0;
};
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;

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

@ -99,7 +99,7 @@ self: super: {
darcs = dontDistribute super.darcs;
# The package needs the latest Cabal version.
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_0_0; });
# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };

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

@ -43,6 +43,9 @@ self: super: {
unix = null;
xhtml = null;
# 0.12.0 introduces support for 9.2
base-compat = self.base-compat_0_12_0;
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = null;

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

@ -1586,6 +1586,7 @@ broken-packages:
- getflag
- GGg
- ggtsTC
- ghc-bignum-orphans
- ghc-clippy-plugin
- ghc-core-smallstep
- ghc-datasize
@ -2536,7 +2537,6 @@ broken-packages:
- IsNull
- iso8601-duration
- isobmff
- isocline
- isotope
- itcli
- itemfield
@ -2656,6 +2656,7 @@ broken-packages:
- KSP
- ktx
- ktx-codec
- kubernetes-client
- kuifje
- kure
- kure-your-boilerplate
@ -2664,7 +2665,6 @@ broken-packages:
- lagrangian
- lambda2js
- lambdaBase
- lambdabot-social-plugins
- lambdabot-utils
- lambda-bridge
- lambda-canvas
@ -2718,6 +2718,7 @@ broken-packages:
- layers
- layout
- layout-bootstrap
- lazify
- lazyarray
- lazyboy
- lazy-priority-queue
@ -3110,6 +3111,7 @@ broken-packages:
- monopati
- months
- monus
- monus-weighted-search
- monzo
- morfette
- morfeusz
@ -3196,6 +3198,7 @@ broken-packages:
- nanomsg-haskell
- nanoparsec
- NanoProlog
- nanovg-simple
- nanq
- naperian
- naqsha
@ -3588,9 +3591,11 @@ broken-packages:
- phoityne
- phone-numbers
- phone-push
- phonetic-languages-plus
- phonetic-languages-properties
- phonetic-languages-simplified-properties-lists
- phonetic-languages-simplified-properties-lists-double
- phonetic-languages-ukrainian-array
- phraskell
- Phsu
- phybin
@ -3800,6 +3805,7 @@ broken-packages:
- provenience
- proxy-kindness
- proxy-mapping
- prune-juice
- pseudo-trie
- PTQ
- publicsuffixlistcreate
@ -5212,6 +5218,7 @@ broken-packages:
- weighted-regexp
- welshy
- werewolf
- wgpu-hs
- Wheb
- while-lang-parser
- whim

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

@ -92,6 +92,8 @@ default-package-overrides:
- streamly-process
# dhall-nix is not part of stackage, remove if dhall >= 1.40
- dhall-nix < 1.1.22
# reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
- reflex-dom-pandoc < 1.0.0.0
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -119,6 +121,7 @@ extra-packages:
- sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
package-maintainers:
@ -240,6 +243,8 @@ package-maintainers:
- streamly
- taskwarrior
- witch
ncfavier:
- lambdabot
pacien:
- ldgallery-compiler
peti:

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

@ -1,4 +1,4 @@
# Stackage LTS 18.7
# Stackage LTS 18.8
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -140,7 +140,7 @@ default-package-overrides:
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.22.0
- amqp-utils ==0.6.1.1
- amqp-utils ==0.6.2.2
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.11
- ansi-wl-pprint ==0.6.9
@ -491,7 +491,7 @@ default-package-overrides:
- crackNum ==3.1
- crc32c ==0.0.0
- credential-store ==0.1.2
- criterion ==1.5.9.0
- criterion ==1.5.10.0
- criterion-measurement ==0.1.3.0
- cron ==0.7.0
- crypto-api ==0.13.3
@ -596,7 +596,7 @@ default-package-overrides:
- dhall ==1.39.0
- dhall-bash ==1.0.37
- dhall-json ==1.7.7
- dhall-lsp-server ==1.0.15
- dhall-lsp-server ==1.0.16
- dhall-yaml ==1.2.7
- diagrams-solve ==0.1.3
- dialogflow-fulfillment ==0.1.1.4
@ -885,20 +885,20 @@ default-package-overrides:
- geojson ==4.0.2
- getopt-generics ==0.13.0.4
- ghc-byteorder ==4.11.0.0.10
- ghc-check ==0.5.0.5
- ghc-check ==0.5.0.6
- ghc-core ==0.5.6
- ghc-events ==0.17.0
- ghc-exactprint ==0.6.4
- ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.6.20210814
- ghc-lib-parser ==8.10.6.20210814
- ghc-lib-parser-ex ==8.10.0.22
- ghc-lib ==8.10.7.20210828
- ghc-lib-parser ==8.10.7.20210828
- ghc-lib-parser-ex ==8.10.0.23
- ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.9
- ghc-source-gen ==0.4.1.0
- ghc-source-gen ==0.4.2.0
- ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.2
- ghc-trace-events ==0.1.2.3
@ -1135,7 +1135,7 @@ default-package-overrides:
- hspec-wai-json ==0.11.0
- hs-php-session ==0.0.9.3
- hsshellscript ==3.5.0
- hs-tags ==0.1.5
- hs-tags ==0.1.5.1
- HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.22
- HsYAML ==0.2.1.0
@ -1155,7 +1155,7 @@ default-package-overrides:
- http-client-openssl ==0.3.2.0
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.1
- http-common ==0.8.3.4
- http-conduit ==2.3.8
- http-date ==0.0.11
- http-directory ==0.1.8
@ -1165,7 +1165,7 @@ default-package-overrides:
- http-media ==0.8.0.0
- http-query ==0.1.0.1
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.8.1
- http-streams ==0.8.9.4
- http-types ==0.12.3
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.2.0
@ -1248,11 +1248,11 @@ default-package-overrides:
- inliterate ==0.1.0
- input-parsers ==0.2.3
- insert-ordered-containers ==0.2.5
- inspection-testing ==0.4.5.0
- inspection-testing ==0.4.6.0
- instance-control ==0.1.2.0
- int-cast ==0.2.0.0
- integer-logarithms ==1.0.3.1
- integer-roots ==1.0
- integer-roots ==1.0.0.1
- integration ==0.2.1
- intern ==0.9.4
- interpolate ==0.2.1
@ -1639,7 +1639,7 @@ default-package-overrides:
- nonce ==1.0.7
- nondeterminism ==1.4
- non-empty ==0.3.3
- nonempty-containers ==0.3.4.1
- nonempty-containers ==0.3.4.3
- nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.4
- nonempty-vector ==0.2.1.0
@ -1818,7 +1818,7 @@ default-package-overrides:
- posix-paths ==0.3.0.0
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.4
- postgresql-binary ==0.12.4.1
- postgresql-libpq ==0.9.4.3
- postgresql-libpq-notify ==0.2.0.0
- postgresql-orm ==0.5.1
@ -1865,7 +1865,7 @@ default-package-overrides:
- project-template ==0.2.1.0
- prometheus ==2.2.2
- prometheus-client ==1.0.1
- prometheus-metrics-ghc ==1.0.1.1
- prometheus-metrics-ghc ==1.0.1.2
- prometheus-wai-middleware ==1.0.1.0
- promises ==0.3
- prompt ==0.1.1.2
@ -2035,7 +2035,7 @@ default-package-overrides:
- safe-foldable ==0.1.0.0
- safeio ==0.0.5.0
- safe-json ==1.1.1.1
- safe-money ==0.9
- safe-money ==0.9.1
- SafeSemaphore ==0.10.1
- safe-tensor ==0.2.1.1
- saltine ==0.1.1.1
@ -2237,7 +2237,7 @@ default-package-overrides:
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- stm-lifted ==2.5.0.0
- STMonadTrans ==0.4.5
- STMonadTrans ==0.4.6
- stm-split ==0.0.2.1
- stopwatch ==0.1.0.6
- storable-complex ==0.2.3.0
@ -2318,7 +2318,7 @@ default-package-overrides:
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.3.0
- tasty ==1.4.1
- tasty ==1.4.2
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.5
- tasty-dejafu ==2.0.0.8
@ -2373,7 +2373,7 @@ default-package-overrides:
- text-ldap ==0.1.1.13
- textlocal ==0.1.0.5
- text-manipulate ==0.3.0.0
- text-metrics ==0.3.0
- text-metrics ==0.3.1
- text-postgresql ==0.0.3.1
- text-printer ==0.5.0.1
- text-regex-replace ==0.1.1.4
@ -2459,7 +2459,7 @@ default-package-overrides:
- triplesec ==0.2.2.1
- trivial-constraint ==0.7.0.0
- tsv2csv ==0.1.0.2
- ttc ==1.1.0.1
- ttc ==1.1.0.2
- ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
@ -2602,7 +2602,7 @@ default-package-overrides:
- wai-middleware-auth ==0.2.5.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-prometheus ==1.0.0
- wai-middleware-prometheus ==1.0.0.1
- wai-middleware-static ==0.9.0
- wai-rate-limit ==0.1.0.0
- wai-rate-limit-redis ==0.1.0.0

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

@ -962,6 +962,7 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- dl-fedora_0_9_1
- dmenu-pkill
- dmenu-pmount
- dmenu-search
@ -979,6 +980,7 @@ dont-distribute-packages:
- dph-prim-interface
- dph-prim-par
- dph-prim-seq
- dprox
- dropbox-sdk
- dropsolve
- dsh-sql
@ -1232,6 +1234,7 @@ dont-distribute-packages:
- gnss-converters
- gnuidn
- goal-geometry
- goal-graphical
- goal-probability
- goal-simulation
- goat
@ -1698,6 +1701,7 @@ dont-distribute-packages:
- ideas-math
- ideas-math-types
- ideas-statistics
- if-instance
- ige-mac-integration
- ihaskell-inline-r
- ihaskell-rlangqq
@ -1865,8 +1869,6 @@ dont-distribute-packages:
- lambda-options
- lambdaFeed
- lambdaLit
- lambdabot
- lambdabot-xmpp
- lambdabot-zulip
- lambdacms-media
- lambdacube
@ -2302,6 +2304,10 @@ dont-distribute-packages:
- peyotls-codec
- pgsql-simple
- phonetic-languages-examples
- phonetic-languages-general
- phonetic-languages-simplified-examples-array
- phonetic-languages-simplified-examples-common
- phonetic-languages-simplified-generalized-examples-array
- phonetic-languages-simplified-lists-examples
- phooey
- photoname

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

@ -950,4 +950,8 @@ self: super: builtins.intersectAttrs super {
})
)
);
# Test suite is just the default example executable which doesn't work if not
# executed by Setup.hs, but works if started on a proper TTY
isocline = dontCheck super.isocline;
}

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

File diff suppressed because it is too large Load Diff