Skip to content

Commit

Permalink
Remove unneeded Nix package overrides.
Browse files Browse the repository at this point in the history
  • Loading branch information
j6carey committed May 21, 2024
1 parent a5f2b6f commit 68e12ca
Show file tree
Hide file tree
Showing 25 changed files with 0 additions and 575 deletions.
106 changes: 0 additions & 106 deletions nix/haskell-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ pkgsNew: pkgsOld:
( pkgsNew.haskell.lib.appendPatches haskellPackagesPrev.aeson
[ ./patches/aeson-2.1.2.1.patch ] );

# With nixpkgs-23.11 and ghc981, atomic-write wants hspec for testing,
# which causes problems.
atomic-write =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.atomic-write;

# With nixpkgs-23.11 and ghc981, base-compat-batteries wants hspec for testing,
# which causes problems.
base-compat-batteries =
Expand All @@ -47,11 +42,6 @@ pkgsNew: pkgsOld:
conduit =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.conduit;

# With nixpkgs-23.11 and ghc981, constraints wants hspec for testing,
# which causes problems.
constraints =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.constraints;

# With nixpkgs-23.11 and ghc981, data-diverse wants hspec for testing,
# which causes problems.
data-diverse =
Expand Down Expand Up @@ -80,10 +70,6 @@ pkgsNew: pkgsOld:
pkgsNew.haskell.lib.dontCheck
(pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.generic-deriving);

# With nixpkgs-23.11 and ghc981, half thinks that deepseq is out of bounds.
half =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.half;

# With nixpkgs-23.11 and ghc981, hourglass does not support the version
# of the time package that is provided, but that matters only to tests.
hourglass =
Expand All @@ -104,10 +90,6 @@ pkgsNew: pkgsOld:
infer-license =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.infer-license;

# With nixpkgs-23.11 and our overrides, insert-ordered-containers thinks that lens is out of bounds.
insert-ordered-containers =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.insert-ordered-containers;

# With nixpkgs-23.11 and ghc981, invariant indirectly depends on hspec for testing,
# which causes problems. Also, it generic-deriving thinks that
# th-abstraction is out of bounds.
Expand All @@ -120,33 +102,6 @@ pkgsNew: pkgsOld:
iproute =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.iproute;

# With nixpkgs-23.11 and ghc962, generics-sop-0.5.1.4 thinks that th-abstraction is out of bounds.
generics-sop =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.generics-sop;

# At a guess the test failures are some environmental issue,
# like being unable to contact "download.fpcomplete.com" due
# to the Nix build environment.
http-download =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.http-download;

# With nixpkgs-23.11 and ghc902, large-generics thinks that primitive is out of bounds.
large-generics =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.large-generics;

# With nixpkgs-23.11 and ghc902, large-records thinks that primitive is out of bounds.
large-records =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.large-records;

# With nixpkgs-23.11 and ghc981 (or perhaps our customized dependencies),
# the tests in lifted-base fail.
lifted-base =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.lifted-base;

# With nixpkgs-23.11 and our overrides, microlens-th thinks that th-abstraction is out of bounds.
microlens-th =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.microlens-th;

# With nixpkgs-23.11 and ghc981, monad-par wants test-framework for testing, which
# wants language-haskell-extract, which does not support modern template-haskell.
monad-par =
Expand All @@ -157,69 +112,21 @@ pkgsNew: pkgsOld:
mono-traversable =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.mono-traversable;

# With nixpkgs-23.11 and our overrides, neat-interpolation that rebase is out of bounds.
neat-interpolation =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.neat-interpolation;

# Patch to enable building of pantry when using ghc902.
#
# Also disable failing tests. At a guess the test failures are some
# environmental issue, like being unable to contact "hackage.haskell.org"
# due to the Nix build environment.
pantry_0_9_2 =
pkgsNew.haskell.lib.dontCheck
( pkgsNew.haskell.lib.appendPatches haskellPackagesPrev.pantry_0_9_2
[ ./patches/pantry-0.9.3.2.patch ] );

# With nixpkgs-23.11 and our overrides, rerebase that rebase is out of bounds.
rerebase =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.rerebase;

# With nixpkgs-23.11 and ghc981, safe-exceptions wants hspec for testing,
# which causes problems.
safe-exceptions =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.safe-exceptions;

# With nixpkgs-23.11 and ghc981, streaming-commons wants hspec for testing,
# which causes problems.
streaming-commons =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.streaming-commons;

# With nixpkgs-23.11 and our dependency overrides, swagger2 wants hspec for testing,
# which causes problems. Also, we jailbreak to allow a newer version of lens.
swagger2 =
pkgsNew.haskell.lib.dontCheck
(pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.swagger2);

# With nixpkgs-23.11 and ghc981, reflection indirectly depends on hspec for testing,
# which causes problems.
reflection =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.reflection;

# With nixpkgs-23.11 and ghc981, resourceat wants hspec for testing,
# which causes problems.
resourceat =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.resourceat;

# With nixpkgs-23.11 and our overrides, stack objects to a number of dependencies,
# at least on ghc902.
stack =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.stack;

# With nixpkgs-23.11 and ghc981, resourcet wants hspec for testing,
# which causes problems.
resourcet =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.resourcet;

# At a guess the test build failures are a bytestring version issue.
tar-conduit =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.tar-conduit;

# With nixpkgs-23.11 and ghc981, tasty-discover wants hspec for testing,
# which causes problems.
tasty-discover =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.tasty-discover;

# Suppress:
# warning: non-portable path to file '"dist/build/Test/autogen/cabal_macros.h"'; specified path differs in case from file name on disk [-Wnonportable-include-path]
tasty-golden =
Expand All @@ -236,19 +143,6 @@ pkgsNew: pkgsOld:
th-compat =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.th-compat;

# With nixpkgs-23.11 and our overrides, th-expand-syns thinks that th-abstraction is out of bounds.
th-expand-syns =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.th-expand-syns;

# With nixpkgs-23.11 and our overrides, th-lift thinks that th-abstraction is out of bounds.
th-lift =
pkgsNew.haskell.lib.doJailbreak haskellPackagesPrev.th-lift;

# With nixpkgs-23.11 and ghc981, unix-compat wants hspec for testing,
# which causes problems.
unix-compat =
pkgsNew.haskell.lib.dontCheck haskellPackagesPrev.unix-compat;

# With nixpkgs-23.11 and ghc981, hpack-0.36.0 wants hspec for testing,
# which causes problems.
unix-time =
Expand Down
21 changes: 0 additions & 21 deletions nix/packages/cborg.nix

This file was deleted.

21 changes: 0 additions & 21 deletions nix/packages/crypton.nix

This file was deleted.

16 changes: 0 additions & 16 deletions nix/packages/data-diverse.nix

This file was deleted.

17 changes: 0 additions & 17 deletions nix/packages/generics-sop.nix

This file was deleted.

27 changes: 0 additions & 27 deletions nix/packages/hedgehog.nix

This file was deleted.

23 changes: 0 additions & 23 deletions nix/packages/insert-ordered-containers.nix

This file was deleted.

20 changes: 0 additions & 20 deletions nix/packages/large-generics.nix

This file was deleted.

24 changes: 0 additions & 24 deletions nix/packages/large-records.nix

This file was deleted.

21 changes: 0 additions & 21 deletions nix/packages/megaparsec.nix

This file was deleted.

16 changes: 0 additions & 16 deletions nix/packages/microlens-th.nix

This file was deleted.

Loading

0 comments on commit 68e12ca

Please sign in to comment.