about summary refs log tree commit diff
path: root/third_party/nixpkgs-exposed/haskell_overlay
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-02-19T11·42+0100
committersterni <sternenseemann@systemli.org>2021-02-19T14·45+0000
commite628862e97acc5cd9aa2c9da86f26edd6d14605c (patch)
tree186c425ff9f56cd65603f4416c0d521581379bb7 /third_party/nixpkgs-exposed/haskell_overlay
parente174bad35ba1a5a7de3a8aec3420ca210b78f7e5 (diff)
chore(3p): Bump NixOS channels to 2021-02-18 r/2221
Main motivation for this is to get the openldap update that fixes
10 CVEs: CVE-2020-36221 to including CVE-2020-36230. See also this
issue which lists them all: https://github.com/NixOS/nixpkgs/issues/113490

Someone should also redeploy whitby as soon as this lands in canon and
all build failures have been fixed.

Things done to resolve upstream breakages:

* grpc no longer takes abseil-cpp as an input, it has also been removed
  in the override.

* Upgrade glittershark's kernel to 5.11 since the linuxPackages_5_9
  attribute has been removed by upstream and the patch used by them is
  available for 5.11 as well.

* The fixed output hash for third_patry.apereo-cas changed for some reason.

* Remove the pin of haskellPackages.vector from the haskell overlay. It
  broke as the most recent version of vector in nixos-unstable no longer
  depends on semigroups. This effectively updates vector from 0.12.1.2
  to 0.12.2.0.

* Align two comments in tvix/libstore/worker-protocol.hh because the
  updated clang-format now demands that.

Change-Id: I2ecf10a98de935e9222acf1feaea447d4c11ed2d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2538
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/nixpkgs-exposed/haskell_overlay')
-rw-r--r--third_party/nixpkgs-exposed/haskell_overlay/default.nix8
1 files changed, 0 insertions, 8 deletions
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/default.nix b/third_party/nixpkgs-exposed/haskell_overlay/default.nix
index 600d26541ec2..9598b9674035 100644
--- a/third_party/nixpkgs-exposed/haskell_overlay/default.nix
+++ b/third_party/nixpkgs-exposed/haskell_overlay/default.nix
@@ -90,14 +90,6 @@ self: super: with pkgs.haskell.lib; rec {
 
   test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
 
-  vector = overrideSrc (doJailbreak super.vector) rec {
-    src = pkgs.fetchzip {
-      url = "mirror://hackage/vector-${version}/vector-${version}.tar.gz";
-      sha256 = "1312lpb1f4jzbmcjp7mdf9l9ykp1hscxdr66cl8zlcs8kbr13bm7";
-    };
-    version = "0.12.1.2";
-  };
-
   vinyl = overrideSrc (markUnbroken super.vinyl)
     rec {
       src = pkgs.fetchzip {