public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildGo{Module,Package}: remove disabled 

This doesn't seem to have been used since pkgs/top-level/go-packages.nix was split up.
This commit is contained in:
zowoq 2021-01-10 09:10:49 +10:00
parent 1373f75002
commit 26117ed4b7
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/go-modules/generic/default.nix
View File

@ -27,9 +27,6 @@
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
# Disabled flag
, disabled ? false
# Do not enable this without good reason # Do not enable this without good reason
# IE: programs coupled with the compiler # IE: programs coupled with the compiler
, allowGoReference ? false , allowGoReference ? false
@ -243,9 +240,7 @@ let
[ lib.maintainers.kalbasit ]; [ lib.maintainers.kalbasit ];
}; };
}); });
in if disabled then in if (goPackagePath != null) then
throw "${package.name} not supported for go ${go.meta.branch}"
else if (goPackagePath != null) then
throw "`goPackagePath` not needed with `buildGoModule`" throw "`goPackagePath` not needed with `buildGoModule`"
else else
package package

7
pkgs/development/go-packages/generic/default.nix
View File

@ -10,9 +10,6 @@
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
# Disabled flag
, disabled ? false
# Go import path of the package # Go import path of the package
, goPackagePath , goPackagePath
@ -249,7 +246,5 @@ let
platforms = go.meta.platforms or lib.platforms.all; platforms = go.meta.platforms or lib.platforms.all;
} // meta; } // meta;
}); });
in if disabled then in
throw "${package.name} not supported for go ${go.meta.branch}"
else
package package