b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

all-cabal-hashes: 2023-07-19T20:56:38Z -> 2023-07-24T19:28:29Z

Browse source 
The main motivation for this is that the latest versions of hspec-core
and hspec-expectations got out of sync due to an unlucky timing on the
hackage snapshot update. As a consequence, we weren't able to build
cabal-install in some package sets. Additionally, this brings a version
of futhark that can be built with the lsp version we ship.

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
and maintainers/scripts/haskell/regenerate-hackage-packages.nix.

Additional changes:

* Adapt to new xhtml version (still doesn't match the version normally
  shipped by the respective GHC as a core library).

* Adapt to new versions of hspec* and pandoc
This commit is contained in:
sternenseemann 2023-07-24 22:29:06 +02:00
parent 5c13e0de26
commit 500b36d057
9 changed files with 429 additions and 191 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": "e77d5a3a5c42ac250ea50152727d734f46796e27",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e77d5a3a5c42ac250ea50152727d734f46796e27.tar.gz",
"sha256": "09qcfza0657j0s3wbyj2cqk8cbh4z0yq8930jayagdzf9irwmrzx",
"msg": "Update from Hackage at 2023-07-19T20:56:38Z"
"commit": "4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f.tar.gz",
"sha256": "0yhymzcsls48hf44ncd79xn786rfh4k70h78w7b0ihn7lrjgsynv",
"msg": "Update from Hackage at 2023-07-24T19:28:29Z"
}

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

@ -57,15 +57,15 @@ self: super: {
# not solvable short of recompiling GHC. Instead of adding
# allowInconsistentDependencies for all reverse dependencies of hspec-core,
# just upgrade to an hspec version without the offending dependency.
hspec-core = cself.hspec-core_2_11_3;
hspec-discover = cself.hspec-discover_2_11_3;
hspec = cself.hspec_2_11_3;
hspec-core = cself.hspec-core_2_11_4;
hspec-discover = cself.hspec-discover_2_11_4;
hspec = cself.hspec_2_11_4;
# hspec-discover and hspec-core depend on hspec-meta for testing which
# we need to avoid since it depends on ghc as well. Since hspec*_2_11*
# are overridden to take the versioned attributes as inputs, we need
# to make sure to override the versioned attribute with this fix.
hspec-discover_2_11_3 = dontCheck csuper.hspec-discover_2_11_3;
hspec-discover_2_11_4 = dontCheck csuper.hspec-discover_2_11_4;
# Prevent dependency on doctest which causes an inconsistent dependency
# due to depending on ghc which depends on directory etc.
@ -297,7 +297,7 @@ self: super: {
})
# Overriding the version pandoc dependency uses as the latest release has version bounds
# defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage.
] (super.patat.override { pandoc = self.pandoc_3_1_5; });
] (super.patat.override { pandoc = self.pandoc_3_1_6; });
# The latest release on hackage has an upper bound on containers which
# breaks the build, though it works with the version of containers present
@ -1732,14 +1732,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give latest hspec correct dependency versions without overrideScope
hspec_2_11_3 = doDistribute (super.hspec_2_11_3.override {
hspec-discover = self.hspec-discover_2_11_3;
hspec-core = self.hspec-core_2_11_3;
hspec_2_11_4 = doDistribute (super.hspec_2_11_4.override {
hspec-discover = self.hspec-discover_2_11_4;
hspec-core = self.hspec-core_2_11_4;
});
hspec-discover_2_11_3 = doDistribute super.hspec-discover_2_11_3;
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_3
hspec-discover_2_11_4 = doDistribute super.hspec-discover_2_11_4;
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_4
# is overlayed to hspec-core.
hspec-core_2_11_3 = doDistribute (dontCheck (super.hspec-core_2_11_3.override {
hspec-core_2_11_4 = doDistribute (dontCheck (super.hspec-core_2_11_4.override {
hspec-expectations = self.hspec-expectations_0_8_4;
}));
@ -1907,7 +1907,7 @@ self: super: {
inherit (let
pandoc-cli-overlay = self: super: {
# pandoc-cli requires pandoc >= 3.1
pandoc = self.pandoc_3_1_5;
pandoc = self.pandoc_3_1_6;
# pandoc depends on crypton-connection, which requires tls >= 1.7
tls = self.tls_1_7_0;
@ -1918,11 +1918,11 @@ self: super: {
};
in {
pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay;
pandoc_3_1_5 = doDistribute (super.pandoc_3_1_5.overrideScope pandoc-cli-overlay);
pandoc_3_1_6 = doDistribute (super.pandoc_3_1_6.overrideScope pandoc-cli-overlay);
pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
})
pandoc-cli
pandoc_3_1_5
pandoc_3_1_6
pandoc-lua-engine
;

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

@ -46,7 +46,7 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
Cabal-syntax = self.Cabal-syntax_3_6_0_0;

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

@ -45,7 +45,7 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
Cabal-syntax = self.Cabal-syntax_3_6_0_0;

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

@ -45,7 +45,7 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# These core package only exist for GHC >= 9.4. The best we can do is feign
# their existence to callPackages, but their is no shim for lower GHC versions.
system-cxx-std-lib = null;

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

@ -47,7 +47,7 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
Cabal-syntax = self.Cabal-syntax_3_6_0_0;

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

@ -47,7 +47,7 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
Cabal-syntax = self.Cabal-syntax_3_6_0_0;

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

@ -53,7 +53,7 @@ in {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0;
# consequences of doctest breakage follow:

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

File diff suppressed because it is too large Load diff