diff options
| author | sterni <sternenseemann@systemli.org> | 2021-04-10T21·28+0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-04-11T20·11+0000 |
| commit | 7e2023546c2136ff6f70407868f7e364e141e244 (patch) | |
| tree | cb7863d649cc3aacf4686e10b5f2cbe3c13a8dc7 | |
| parent | 4edef59ba48eba53b258223833a36803602d4250 (diff) | |
fix(3p/haskellPackages): re-add random 1.2.0 to fix xanthous r/2479
The random_1_2_0 attribute of haskellPackages currently holds random 1.2.0 which is what we want to have. We need to disable tests because they cause an infinite recursion as basically all testing libraries depend on random. This has the nice side effect that we no longer need import from derivation for random 1.2.0 (but owothia and xanthous still use it). Re-enable CI for xanthous. Additinonally we need to deal with the fallout of the haskellPackages overlay now also being pulled in for some machines since cl/2910 and let pandoc compile with random 1.2.0. Change-Id: I78d220e5bd35f3469d80d69e77e712a529f21d33 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2924 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi>
| -rw-r--r-- | third_party/overlays/haskell/default.nix | 9 | ||||
| -rw-r--r-- | users/glittershark/xanthous/default.nix | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 7b17e61e3e..16c250f820 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -11,16 +11,15 @@ let generic-arbitrary = appendPatch hsSuper.generic-arbitrary [ ./patches/generic-arbitrary-export-garbitrary.patch ]; - # random = dontCheck (hsSuper.callHackageDirect { - # pkg = "random"; - # ver = "1.2.0"; - # sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh"; - # } {}); + # check dependencies cause circular dependency on itself + # and thus an infinite recursion + random = dontCheck hsSuper.random_1_2_0; # random <1.2 test-framework = doJailbreak hsSuper.test-framework; hashable = doJailbreak hsSuper.hashable; test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2; + pandoc = doJailbreak hsSuper.pandoc; # can be removed if we have the following PR or equivalent # https://github.com/NixOS/nixpkgs/pull/116931 diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix index c417c7af3e..0b89a50afb 100644 --- a/users/glittershark/xanthous/default.nix +++ b/users/glittershark/xanthous/default.nix @@ -4,6 +4,4 @@ }: pkgs.haskell.lib.failOnAllWarnings ( pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {} -) // { - meta.ci = false; -} +) |