about summary refs log tree commit diff
path: root/third_party/haskell_overlay/default.nix
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-12-25T10·13+0100
committertazjin <mail@tazj.in>2021-01-09T13·21+0000
commit88bf43878f243ca0276da4a21aa6a00a6a0dbc3c (patch)
treee946796ccccb079a5995a7eedbf46f41f383e11d /third_party/haskell_overlay/default.nix
parent68c4730365a2874ee26d3cc92fbeb073de460a4b (diff)
chore(3p): Bump NixOS channels to 2020-12-28 r/2065
Changes:

* ops/nixos/tvl-slapd: The NixOS module for OpenLDAP has removed the
  ability to configure OpenLDAP directly and now forces users to use
  some kind of weird Nix->OLC mapping that is mostly undocumented.

  This moves the config we need to the new format in a way that may or
  may not work and does the other arbitrary dance steps that someone
  decided to impose on us. Note that this now throws lots of warnings,
  but I can't be bothered to fix them.

* 3p: Random package removals accomodated

* users/glittershark: Pin grfn's kernel to 5.9, because the CK patch
  is not yet updated for 5.10

* users/glittershark: Update vendor hash for pg-dump-upsert, I suspect
  this changed because of something in the Go build machinery in
  nixpkgs. The deleteVendor flag also has no effect anymore and has been
  removed.

* users/glittershark: agda build is broken, commenting out development
  home-manager environment until it can be fixed

* third_party/haskell_overlay: updating random needs upper boundarles
  of a few dependencies relaxed (curse them)

* third_party/gerrit_plugins: for some cursed reason the fixed-output
  hash of the gerrit owners plugin fetchgit changed, updated.
  Same for the checks plugin.

Change-Id: Ica37995fe8039d3ba80eab643867f98795c56734
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2295
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/haskell_overlay/default.nix')
-rw-r--r--third_party/haskell_overlay/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/haskell_overlay/default.nix b/third_party/haskell_overlay/default.nix
index b996cd48c448..c1d257808549 100644
--- a/third_party/haskell_overlay/default.nix
+++ b/third_party/haskell_overlay/default.nix
@@ -50,6 +50,10 @@ self: super: with pkgs.haskell.lib; rec {
     sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
   } {});
 
+  # random <1.2
+  test-framework = doJailbreak super.test-framework;
+  hashable = doJailbreak super.hashable;
+
   random-source = overrideSrc super.random-source rec {
     src = pkgs.fetchzip {
       url = "mirror://hackage/random-source-${version}/random-source-${version}.tar.gz";