diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-10 09:10:49 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-11 06:00:38 +1000 |
| commit | 26117ed4b78020252e49fe75f562378063471f71 (patch) | |
| tree | cff3b6969f746e55c9bf847be67427823a465808 /pkgs | |
| parent | 1373f75002b518cfdffb5ed6df0e83ca53789dbb (diff) | |
| download | nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar.gz nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar.bz2 nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar.lz nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar.xz nixpkgs-26117ed4b78020252e49fe75f562378063471f71.tar.zst nixpkgs-26117ed4b78020252e49fe75f562378063471f71.zip | |
buildGo{Module,Package}: remove disabled
This doesn't seem to have been used since pkgs/top-level/go-packages.nix was split up.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/go-packages/generic/default.nix | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 130387a97b0..c0f10ab5d8f 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -27,9 +27,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Do not enable this without good reason # IE: programs coupled with the compiler , allowGoReference ? false @@ -243,9 +240,7 @@ let [ lib.maintainers.kalbasit ]; }; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else if (goPackagePath != null) then +in if (goPackagePath != null) then throw "`goPackagePath` not needed with `buildGoModule`" else package diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index ab8ee9166f9..3f85b6e0268 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -10,9 +10,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Go import path of the package , goPackagePath @@ -249,7 +246,5 @@ let platforms = go.meta.platforms or lib.platforms.all; } // meta; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else +in package |