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

Merge pull request #83189 from Mic92/fixes-build-go-package

Browse Source 
Package fixes from buildGoPackage: enable strictDeps
This commit is contained in:
Jörg Thalheim 2020-03-23 08:42:07 +00:00 committed by GitHub
commit 50281a823f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/browsh/default.nix
View File

@ -26,7 +26,7 @@ in buildGoPackage rec {
sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0";
}; };
buildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
# embed the web extension in a go file and place it where it's supposed to # embed the web extension in a go file and place it where it's supposed to
# be. See # be. See

8
pkgs/applications/networking/cluster/kops/default.nix
View File

@ -18,8 +18,8 @@ let
inherit sha256; inherit sha256;
}; };
buildInputs = [go-bindata]; nativeBuildInputs = [ go-bindata ];
subPackages = ["cmd/kops"]; subPackages = [ "cmd/kops" ];
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -43,7 +43,7 @@ let
description = "Easiest way to get a production Kubernetes up and running"; description = "Easiest way to get a production Kubernetes up and running";
homepage = https://github.com/kubernetes/kops; homepage = https://github.com/kubernetes/kops;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [offline zimbatm kampka]; maintainers = with maintainers; [ offline zimbatm kampka ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} // attrs'; } // attrs';
@ -60,7 +60,7 @@ in rec {
version = "1.13.2"; version = "1.13.2";
sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
}; };
kops_1_14 = mkKops { kops_1_14 = mkKops {
version = "1.14.1"; version = "1.14.1";
sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n"; sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";

2
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi"; sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi";
}; };
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
outputs = ["out" "man" "pause"]; outputs = ["out" "man" "pause"];

5
pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
View File

@ -30,7 +30,9 @@ buildGoPackage rec {
sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz";
}; };
buildInputs = [ libvirt pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libvirt ];
# mkisofs needed to create ISOs holding cloud-init data, # mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
@ -48,4 +50,3 @@ buildGoPackage rec {
maintainers = with maintainers; [ mic92 ]; maintainers = with maintainers; [ mic92 ];
}; };
} }

4
pkgs/applications/networking/instant-messengers/coyim/default.nix
View File

@ -14,7 +14,9 @@ buildGoPackage rec {
sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "a safe and secure chat client"; description = "a safe and secure chat client";

5
pkgs/applications/version-management/gitea/default.nix
View File

@ -29,8 +29,9 @@ buildGoPackage rec {
substituteInPlace modules/setting/setting.go --subst-var data substituteInPlace modules/setting/setting.go --subst-var data
''; '';
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ];
++ optional pamSupport pam;
buildInputs = optional pamSupport pam;
preBuild = let preBuild = let
tags = optional pamSupport "pam" tags = optional pamSupport "pam"

5
pkgs/applications/version-management/gogs/default.nix
View File

@ -24,8 +24,9 @@ buildGoPackage rec {
substituteInPlace pkg/setting/setting.go --subst-var data substituteInPlace pkg/setting/setting.go --subst-var data
''; '';
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ];
++ optional pamSupport pam;
buildInputs = optional pamSupport pam;
buildFlags = [ "-tags" ]; buildFlags = [ "-tags" ];

5
pkgs/applications/virtualization/containerd/default.nix
View File

@ -16,7 +16,10 @@ buildGoPackage rec {
goPackagePath = "github.com/containerd/containerd"; goPackagePath = "github.com/containerd/containerd";
outputs = [ "bin" "out" "man" ]; outputs = [ "bin" "out" "man" ];
buildInputs = [ btrfs-progs go-md2man utillinux ]; nativeBuildInputs = [ go-md2man utillinux ];
buildInputs = [ btrfs-progs ];
buildFlags = [ "VERSION=v${version}" ]; buildFlags = [ "VERSION=v${version}" ];
BUILDTAGS = [] BUILDTAGS = []

4
pkgs/applications/virtualization/singularity/default.nix
View File

@ -27,8 +27,8 @@ buildGoPackage rec {
goPackagePath = "github.com/sylabs/singularity"; goPackagePath = "github.com/sylabs/singularity";
goDeps = ./deps.nix; goDeps = ./deps.nix;
buildInputs = [ openssl ]; buildInputs = [ openssl utillinux ];
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ]; nativeBuildInputs = [ removeReferencesTo which makeWrapper ];
propagatedBuildInputs = [ coreutils squashfsTools ]; propagatedBuildInputs = [ coreutils squashfsTools ];
prePatch = '' prePatch = ''

3
pkgs/development/tools/go2nix/default.nix
View File

@ -19,7 +19,8 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ]; outputs = [ "bin" "out" "man" ];
buildInputs = [ go-bindata gotools makeWrapper ]; nativeBuildInputs = [ go-bindata gotools makeWrapper ];
preBuild = ''go generate ./...''; preBuild = ''go generate ./...'';
postInstall = '' postInstall = ''

7
pkgs/development/tools/wally-cli/default.nix
View File

@ -7,10 +7,9 @@ buildGoPackage rec {
goPackagePath = "github.com/zsa/wally"; goPackagePath = "github.com/zsa/wally";
subPackages = [ "cli" ]; subPackages = [ "cli" ];
nativeBuildInputs = [ nativeBuildInputs = [ pkg-config ];
pkg-config
libusb1 buildInputs = [ libusb1 ];
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zsa"; owner = "zsa";

6
pkgs/servers/hydron/default.nix
View File

@ -15,8 +15,10 @@ buildGoPackage {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ]; nativeBuildInputs = [ pkgconfig go-bindata ];
buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/bakape/hydron"; homepage = "https://github.com/bakape/hydron";

4
pkgs/servers/livepeer/default.nix
View File

@ -16,7 +16,9 @@ buildGoPackage rec {
sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia";
}; };
buildInputs = [ pkgconfig ffmpeg ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/servers/meguca/default.nix
View File

@ -17,10 +17,10 @@ buildGoPackage {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake go-bindata ];
buildInputs = [ buildInputs = [
ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata ffmpeg-full graphicsmagick ghostscript quicktemplate
easyjson emscripten opencv statik easyjson emscripten opencv statik
]; ];

2
pkgs/servers/traefik/default.nix
View File

@ -13,7 +13,7 @@ buildGoPackage rec {
sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v";
}; };
buildInputs = [ go-bindata bash ]; nativeBuildInputs = [ go-bindata bash ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild

2
pkgs/tools/networking/ngrok-1/default.nix
View File

@ -16,7 +16,7 @@ buildGoPackage rec {
goDeps = ./deps.nix; goDeps = ./deps.nix;
buildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
preConfigure = '' preConfigure = ''
sed -e '/jteeuwen\/go-bindata/d' \ sed -e '/jteeuwen\/go-bindata/d' \

3
pkgs/tools/package-management/morph/default.nix
View File

@ -14,8 +14,7 @@ buildGoPackage rec {
goPackagePath = "github.com/dbcdk/morph"; goPackagePath = "github.com/dbcdk/morph";
goDeps = ./deps.nix; goDeps = ./deps.nix;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper go-bindata ];
buildInputs = [ go-bindata ];
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=

9
pkgs/tools/system/localtime/default.nix
View File

@ -9,13 +9,14 @@ buildGoPackage rec {
rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce"; rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce";
sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8";
}; };
goPackagePath = "github.com/Stebalien/localtime"; goPackagePath = "github.com/Stebalien/localtime";
buildInputs = [ m4 ]; nativeBuildInputs = [ m4 ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"
"BINDIR=${placeholder "bin"}/bin" "BINDIR=${placeholder "bin"}/bin"
]; ];
buildPhase = '' buildPhase = ''