Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
05f26e1
Merge master into haskell-updates
github-actions[bot] Dec 25, 2024
f29dca4
Merge master into haskell-updates
github-actions[bot] Dec 26, 2024
69e7105
all-cabal-hashes: 2024-11-07T13:09:31Z -> 2024-12-23T18:27:47Z
sternenseemann Dec 9, 2024
ca5dc07
haskellPackages: stackage LTS 22.40 -> LTS 22.43
sternenseemann Dec 9, 2024
81ef115
haskellPackages: regenerate package set based on current config
sternenseemann Dec 9, 2024
87d2c80
haskell.packages.ghc910: bump upgrades to their latest hackage rel.
sternenseemann Dec 9, 2024
48d7ea8
haskell.packages.ghc98: bump upgrades to their latest hackage rel.
sternenseemann Dec 9, 2024
5dfa2d6
pandoc_3_6: init at 3.6
sternenseemann Dec 23, 2024
628a403
jacinda: build with happy-2.1.3
sternenseemann Dec 23, 2024
0bbb00e
haskellPackages: use Cabal 3.14.1.0 over 3.14.0.0
sternenseemann Dec 24, 2024
fe2fe99
cabal-install: adjust overrides for 3.14.1.0
sternenseemann Dec 25, 2024
d8d3d87
haskellPackages.gi-gtk_4: 4.0.9 -> 4.0.11
sternenseemann Dec 26, 2024
3403ebc
haskell.packages.ghc9101.ghc-lib-parser*: retain 9.10.* versions
sternenseemann Dec 26, 2024
f43f998
haskellPackages.repa*: drop obsolete patches
sternenseemann Dec 26, 2024
bb7f507
pkgsCross.*.haskellPackages.xhtml: 3000.3.0.0 -> 3000.4.0.0
sternenseemann Dec 26, 2024
f6005e8
Merge master into haskell-updates
github-actions[bot] Dec 27, 2024
7b88383
haskell.packages.ghc9121.splitmix: 0.1.0 -> 0.1.1
sternenseemann Dec 27, 2024
e3a7759
haskell.packages.ghc9121.tagged: 0.8.8 -> 0.8.9
sternenseemann Dec 27, 2024
7c67b06
haskell.packages.ghc912.primitive: 0.8.0.0 -> 0.9.0.0
sternenseemann Dec 27, 2024
64ce0e3
haskell.packages.ghc9121.call-stack: disable test suite
sternenseemann Dec 27, 2024
817e2ae
haskell.packages.ghc9121.tar: 0.5.1.1 -> 0.6.3.0
sternenseemann Dec 27, 2024
581f185
git-annex: update sha256 for 10.20241202
sternenseemann Dec 27, 2024
7016a8c
haskellPackages.opencascade-hs: provide non standard include dirs
joe-warren Nov 15, 2024
542c92b
haskellPackages.hevm: drop obsolete patches
sternenseemann Dec 27, 2024
124de45
Merge master into haskell-updates
github-actions[bot] Dec 28, 2024
ce8c020
git-annex: add missing symlinks to PATH in checkPhase
sternenseemann Dec 28, 2024
93bd863
haskell.packages.ghcjs.exceptions: fix the eval
trofi Dec 28, 2024
595be47
haskell.packages.ghc865Binary.exceptions: fix the eval
trofi Dec 28, 2024
b778b1a
Merge master into haskell-updates
github-actions[bot] Dec 29, 2024
0936177
Merge master into haskell-updates
github-actions[bot] Dec 30, 2024
3a08f5e
haskell.compiler.ghc98: 9.8.2 -> 9.8.4
sternenseemann Dec 30, 2024
00dc167
haskell.packages.ghc910.ghc-lib: match with compiler version
sternenseemann Dec 30, 2024
feaddca
haskell.packages.ghc9101: test pkgs that have been fixed on hydra
sternenseemann Dec 30, 2024
3c6c989
haskell.packages.ghc9121: don't test pkgs that don't support 9.12
sternenseemann Dec 30, 2024
2fd0dc1
Merge master into haskell-updates
github-actions[bot] Dec 31, 2024
164d44f
haskellPackages.libxml-sax: drop obsolete override
sternenseemann Dec 31, 2024
31aab29
haskellPackages.xz: make sure we are using pkgs.xz, allow tasty 1.4
sternenseemann Dec 31, 2024
c7a72e4
haskellPackages.pfile: allow hspec == 2.11.*
sternenseemann Dec 31, 2024
3b4be0d
haskellPackages.provide: relax lower bound on lens
sternenseemann Dec 31, 2024
a8f9a9f
haskellPackages.lawful-conversions: relax lower bounds of test suite
sternenseemann Dec 31, 2024
8609c05
haskellPackages.alfred-margaret: remove stale broken flag
sternenseemann Dec 31, 2024
b20733c
haskellPackages.cabal2nix-unstable: 2024-12-22 -> 2024-12-31
sternenseemann Dec 31, 2024
048ee4d
haskell.packages.ghc8107.ghc-source-gen: pin to 0.4.5.0
sternenseemann Dec 31, 2024
e73ff8c
haskellPackages.nspace: disable tests
sternenseemann Dec 31, 2024
e2c7e1c
haskellPackages: mark builds failing on hydra as broken
sternenseemann Dec 31, 2024
4f7efec
haskell.packages.ghc96.htree: restrict to < 0.2
sternenseemann Dec 31, 2024
a2ab402
Merge commit ffd125e2 into haskell-updates
sternenseemann Dec 31, 2024
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
4 changes: 2 additions & 2 deletions doc/languages-frameworks/haskell.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Available compilers are collected under `haskell.compiler`.
Each of those compiler versions has a corresponding attribute set `packages` built with
it. However, the non-standard package sets are not tested regularly and, as a
result, contain fewer working packages. The corresponding package set for GHC
9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias
9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias
for `haskell.packages.ghc966`:

Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
Expand Down Expand Up @@ -764,7 +764,7 @@ that depend on that library, you may want to use:

