Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a907adf
haskellPackages: stackage LTS 20.8 -> LTS 20.11
expipiplus1 Feb 12, 2023
17b0cf6
all-cabal-hashes: 2023-01-29T01:30:53Z -> 2023-02-11T16:57:22Z
expipiplus1 Feb 12, 2023
7343f76
haskellPackages: regenerate package set based on current config
expipiplus1 Feb 12, 2023
a003cf0
haskellPackages.persistent-sqlite: disable tests
ncfavier Feb 12, 2023
bf49a1c
Merge pull request #216007 from ncfavier/persistent-sqlite
cdepillabout Feb 12, 2023
994a371
Merge master into haskell-updates
github-actions[bot] Feb 13, 2023
3dfbe2b
maintainers/haskell/test-configurations.nix: support ghcHEAD
sternenseemann Jan 25, 2023
432c3ab
haskellPackages.persistent-postgresql: disable broken tests
sternenseemann Feb 13, 2023
4f7c02e
haskellPackages.sensei: use fsnotify 0.4 and tame hspec-contrib
ncfavier Feb 13, 2023
75cdc10
haskellPackages.ghc: 9.2.4 -> 9.2.6
sternenseemann Feb 11, 2023
dc2feb9
Merge branch 'master' into haskell-updates
vcunat Feb 13, 2023
107c04a
all-cabal-hashes: 2023-02-11T16:57:22Z -> 2023-02-13T17:53:53Z
sternenseemann Feb 13, 2023
bdb2e7e
haskell.packages.ghc926.protolude: allow bytestring-0.11.4
sternenseemann Feb 13, 2023
f29aaa7
Merge master into haskell-updates
github-actions[bot] Feb 14, 2023
168d9a5
agda: 2.6.2.2 -> 2.6.3
iblech Jan 31, 2023
8686ffd
agda: add iblech to maintainers
sternenseemann Feb 14, 2023
96f9999
haskellPackages.llvm-hs-pure: make bytestring-0.11 patch apply again
sternenseemann Feb 14, 2023
4228784
haskellPackages.streamly-bytestring: jailbreak
maralorn Feb 14, 2023
d3ba954
haskellPackages.patat: Apply commit from main branch relaxing bounds
dalpd Feb 14, 2023
c0d7cc2
Merge pull request #216368 from dalpd/fix-patat-build
cdepillabout Feb 14, 2023
ea113b9
haskellPackages.hmidi: provide necessary frameworks on darwin
sternenseemann Feb 14, 2023
b56ce28
Merge master into haskell-updates
github-actions[bot] Feb 15, 2023
476fea7
haskell.packages.ghc884.ghc-lib: downgrade to match ghc-lib-parser
sternenseemann Feb 15, 2023
e5e75c7
haskellPackages.cabal2nix-unstable: 2023-01-06 -> 2023-02-15
sternenseemann Feb 15, 2023
066aaaf
Merge pull request #216475 from sternenseemann/ghc88-downgrade-ghc-lib
maralorn Feb 15, 2023
dd816c8
Merge master into haskell-updates
github-actions[bot] Feb 16, 2023
f442a49
Merge master into haskell-updates
github-actions[bot] Feb 17, 2023
862a8fd
Merge master into haskell-updates
github-actions[bot] Feb 18, 2023
34a7913
haskellPackages.minicurl: disable test suite accessing the network
sternenseemann Feb 18, 2023
76d60f6
haskellPackages.domaindriven-core: disable IP based postgresql test
sternenseemann Feb 18, 2023
faa4604
haskellPackages.lima: disable test suite missing test data
sternenseemann Feb 18, 2023
1c8a564
release-haskell.nix: reflect release of GHC 9.2.6
sternenseemann Feb 18, 2023
2e9ff9a
haskell.packages.*.ghc-tags: pick compatible version
sternenseemann Feb 18, 2023
304ccef
haskellPackages.rdf: allow bytestring-0.11.4.0
sternenseemann Feb 18, 2023
1f99c7d
haskellPackages.swarm: use now required brick 1.6
sternenseemann Feb 18, 2023
171fb3f
haskellPackages: mark builds failing on hydra as broken
sternenseemann Feb 18, 2023
92d3414
Merge pull request #216984 from sternenseemann/ghc-tags
maralorn Feb 18, 2023
1a26447
Merge pull request #216985 from sternenseemann/release-haskell-ghc926
maralorn Feb 18, 2023
bdbfe10
haskell.packages.*.cabal-install{,-solver}: unify overrides
sternenseemann Feb 18, 2023
da5233b
haskell.packages.*.[cC]abal*: use core process where possible
sternenseemann Feb 18, 2023
9d78495
haskellPackages.guardian: fix build by joining cabal-install overlay
sternenseemann Feb 18, 2023
bbe6402
Merge remote-tracking branch 'origin/master' into haskell-updates
sternenseemann Feb 18, 2023
2534cd7
Merge master into haskell-updates
github-actions[bot] Feb 19, 2023
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
26 changes: 24 additions & 2 deletions maintainers/scripts/haskell/test-configurations.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,28 @@ let
if !builtins.isList files then [ files ] else files
);

