Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f32644b
haskellPackages: stackage LTS 19.20 -> LTS 19.22
expipiplus1 Sep 11, 2022
14168f5
all-cabal-hashes: 2022-08-28T23:15:42Z -> 2022-09-11T02:31:18Z
expipiplus1 Sep 11, 2022
5410c01
haskellPackages: regenerate package set based on current config
expipiplus1 Sep 11, 2022
801760e
haskellPackages.hspec_2_10_5: bump
cdepillabout Sep 11, 2022
05f6bd4
Merge master into haskell-updates
github-actions[bot] Sep 12, 2022
464616e
Merge master into haskell-updates
github-actions[bot] Sep 13, 2022
ae879b6
haskellPackages.hevm: add maintainer
arcz Sep 13, 2022
3ed5f53
Merge pull request #191046 from arcz/hevm-maintainer
cdepillabout Sep 13, 2022
95cbc50
haskellPackages: regenerate package set based on current config
cdepillabout Sep 13, 2022
ec97ea8
Merge master into haskell-updates
github-actions[bot] Sep 14, 2022
75f79c2
haskellPackages.xmonad: drop upstreamed Nix compat patch
sternenseemann Sep 14, 2022
83aadb4
Merge master into haskell-updates
github-actions[bot] Sep 15, 2022
e68db86
haskellPackages.miso: unbreak
arcz Sep 15, 2022
ffdfa00
Merge pull request #191343 from arcz/miso-unbreak
cdepillabout Sep 15, 2022
a278a28
haskellPackages: regenerate package set based on current config
cdepillabout Sep 15, 2022
2921710
Merge master into haskell-updates
github-actions[bot] Sep 16, 2022
83a46ef
Merge master into haskell-updates
github-actions[bot] Sep 17, 2022
0826d45
elm2nix: drop now released patches
sternenseemann Sep 17, 2022
56a8699
haskell.packages.ghc{8107,884}.megaparsec: ignore base lower bound
sternenseemann Sep 17, 2022
8c09f0d
Merge master into haskell-updates
github-actions[bot] Sep 18, 2022
4198b51
Merge branch 'master' into haskell-updates
maralorn Sep 18, 2022
85d1c47
haskellPackages: mark builds failing on hydra as broken
maralorn Sep 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "0fd2081c5296d9891054f8c742545d3871d76485",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fd2081c5296d9891054f8c742545d3871d76485.tar.gz",
"sha256": "1bxxlks9bjf9lmshlg8777j6h7gb5mpd9lxj97nkqh32gnlj8m38",
"msg": "Update from Hackage at 2022-08-28T23:15:42Z"
"commit": "d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34.tar.gz",
"sha256": "1kdb392fhm2jvf3rsznx2gzwqki978bj3dpmpjfjxqadbzz9cl34",
"msg": "Update from Hackage at 2022-09-11T02:31:18Z"
}
29 changes: 7 additions & 22 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -820,9 +820,9 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_10_1;
hspec = self.hspec_2_10_5;
hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_1;
hspec = self.hspec_2_10_5;
};
});

Expand Down Expand Up @@ -1642,14 +1642,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;

# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_1 = doDistribute (super.hspec_2_10_1.override {
hspec-discover = self.hspec-discover_2_10_1;
hspec-core = self.hspec-core_2_10_1;
hspec_2_10_5 = doDistribute (super.hspec_2_10_5.override {
hspec-discover = self.hspec-discover_2_10_5;
hspec-core = self.hspec-core_2_10_5;
});
hspec-discover_2_10_1 = super.hspec-discover_2_10_1.override {
hspec-discover_2_10_5 = super.hspec-discover_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
};
hspec-core_2_10_1 = super.hspec-core_2_10_1.override {
hspec-core_2_10_5 = super.hspec-core_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
};

Expand Down Expand Up @@ -2453,21 +2453,6 @@ self: super: {
# Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release
ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core;

elm2nix = appendPatches [
# unreleased, prereq for aeson-2 patch
(fetchpatch {
name = "elm2nix-pull-44.patch";
url = "https://patch-diff.githubusercontent.com/raw/cachix/elm2nix/pull/44.patch";
sha256 = "sha256-d6Ra3mIVKCA/5pEavsPi2TdN0qcRwU3gc634oWdYZq8=";
})
# https://github.com/cachix/elm2nix/issues/46#issuecomment-1056236009
(fetchpatch {
name = "elm2nix-aeson-2.patch";
url = "https://github.com/cachix/elm2nix/commit/1a35f07ad5d63085ffd7e5634355412e1112c4e9.patch";
sha256 = "sha256-HAwMvOyp2IdPyjwt+aKYogMqg5NZYlu897UqJy59eFc=";
})
] super.elm2nix;

# https://github.com/Synthetica9/nix-linter/issues/65
nix-linter = super.nix-linter.overrideScope (self: super: {
aeson = self.aeson_1_5_6_0;
Expand Down
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,8 @@ self: super: {

# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;

# Unnecessarily strict lower bound on base
# https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
megaparsec = doJailbreak super.megaparsec;
}
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,8 @@ self: super: {

# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;

# Unnecessarily strict lower bound on base
# https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
megaparsec = doJailbreak super.megaparsec;
}
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ broken-packages:
- bibdb
- bidi-icu
- bidirectional
- bidirectional-instances
- bidirectionalization-combined
- bidispec
- bidispec-extras
Expand Down Expand Up @@ -662,6 +663,7 @@ broken-packages:
- church-maybe
- church-pair
- churros
- cicero-api
- cielo
- cil
- cinvoke
Expand Down Expand Up @@ -3046,6 +3048,7 @@ broken-packages:
- located
- located-monad-logger
- loch
- loc-test
- log2json
- logentries
- logger
Expand Down Expand Up @@ -3244,7 +3247,6 @@ broken-packages:
- mios
- MIP
- mismi-s3-core
- miso
- miso-examples
- mit-3qvpPyAi6mH
- mix-arrows
Expand Down Expand Up @@ -3688,6 +3690,7 @@ broken-packages:
- pandoc-unlit
- pandoc-utils
- pandora
- panfiguration
- pang-a-lambda
- pangraph
- pan-os-syslog
Expand Down Expand Up @@ -4299,6 +4302,7 @@ broken-packages:
- request
- request-monad
- req-url-extra
- reserve
- reservoir
- resolve
- resolve-trivial-conflicts
Expand Down Expand Up @@ -4586,6 +4590,7 @@ broken-packages:
- signable
- signable-haskell-protoc
- signed-multiset
- significant-figures
- simd
- simfin
- simple-actors
Expand Down Expand Up @@ -5665,6 +5670,7 @@ broken-packages:
- xsact
- xsd
- xslt
- xstatic-th
- xturtle
- y0l0bot
- yabi-muno
Expand Down Expand Up @@ -5696,6 +5702,7 @@ broken-packages:
- yandex-translate
- yaop
- yapb
- yarl
- yarr
- yasi
- yate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ package-maintainers:
- hnix
- hnix-store-core
- hnix-store-remote
arturcygan:
- hevm
berberman:
- nvfetcher
- arch-web
Expand Down
Loading