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

Merge pull request #154461 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2022-01-19 09:42:03 +08:00 committed by GitHub
commit 7682f18720
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 1826 additions and 554 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": "52e5aa39956d0d5a8158320897630fed86ec2ed3",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz",
"sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz",
"msg": "Update from Hackage at 2022-01-05T00:50:25Z"
"commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz",
"sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27",
"msg": "Update from Hackage at 2022-01-14T12:47:41Z"
}

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

@ -181,7 +181,8 @@ self: super: {
# base bound
digit = doJailbreak super.digit;
hnix = generateOptparseApplicativeCompletion "hnix"
# hnix.patch needed until the next release is bumped
hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"
(overrideCabal (drv: {
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
doCheck = false;
@ -189,7 +190,7 @@ self: super: {
# needs newer version of relude and semialign than stackage has
relude = self.relude_1_0_0_1;
semialign = self.semialign_1_2_0_1;
}));
})));
# Fails for non-obvious reasons while attempting to use doctest.
focuslist = dontCheck super.focuslist;
@ -1185,7 +1186,6 @@ self: super: {
# 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;
@ -1522,7 +1522,10 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
# substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363
hercules-ci-agent = overrideCabal { preConfigure = ''
substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version"
''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [
unmarkBroken
@ -1862,29 +1865,22 @@ self: super: {
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;
# 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;
};
# 2022-01-16 haskell-ci needs Cabal 3.6,
haskell-ci = super.haskell-ci.overrideScope (self: super: {
attoparsec = self.attoparsec_0_14_4;
Cabal = self.Cabal_3_6_2_0;
});
# Build haskell-ci from git repository, including some useful fixes,
# e. g. required for generating the workflows for the cabal2nix repository
haskell-ci-unstable = (overrideSrc rec {
version = "0.13.20211116-${builtins.substring 0 7 src.rev}";
# Build haskell-ci from git repository
haskell-ci-unstable = overrideSrc rec {
version = "0.14.1-${builtins.substring 0 7 src.rev}";
src = pkgs.fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "b61df11e7f6010ce09920c231321ab1545a990b5";
sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy";
rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";
sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";
};
} super.haskell-ci).overrideScope (self: super: {
attoparsec = self.attoparsec_0_14_3;
Cabal = self.Cabal_3_6_2_0;
});
} self.haskell-ci;
Frames-streamly = super.Frames-streamly.override {
relude = super.relude_1_0_0_1;

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

@ -49,11 +49,6 @@ self: super: {
# cabal-install-parsers is written for Cabal 3.6
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_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_1_0;
};
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;
system-fileio = doJailbreak super.system-fileio;

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

@ -83,7 +83,7 @@ self: super: {
# Jailbreaks & Version Updates
assoc = doJailbreak super.assoc;
async = doJailbreak super.async;
attoparsec = super.attoparsec_0_14_3;
attoparsec = super.attoparsec_0_14_4;
base64-bytestring = doJailbreak super.base64-bytestring;
base-compat = self.base-compat_0_12_1;
base-compat-batteries = self.base-compat-batteries_0_12_1;
@ -102,23 +102,23 @@ self: super: {
genvalidity-hspec = self.genvalidity-hspec_1_0_0_0;
ghc-byteorder = doJailbreak super.ghc-byteorder;
ghc-exactprint = overrideCabal (drv: {
# HACK: ghc-exactprint 1.3.0 is not buildable for GHC < 9.2,
# HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2,
# but hackage2nix evaluates the cabal file with GHC 8.10.*,
# causing the build-depends to be skipped. Since the dependency
# list hasn't changed much since 0.6.4, we can just reuse the
# normal expression.
inherit (self.ghc-exactprint_1_3_0) src version;
inherit (self.ghc-exactprint_1_4_1) src version;
revision = null; editedCabalFile = null;
libraryHaskellDepends = [
self.fail
self.ordered-containers
] ++ drv.libraryHaskellDepends or [];
}) super.ghc-exactprint;
ghc-lib = self.ghc-lib_9_2_1_20211101;
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
ghc-lib = self.ghc-lib_9_2_1_20220109;
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;
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_1;
hashable = super.hashable_1_4_0_2;
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);
@ -131,13 +131,13 @@ self: super: {
ormolu = self.ormolu_0_4_0_0;
OneTuple = super.OneTuple_0_3_1;
parallel = doJailbreak super.parallel;
path = doJailbreak super.path_0_9_1;
path = doJailbreak super.path_0_9_2;
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
primitive = doJailbreak super.primitive;
quickcheck-instances = super.quickcheck-instances_0_3_27;
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
retrie = doDistribute self.retrie_1_2_0_0;
retrie = doDistribute self.retrie_1_2_0_1;
semialign = super.semialign_1_2_0_1;
singleton-bool = doJailbreak super.singleton-bool;
scientific = doJailbreak super.scientific;
@ -234,7 +234,7 @@ self: super: {
sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
};
} (super.hlint_3_3_6.overrideScope (self: super: {
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
}))
);

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

@ -455,6 +455,7 @@ broken-packages:
- brick-dropdownmenu
- bricks-internal
- brillig
- broadcast-chan-tests
- broccoli
- brok
- broker-haskell
@ -571,6 +572,7 @@ broken-packages:
- capnp
- capped-list
- capri
- captcha-core
- caramia
- carbonara
- cardano-coin-selection
@ -3881,6 +3883,7 @@ broken-packages:
- pretty-ncols
- prettyprinter-vty
- prim-array
- primecount
- primes-type
- prim-instances
- PrimitiveArray-Pretty
@ -4452,6 +4455,8 @@ broken-packages:
- show-prettyprint
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-backend-static
- Shpadoinkle-html
- Shpadoinkle-isreal
- Shpadoinkle-streaming
- Shpadoinkle-template
@ -4852,6 +4857,7 @@ broken-packages:
- tagsoup-selection
- tai
- tai64
- tailwind
- takahashi
- Takusen
- takusen-oracle

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

@ -158,8 +158,6 @@ extra-packages:
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- 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.6 # 2021-09-07: preserve for GHC 8.8.4
- ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
- ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
@ -623,3 +621,6 @@ dont-distribute-packages:
- webkitgtk3
- webkitgtk3-javascriptcore
- websnap
# glade relies on system libglade which is deprecated
- glade

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

@ -618,6 +618,8 @@ dont-distribute-packages:
- bricks-parsec
- bricks-rendering
- bricks-syntax
- broadcast-chan-conduit
- broadcast-chan-pipes
- bronyradiogermany-streaming
- brotli-conduit
- brotli-streams
@ -659,6 +661,8 @@ dont-distribute-packages:
- canteven-http
- cao
- cap
- captcha-2captcha
- captcha-capmonster
- car-pool
- carboncopy
- cartel
@ -827,6 +831,8 @@ dont-distribute-packages:
- copilot-language
- copilot-libraries
- copilot-theorem
- core-webserver-servant
- core-webserver-warp
- coroutine-enumerator
- coroutine-iteratee
- couch-simple
@ -1186,7 +1192,7 @@ dont-distribute-packages:
- funnyprint
- funsat
- fused-effects-squeal
- futhark_0_21_2
- futhark_0_21_4
- fwgl-glfw
- fwgl-javascript
- fxpak
@ -1652,6 +1658,7 @@ dont-distribute-packages:
- hsfacter
- hslogstash
- hspec-expectations-pretty
- hspec-expectations-pretty-diff_0_7_2_6
- hspec-pg-transact
- hspec-setup
- hspec-shouldbe
@ -1810,6 +1817,7 @@ dont-distribute-packages:
- ivy-web
- iyql
- j2hs
- jacinda
- jail
- java-bridge-extras
- java-character
@ -1890,6 +1898,7 @@ dont-distribute-packages:
- knead-arithmetic
- knit-haskell
- knots
- koji-tool
- korfu
- ks-test
- kurita
@ -2161,6 +2170,7 @@ dont-distribute-packages:
- mprover
- mps
- mptcp
- mptcpanalyzer
- msgpack-aeson
- msgpack-idl
- msgpack-rpc
@ -2295,7 +2305,7 @@ dont-distribute-packages:
- pairing
- panda
- pandoc-japanese-filters
- pandoc_2_16_2
- pandoc_2_17
- papa
- papa-base
- papa-base-implement
@ -2443,6 +2453,7 @@ dont-distribute-packages:
- proto3-suite
- protobuf-native
- protocol-buffers-descriptor-fork
- psql
- puffytools
- pugs-compat
- pugs-hsregex

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

@ -818,6 +818,12 @@ self: super: builtins.intersectAttrs super {
platforms = pkgs.lib.platforms.x86;
} super.geomancy;
hlint = overrideCabal (drv: {
postInstall = ''
install -Dm644 data/hlint.1 -t "$out/share/man/man1"
'' + drv.postInstall or "";
}) super.hlint;
hls-brittany-plugin = overrideCabal (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''

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

File diff suppressed because it is too large Load Diff

24
pkgs/development/haskell-modules/patches/hnix.patch Normal file
View File

@ -0,0 +1,24 @@
From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001
From: Anton Latukha <anton.latukha@gmail.com>
Date: Sun, 16 Jan 2022 18:16:50 +0200
Subject: [PATCH] fix aeson <2 support
---
src/Nix/Json.hs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs
index 3fe05269..329899e4 100644
--- a/src/Nix/Json.hs
+++ b/src/Nix/Json.hs
@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.Key as AKM
import qualified Data.Aeson.KeyMap as AKM
+#else
+import Nix.Expr.Types
#endif
import qualified Data.Vector as V
import Nix.Atoms
--
2.34.1