From 587812bdb5615fce703892cc1e06100ad17144a7 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 27 Jun 2024 13:33:12 -0700 Subject: [PATCH] Delete prefetch-npm-deps hack since we dropped 23.11 The fix upstream is in 24.05 at release, so no need for the hack anymore. https://github.com/NixOS/nixpkgs/commit/ddb94deafad959c7a3ad1e34bbf2184fcec1a0f9 --- overlay.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/overlay.nix b/overlay.nix index c9840df..ec76bb2 100644 --- a/overlay.nix +++ b/overlay.nix @@ -28,10 +28,6 @@ let nix = final.nixVersions.nix_2_18_upstream; }); - inherit (prev) lib; - - prefetch-npm-deps-args = lib.functionArgs prev.prefetch-npm-deps.override; - warning = '' warning: You have the lix overlay included into a nixpkgs import twice, perhaps due to the NixOS module being included twice, or because of using @@ -80,14 +76,6 @@ let } ); - # support both having and missing https://github.com/NixOS/nixpkgs/pull/304913 - prefetch-npm-deps = - if (prefetch-npm-deps-args ? nix) || (prefetch-npm-deps-args == {}) - then prev.prefetch-npm-deps.override { - nix = final.nixVersions.nix_2_18_upstream; - } - else prev.prefetch-npm-deps; - nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; }; pegtl = prev.callPackage ./pegtl.nix { };