about summary refs log tree commit diff
path: root/third_party/overlays
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-08-25T22·00-0700
committerwpcarro <wpcarro@gmail.com>2022-09-06T17·43+0000
commit7b8e30bdf33f69f27662b52b8be72a20b07cf161 (patch)
tree5b913fa2c04d27fc4c52d243183c75a6675e3221 /third_party/overlays
parentfd68fe043ce13e2d4f6b523589affc7863bf9b70 (diff)
chore(overlays/tvl): Remove stale overlays r/4685
As the comments explain:

> Workaround for srcOnly with separateDebugInfo until
> https://github.com/NixOS/nixpkgs/pull/179170 is merged.

> upgrade home-manager until the service-generation fix has landed upstream
> https://github.com/nix-community/home-manager/issues/2846

> Outdated test-data, see https://github.com/pganssle/zoneinfo/pull/115
> Can be dropped when https://github.com/NixOS/nixpkgs/pull/170450 lands.

All of the linked issues appear merged (or closed with a link to a merge PR),
so -- barring any failing Buildkite builds -- these may be safe to remove.

Change-Id: I85e9f3ba2ca970a11754a85cb9574705144bfdfa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6162
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays')
-rw-r--r--third_party/overlays/tvl.nix29
1 files changed, 0 insertions, 29 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 412a605aa9..ca9be65f5c 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -84,39 +84,10 @@ in
   # https://github.com/edolstra/nix-serve/issues/28
   nix-serve = super.nix-serve.override { nix = super.nix_2_3; };
 
-  # Workaround for srcOnly with separateDebugInfo until
-  # https://github.com/NixOS/nixpkgs/pull/179170 is merged.
-  srcOnly = args: (super.srcOnly args).overrideAttrs (_: {
-    outputs = [ "out" ];
-    separateDebugInfo = false;
-  });
-
   # Avoid builds of mkShell derivations in CI.
   mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: {
     passthru = {
       meta.ci.skip = true;
     };
   }));
-
-  # upgrade home-manager until the service-generation fix has landed upstream
-  # https://github.com/nix-community/home-manager/issues/2846
-  home-manager = super.home-manager.overrideAttrs (old: rec {
-    version = assert super.home-manager.version == "2021-12-25"; "2022-04-08";
-    src = self.fetchFromGitHub {
-      owner = "nix-community";
-      repo = "home-manager";
-      rev = "f911ebbec927e8e9b582f2e32e2b35f730074cfc";
-      sha256 = "07qa2qkbjczj3d0m03jpw85hfj35cbjm48xhifz3viy4khjw88vl";
-    };
-  });
-
-  python38 = super.python38.override {
-    packageOverrides = pySelf: pySuper: {
-      backports-zoneinfo = pySuper.backports-zoneinfo.overridePythonAttrs (_: {
-        # Outdated test-data, see https://github.com/pganssle/zoneinfo/pull/115
-        # Can be dropped when https://github.com/NixOS/nixpkgs/pull/170450 lands.
-        doCheck = false;
-      });
-    };
-  };
 }