```nix
haskellPackages.haskell-ci.overrideScope (self: super: {
Cabal = self.Cabal_3_14_0_0;
Cabal = self.Cabal_3_14_1_0;
})
```

Expand Down
8 changes: 5 additions & 3 deletions maintainers/scripts/haskell/update-cabal2nix-unstable.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.
#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable nixfmt-rfc-style -I nixpkgs=.

# Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.
# See regenerate-hackage-packages.sh for details on the purpose of this script.
Expand All @@ -13,5 +13,7 @@ commit="$(jq -r .commit.sha <<< "$head_info")"
# extract commit timestamp and convert to date
date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
# generate nix expression from cabal file, replacing the version with the commit date
echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix
cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix
output=pkgs/development/haskell-modules/cabal2nix-unstable.nix
echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > "$output"
cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> "$output"
nixfmt "$output"
2 changes: 1 addition & 1 deletion maintainers/scripts/haskell/update-stackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -eu -o pipefail
# (should be capitalized like the display name)
SOLVER=LTS
# Stackage solver verson, if any. Use latest if empty
VERSION=
VERSION=22
TMP_TEMPLATE=update-stackage.XXXXXXX
readonly SOLVER
readonly VERSION
Expand Down
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": "0b0765b206e909965c9a65d28e87ebc9aae4d8af",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz",
"sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn",
"msg": "Update from Hackage at 2024-10-25T11:10:52Z"
"commit": "c9ce1cc4a029220ec3582fbcf69e082d245d78b6",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c9ce1cc4a029220ec3582fbcf69e082d245d78b6.tar.gz",
"sha256": "02x3z4rg4dwarzb6p88z7sff40bkbq41gxnczvzph8s3s8jq9iw1",
"msg": "Update from Hackage at 2024-12-23T18:27:47Z"
}
6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/9.4.5.nix

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/9.4.6.nix

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2024-12-04";
version = "unstable-2024-12-31";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz";
sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp";
url = "https://github.com/NixOS/cabal2nix/archive/e290b906f056dd1414ede71b4bb6375be2d0aa5d.tar.gz";
sha256 = "0x94w4dfjfxp3f5h7w5738znkyb8barzjki0xsf94asiffiqsgxn";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
Loading