packageSetsWithVersionedHead = pkgs.haskell.packages // (
let
headSet = pkgs.haskell.packages.ghcHEAD;
# Determine the next GHC release version following GHC HEAD.
# GHC HEAD always has an uneven, tentative version number, e.g. 9.7.
# GHC releases always have even numbers, i.e. GHC 9.8 is branched off from
# GHC HEAD 9.7. Since we use the to be release number for GHC HEAD's
# configuration file, we need to calculate this here.
headVersion = lib.pipe headSet.ghc.version [
lib.versions.splitVersion
(lib.take 2)
lib.concatStrings
lib.strings.toInt
(builtins.add 1)
toString
];
in
{
"ghc${headVersion}" = headSet;
}
);

setsForFile = fileName:
let
# extract the unique part of the config's file name
Expand All @@ -77,12 +99,12 @@ let
builtins.match "ghc-([0-9]+).([0-9]+).x" configName
);
# return all package sets under haskell.packages matching the version components
setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) (
setsForVersion = builtins.map (name: packageSetsWithVersionedHead.${name}) (
builtins.filter (setName:
lib.hasPrefix "ghc${configVersion}" setName
&& (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName))
) (
builtins.attrNames pkgs.haskell.packages
builtins.attrNames packageSetsWithVersionedHead
)
);

Expand Down
2 changes: 2 additions & 0 deletions maintainers/scripts/haskell/update-stackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ sed -r \
-e '/ lsp-test /d' \
-e '/ hie-bios /d' \
-e '/ ShellCheck /d' \
-e '/ Agda /d' \
< "${tmpfile_new}" >> $stackage_config
# Explanations:
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
# lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage.
# ShellCheck: latest version of command-line dev tool.
# Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.

if [[ "${1:-}" == "--do-commit" ]]; then
git add $stackage_config
Expand Down
7 changes: 7 additions & 0 deletions pkgs/build-support/agda/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ let
runHook postInstall
'';

# As documented at https://github.com/NixOS/nixpkgs/issues/172752,
# we need to set LC_ALL to an UTF-8-supporting locale. However, on
# darwin, it seems that there is no standard such locale; luckily,
# the referenced issue doesn't seem to surface on darwin. Hence let's
# set this only on non-darwin.
LC_ALL = lib.optionalString (!stdenv.isDarwin) "C.UTF-8";

meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta;

# Retrieve all packages from the finished package set that have the current package as a dependency and build them
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": "307653b893cc53ffa71d6931c33101d352e3ead1",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/307653b893cc53ffa71d6931c33101d352e3ead1.tar.gz",
"sha256": "0mgmmzdlb9j4drkjjdrp2da8z4can7gg8zd007ya2jw17rz270hz",
"msg": "Update from Hackage at 2023-01-29T01:30:53Z"
"commit": "220fb2ad74640b02e543271393f21ba227bd2627",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/220fb2ad74640b02e543271393f21ba227bd2627.tar.gz",
"sha256": "1hpbqw04i8p2h5w31a7rqlmhdjpj4r4v62kdqich57hm1cj2ml7h",
"msg": "Update from Hackage at 2023-02-13T17:53:53Z"
}
Loading