From 526295a71d205f68a3000884981b9312fc400469 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Sat, 13 Jan 2024 19:21:34 +0100
Subject: chore(3p/sources): Bump channels & overlays

- Adjust to ecl 23.9.9 release

- Regenerate go protos after protoc-gen-go update

- Drop dhall fork which hasn't kept up with 1.42.*

- Address new clippy warnings:

  - Variant naming of Error::ValidationError
  - Simplify .try_into().unwrap()
  - Drop unnecessary identity function
  - Test module must be last in file
  - Drop unused `pub use`

- Update agenix to 0.15.0. Current master has a installCheckPhase that
  doesn't work with C++ Nix 2.3.*:
  https://github.com/ryantm/agenix/commit/a23aa271bec82d3e962bafb994595c1c4a62b133#commitcomment-137185861

Change-Id: Ic29eef20d6fd1362ce1031364a5ca6b4edf195bd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10615
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
---
 third_party/overlays/ecl-static.nix      |  9 ---------
 third_party/overlays/haskell/default.nix | 18 ------------------
 2 files changed, 27 deletions(-)

(limited to 'third_party/overlays')

diff --git a/third_party/overlays/ecl-static.nix b/third_party/overlays/ecl-static.nix
index 66579c33abce..d81075bdee30 100644
--- a/third_party/overlays/ecl-static.nix
+++ b/third_party/overlays/ecl-static.nix
@@ -20,15 +20,6 @@ self: super:
   ecl-static = (super.pkgsMusl.ecl.override {
     inherit (self.pkgsStatic) gmp libffi boehmgc;
   }).overrideAttrs (drv: rec {
-    # version must not be changed as it indicates where to find the bundled libs,
-    # using ecl HEAD is necessary for us since it includes multiple fixes to do
-    # with bytecode compilation and allows to concatenate fasc files again.
-    src = self.fetchFromGitLab {
-      owner = "embeddable-common-lisp";
-      repo = "ecl";
-      rev = "1c989247c1b0bf1d38a76aec30b9ca5e41afe1e3";
-      sha256 = "0bzjqw6m1kk5z5b81yizic347k931msp5lf78x65dcw3fqfwv3xn";
-    };
     configureFlags = drv.configureFlags ++ [
       "--disable-shared"
       "--with-dffi=no" # will fail at runtime anyways if statically linked
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 614fc26d5606..5dbb8f45f838 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -8,20 +8,6 @@ self: super: # overlay parameters for the nixpkgs overlay
 
 let
   haskellLib = self.haskell.lib.compose;
-  dhall-source = subdir: pkg:
-    haskellLib.overrideSrc
-      {
-        src = "${super.fetchFromGitHub {
-          owner = "Profpatsch";
-          repo = "dhall-haskell";
-          # https://github.com/dhall-lang/dhall-haskell/pull/2426
-          rev = "5e3a407d8ac826597d935d8398825a0ca73fc4e9";
-          sha256 = "005plj6kgxlkm9npaq07kmsgmiqk50dpwb9li9w1ly4aj1zgfjnd";
-        }}/${subdir}";
-      }
-      (haskellLib.overrideCabal { patches = [ ]; } pkg);
-
-
 in
 {
   haskellPackages = super.haskellPackages.override {
@@ -40,10 +26,6 @@ in
         haskellLib.doJailbreak
       ];
 
-      # TODO: this is to fix a bug in dhall-nix
-      dhall = dhall-source "dhall" hsSuper.dhall;
-      dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
-
       pa-prelude = hsSelf.callPackage ./extra-pkgs/pa-prelude.nix { };
       pa-error-tree = hsSelf.callPackage ./extra-pkgs/pa-error-tree-0.1.0.0.nix { };
       pa-field-parser = hsSelf.callPackage ./extra-pkgs/pa-field-parser.nix { };
-- 
cgit 1.4.1