From e31ace5cd4bd50e773604deca5939d49985d11e6 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 14 Sep 2024 21:47:59 +0800 Subject: [PATCH] buildGoModule: use lib.toExtension Use toExtension from Nixpkgs library instead of the one defined locally. --- pkgs/build-support/go/module.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index b8dd1cbd6f1f..e1e39918436b 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -63,20 +63,6 @@ let GO111MODULE = "on"; GOTOOLCHAIN = "local"; - toExtension = - overlay0: - if lib.isFunction overlay0 then - final: prev: - if lib.isFunction (overlay0 prev) then - # `overlay0` is `final: prev: { ... }` - overlay0 final prev - else - # `overlay0` is `prev: { ... }` - overlay0 prev - else - # `overlay0` is `{ ... }` - final: prev: overlay0; - in (stdenv.mkDerivation (finalAttrs: args @@ -333,7 +319,7 @@ in # Canonicallize `overrideModAttrs` as an attribute overlay. # `passthru.overrideModAttrs` will be overridden # when users want to override `goModules`. - overrideModAttrs = toExtension overrideModAttrs; + overrideModAttrs = lib.toExtension overrideModAttrs; } // passthru; meta = {