Merge pull request #181288 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann
GitHub
commit
0f68824d86
@ -52,12 +52,15 @@ in {
|
||||
path = [ config.nix.package ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
# don't restart while changing
|
||||
restartIfChanged = false;
|
||||
# Cachix requires $USER to be set
|
||||
environment.USER = "root";
|
||||
|
||||
# don't stop the service if the unit disappears
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
|
||||
environment.USER = "root";
|
||||
serviceConfig = {
|
||||
# we don't want to kill children processes as those are deployments
|
||||
KillMode = "process";
|
||||
Restart = "on-failure";
|
||||
EnvironmentFile = cfg.credentialsFile;
|
||||
ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c096b9d83b86ab92dffac5d97927e8458ebd4dfa.tar.gz",
|
||||
"sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg",
|
||||
"msg": "Update from Hackage at 2022-07-07T10:54:07Z"
|
||||
"commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b418fc93e5dd9f19c4ca625c57e2cf984267e90.tar.gz",
|
||||
"sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx",
|
||||
"msg": "Update from Hackage at 2022-07-12T21:40:07Z"
|
||||
}
|
||||
|
||||
@ -352,15 +352,22 @@ self: super: {
|
||||
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
|
||||
matplotlib = dontCheck super.matplotlib;
|
||||
|
||||
brick_0_71_1 = super.brick_0_71_1.overrideScope (self: super: {
|
||||
brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {
|
||||
vty = self.vty_5_36;
|
||||
});
|
||||
text-zipper = self.text-zipper_0_12;
|
||||
}));
|
||||
|
||||
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
|
||||
# Needs brick ^>= 0.70
|
||||
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
||||
brick = self.brick_0_71_1;
|
||||
}));
|
||||
matterhorn = doJailbreak (appendPatches [
|
||||
# Fix build with brick 0.73
|
||||
(fetchpatch {
|
||||
name = "matterhorn-brick-0.72.patch";
|
||||
url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";
|
||||
sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";
|
||||
})
|
||||
] (super.matterhorn.overrideScope (self: super: {
|
||||
brick = self.brick_0_73;
|
||||
})));
|
||||
|
||||
memcache = dontCheck super.memcache;
|
||||
metrics = dontCheck super.metrics;
|
||||
@ -2139,14 +2146,22 @@ self: super: {
|
||||
|
||||
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
|
||||
stylish-haskell = (super.stylish-haskell.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
|
||||
});
|
||||
|
||||
ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
|
||||
};
|
||||
|
||||
ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
|
||||
};
|
||||
|
||||
hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
});
|
||||
|
||||
# To strict bound on hspec
|
||||
# https://github.com/dagit/zenc/issues/5
|
||||
zenc = doJailbreak super.zenc;
|
||||
@ -2207,9 +2222,10 @@ self: super: {
|
||||
# file revision on hackage was gifted CRLF line endings
|
||||
gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core;
|
||||
|
||||
# Too strict bound on deepseq
|
||||
# https://github.com/hadolint/hadolint/issues/800
|
||||
hadolint = doJailbreak super.hadolint;
|
||||
# Stackage LTS 19 still has 10.*
|
||||
hadolint = super.hadolint.override {
|
||||
language-docker = self.language-docker_11_0_0;
|
||||
};
|
||||
|
||||
nix-tree = super.nix-tree;
|
||||
|
||||
|
||||
@ -51,11 +51,8 @@ self: super: {
|
||||
# Tests fail because of typechecking changes
|
||||
conduit = dontCheck super.conduit;
|
||||
|
||||
# 0.30 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed
|
||||
cryptonite = assert super.cryptonite.version == "0.29"; appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch";
|
||||
sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";
|
||||
}) super.cryptonite;
|
||||
# 0.30 introduced support for GHC 9.2.
|
||||
cryptonite = doDistribute self.cryptonite_0_30;
|
||||
|
||||
# cabal-install needs more recent versions of Cabal
|
||||
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
|
||||
@ -82,7 +79,7 @@ self: super: {
|
||||
constraints = doJailbreak super.constraints;
|
||||
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
|
||||
data-fix = doJailbreak super.data-fix;
|
||||
dbus = super.dbus_1_2_24;
|
||||
dbus = self.dbus_1_2_25;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
@ -100,8 +97,8 @@ self: super: {
|
||||
self.data-default
|
||||
] ++ drv.libraryHaskellDepends or [];
|
||||
}) super.ghc-exactprint;
|
||||
ghc-lib = self.ghc-lib_9_2_3_20220527;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib = self.ghc-lib_9_2_3_20220709;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220709;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_2;
|
||||
@ -126,14 +123,6 @@ self: super: {
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
servant = doJailbreak super.servant;
|
||||
servant-auth = doJailbreak super.servant-auth;
|
||||
servant-server = appendPatches [
|
||||
# awaiting release
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-servant/servant/commit/61d0d14b5cb01db3d589101b3f17b0178f52e386.diff";
|
||||
relative = "servant-server";
|
||||
sha256 = "sha256-3lM8xLO8avVRo8oncJR8QLDSWEzOaoCmzgVtyaEBEw8=";
|
||||
})
|
||||
] (doJailbreak super.servant-server);
|
||||
servant-swagger = doJailbreak super.servant-swagger;
|
||||
servant-auth-swagger = doJailbreak super.servant-auth-swagger;
|
||||
shelly = doJailbreak super.shelly;
|
||||
@ -180,7 +169,7 @@ self: super: {
|
||||
} super.memory);
|
||||
|
||||
# Use hlint from git for GHC 9.2.1 support
|
||||
hlint = self.hlint_3_4;
|
||||
hlint = self.hlint_3_4_1;
|
||||
|
||||
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
||||
bsb-http-chunked = dontCheck super.bsb-http-chunked;
|
||||
|
||||
@ -421,6 +421,7 @@ broken-packages:
|
||||
- bizzlelude-js
|
||||
- bkr
|
||||
- blakesum
|
||||
- Blammo
|
||||
- blas
|
||||
- blaze-html-contrib
|
||||
- blaze-html-hexpat
|
||||
@ -1268,6 +1269,7 @@ broken-packages:
|
||||
- effin
|
||||
- egison-pattern-src
|
||||
- ehaskell
|
||||
- ehlo
|
||||
- ehs
|
||||
- eibd-client-simple
|
||||
- eigen
|
||||
@ -1380,6 +1382,7 @@ broken-packages:
|
||||
- exinst
|
||||
- exists
|
||||
- exitcode
|
||||
- exon
|
||||
- exp-cache
|
||||
- explain
|
||||
- explicit-constraint-lens
|
||||
@ -2150,6 +2153,7 @@ broken-packages:
|
||||
- heist-emanote
|
||||
- helic
|
||||
- helisp
|
||||
- helix
|
||||
- hell
|
||||
- helm
|
||||
- help-esb
|
||||
@ -2180,6 +2184,7 @@ broken-packages:
|
||||
- hext
|
||||
- hextra
|
||||
- heyefi
|
||||
- heystone
|
||||
- hF2
|
||||
- hfann
|
||||
- HFitUI
|
||||
@ -4146,6 +4151,7 @@ broken-packages:
|
||||
- pyfi
|
||||
- python-pickle
|
||||
- q4c12-twofinger
|
||||
- qbe
|
||||
- qc-oi-testgenerator
|
||||
- qd
|
||||
- qed
|
||||
@ -4323,6 +4329,7 @@ broken-packages:
|
||||
- relacion
|
||||
- relapse
|
||||
- relevant-time
|
||||
- reload
|
||||
- remark
|
||||
- remarks
|
||||
- remote
|
||||
@ -4655,6 +4662,7 @@ broken-packages:
|
||||
- simple-form
|
||||
- simple-genetic-algorithm
|
||||
- SimpleH
|
||||
- SimpleServer
|
||||
- simple-index
|
||||
- simpleirc
|
||||
- simple-log
|
||||
@ -4785,6 +4793,7 @@ broken-packages:
|
||||
- sodium
|
||||
- soegtk
|
||||
- softfloat-hs
|
||||
- solga
|
||||
- sonic-visualiser
|
||||
- Sonnex
|
||||
- SoOSiM
|
||||
@ -5059,6 +5068,7 @@ broken-packages:
|
||||
- tapioca
|
||||
- TaskMonad
|
||||
- tasty-auto
|
||||
- tasty-autocollect
|
||||
- tasty-fail-fast
|
||||
- tasty-grading-system
|
||||
- tasty-hedgehog-coverage
|
||||
@ -5573,6 +5583,7 @@ broken-packages:
|
||||
- wai-request-spec
|
||||
- wai-responsible
|
||||
- wai-router
|
||||
- wai-routes
|
||||
- wai-secure-cookies
|
||||
- wai-session-alt
|
||||
- wai-session-mysql
|
||||
|
||||
@ -123,6 +123,7 @@ extra-packages:
|
||||
- ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
||||
- ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
||||
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
|
||||
- ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
|
||||
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
|
||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
||||
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 19.14
|
||||
# Stackage LTS 19.15
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -91,7 +91,7 @@ default-package-overrides:
|
||||
- asn1-encoding ==0.9.6
|
||||
- asn1-parse ==0.9.5
|
||||
- asn1-types ==0.3.4
|
||||
- assert-failure ==0.1.2.5
|
||||
- assert-failure ==0.1.2.6
|
||||
- assoc ==1.0.2
|
||||
- astro ==0.4.3.0
|
||||
- async ==2.2.4
|
||||
@ -912,7 +912,7 @@ default-package-overrides:
|
||||
- gi-harfbuzz ==0.0.5
|
||||
- gi-javascriptcore ==4.0.24
|
||||
- ginger ==0.10.4.0
|
||||
- gi-pango ==1.0.25
|
||||
- gi-pango ==1.0.26
|
||||
- githash ==0.1.6.2
|
||||
- github ==0.27
|
||||
- github-release ==2.0.0.1
|
||||
@ -1051,7 +1051,7 @@ default-package-overrides:
|
||||
- hi-file-parser ==0.1.2.0
|
||||
- higher-leveldb ==0.6.0.0
|
||||
- highlighting-kate ==0.6.4
|
||||
- hindent ==5.3.2
|
||||
- hindent ==5.3.4
|
||||
- hinfo ==0.0.3.0
|
||||
- hinotify ==0.4.1
|
||||
- hint ==0.9.0.6
|
||||
@ -1481,7 +1481,7 @@ default-package-overrides:
|
||||
- markov-chain ==0.0.3.4
|
||||
- massiv ==1.0.1.1
|
||||
- massiv-io ==1.0.0.1
|
||||
- massiv-persist ==1.0.0.2
|
||||
- massiv-persist ==1.0.0.3
|
||||
- massiv-serialise ==1.0.0.2
|
||||
- massiv-test ==1.0.0.0
|
||||
- mathexpr ==0.3.0.0
|
||||
@ -1532,9 +1532,9 @@ default-package-overrides:
|
||||
- mime-mail-ses ==0.4.3
|
||||
- mime-types ==0.1.0.9
|
||||
- minimal-configuration ==0.1.4
|
||||
- minimorph ==0.3.0.0
|
||||
- minimorph ==0.3.0.1
|
||||
- minio-hs ==1.6.0
|
||||
- miniutter ==0.5.1.1
|
||||
- miniutter ==0.5.1.2
|
||||
- min-max-pqueue ==0.1.0.2
|
||||
- mintty ==0.1.4
|
||||
- missing-foreign ==0.1.1
|
||||
@ -1939,7 +1939,7 @@ default-package-overrides:
|
||||
- proto-lens ==0.7.1.1
|
||||
- proto-lens-arbitrary ==0.1.2.11
|
||||
- proto-lens-optparse ==0.1.1.9
|
||||
- proto-lens-protobuf-types ==0.7.1.1
|
||||
- proto-lens-protobuf-types ==0.7.1.2
|
||||
- proto-lens-protoc ==0.7.1.1
|
||||
- proto-lens-runtime ==0.7.0.2
|
||||
- proto-lens-setup ==0.4.0.6
|
||||
@ -2016,7 +2016,7 @@ default-package-overrides:
|
||||
- read-env-var ==1.0.0.0
|
||||
- reanimate-svg ==0.13.0.1
|
||||
- rebase ==1.15.0.3
|
||||
- record-dot-preprocessor ==0.2.14
|
||||
- record-dot-preprocessor ==0.2.15
|
||||
- record-hasfield ==1.0
|
||||
- records-sop ==0.1.1.0
|
||||
- record-wrangler ==0.1.1.0
|
||||
@ -2195,7 +2195,7 @@ default-package-overrides:
|
||||
- servant-swagger-ui-redoc ==0.3.4.1.22.3
|
||||
- servant-websockets ==2.0.0
|
||||
- servant-xml ==1.0.1.4
|
||||
- serversession ==1.0.2
|
||||
- serversession ==1.0.3
|
||||
- serversession-frontend-wai ==1.0
|
||||
- servius ==1.2.3.0
|
||||
- ses-html ==0.4.0.0
|
||||
@ -2210,7 +2210,7 @@ default-package-overrides:
|
||||
- shake ==0.19.6
|
||||
- shake-language-c ==0.12.0
|
||||
- shake-plus ==0.3.4.0
|
||||
- shakespeare ==2.0.29
|
||||
- shakespeare ==2.0.30
|
||||
- shared-memory ==0.2.0.0
|
||||
- ShellCheck ==0.8.0
|
||||
- shell-conduit ==5.0.0
|
||||
|
||||
@ -346,7 +346,6 @@ dont-distribute-packages:
|
||||
- Shpadoinkle-widgets
|
||||
- SimpleGL
|
||||
- SimpleLog
|
||||
- SimpleServer
|
||||
- Smooth
|
||||
- Snusmumrik
|
||||
- SoccerFun
|
||||
@ -2077,7 +2076,6 @@ dont-distribute-packages:
|
||||
- helics
|
||||
- helics-wai
|
||||
- helium
|
||||
- helix
|
||||
- hellage
|
||||
- hellnet
|
||||
- hemokit
|
||||
@ -3346,7 +3344,6 @@ dont-distribute-packages:
|
||||
- relational-record-examples
|
||||
- relational-schemas
|
||||
- relative-date
|
||||
- reload
|
||||
- remote-json
|
||||
- remote-json-client
|
||||
- remote-json-server
|
||||
@ -3659,7 +3656,6 @@ dont-distribute-packages:
|
||||
- sock2stream
|
||||
- socket-io
|
||||
- sockets
|
||||
- solga
|
||||
- solga-swagger
|
||||
- solr
|
||||
- souffle-dsl
|
||||
@ -4068,7 +4064,6 @@ dont-distribute-packages:
|
||||
- wai-middleware-rollbar
|
||||
- wai-middleware-route
|
||||
- wai-middleware-throttle
|
||||
- wai-routes
|
||||
- wai-routing
|
||||
- wai-session-tokyocabinet
|
||||
- wai-thrift
|
||||
|
||||
1296
pkgs/development/haskell-modules/hackage-packages.nix
generated
1296
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user