Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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": "65d98a2e23ab17387e8dc9d04e417566cc501819",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/65d98a2e23ab17387e8dc9d04e417566cc501819.tar.gz",
"sha256": "05sgpqnkyqg7f7vqzyrcisd32gp521nph3dc236ffwgmhs5lpa0i",
"msg": "Update from Hackage at 2025-01-27T07:59:56Z"
"commit": "29f8cb511c67543742be59bb99a4265b1c8e1cae",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/29f8cb511c67543742be59bb99a4265b1c8e1cae.tar.gz",
"sha256": "1vrx4dq7vwbpnpnh5plh45azv7qix5hqmhznf9ww7ias1mccvwcc",
"msg": "Update from Hackage at 2025-02-10T08:47:10Z"
}
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ self: super: {

# jacinda needs latest version of alex and happy
jacinda = super.jacinda.override {
happy = self.happy_2_1_4;
happy = self.happy_2_1_5;
};

# Test suite hangs on 32bit. Unclear if this is a bug or not, but if so, then
Expand Down Expand Up @@ -1717,7 +1717,7 @@ self: super: {
# Fails with encoding problems, likely needs locale data.
# Test can be executed by adding which to testToolDepends and
# $PWD/dist/build/haskeline-examples-Test to $PATH.
haskeline_0_8_2_1 = doDistribute (dontCheck super.haskeline_0_8_2_1);
haskeline_0_8_3_0 = doDistribute (dontCheck super.haskeline_0_8_3_0);

# Too strict upper bound on HTF
# https://github.com/nikita-volkov/stm-containers/issues/29
Expand Down Expand Up @@ -1881,7 +1881,7 @@ self: super: {
# 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2
hinit = doJailbreak
(self.generateOptparseApplicativeCompletions [ "hi" ]
(super.hinit.override { haskeline = self.haskeline_0_8_2_1; }));
super.hinit);

# 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
blas-hs = dontCheck super.blas-hs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ self: super: {
system-cxx-std-lib = null;
template-haskell = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6;
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
haskellLib.doDistribute self.terminfo_0_4_1_6;
haskellLib.doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
haskellLib.doDistribute self.terminfo_0_4_1_6;
haskellLib.doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ self: super: {
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ in
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ self: super:
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_6;
doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ self: super: {
system-cxx-std-lib = null;
template-haskell = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6;
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
Expand Down Expand Up @@ -78,9 +78,6 @@ self: super: {
newtype-generics = doJailbreak super.newtype-generics; # base < 4.19
hw-prim = doJailbreak super.hw-prim; # doctest < 0.22, ghc-prim < 0.11, hedgehog < 1.4
svg-builder = doJailbreak super.svg-builder; # base <4.19, bytestring <0.12, text <2.1
# Too strict bound on base, believe it or not.
# https://github.com/judah/terminfo/pull/55#issuecomment-1876894232
terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6;
HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12
raven-haskell = doJailbreak super.raven-haskell; # aeson <2.2
saltine = doJailbreak super.saltine; # bytestring && <0.12, deepseq <1.5, text > 1.2 && <1.3 || >=2.0 && <2.1
Expand Down
Loading