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

Merge pull request #82787 from Mic92/cross-build-go-module

Browse Source 
buildGoModule: enable strictDeps
This commit is contained in:
Jörg Thalheim 2020-03-18 13:16:37 +00:00 committed by GitHub
commit 8590ddd427
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -33,7 +33,9 @@ in buildGoPackage rec {
goPackagePath = "github.com/openshift/origin"; goPackagePath = "github.com/openshift/origin";
buildInputs = [ which rsync go-bindata kerberos clang ]; buildInputs = [ kerberos ];
nativeBuildInputs = [ which rsync go-bindata clang ];
patchPhase = '' patchPhase = ''
patchShebangs ./hack patchShebangs ./hack

4
pkgs/applications/networking/mailreaders/aerc/default.nix
View File

@ -17,10 +17,8 @@ in buildGoModule rec {
modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x";
nativeBuildInputs = [ nativeBuildInputs = [
go
scdoc scdoc
python3.pkgs.wrapPython python3.pkgs.wrapPython
notmuch
]; ];
patches = [ patches = [
@ -31,7 +29,7 @@ in buildGoModule rec {
python3.pkgs.colorama python3.pkgs.colorama
]; ];
buildInputs = [ python3 perl ]; buildInputs = [ python3 notmuch ];
GOFLAGS="-tags=notmuch"; GOFLAGS="-tags=notmuch";

2
pkgs/applications/networking/p2p/magnetico/default.nix
View File

@ -13,7 +13,7 @@ buildGoModule rec {
modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf"; modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf";
buildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
buildPhase = '' buildPhase = ''
make magneticow magneticod make magneticow magneticod
''; '';

2
pkgs/applications/virtualization/gvisor/containerd-shim.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule, go-bindata }: { lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec { buildGoModule rec {
name = "gvisor-containerd-shim-${version}"; name = "gvisor-containerd-shim-${version}";

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

@ -208,6 +208,8 @@ let
find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
''; '';
strictDeps = true;
disallowedReferences = lib.optional (!allowGoReference) go; disallowedReferences = lib.optional (!allowGoReference) go;
passthru = passthru // { inherit go go-modules modSha256; }; passthru = passthru // { inherit go go-modules modSha256; };

2
pkgs/servers/documize-community/default.nix
View File

@ -13,7 +13,7 @@ buildGoModule rec {
modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0";
buildInputs = [ go-bindata-assetfs go-bindata ]; nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
subPackages = [ "edition/community.go" ]; subPackages = [ "edition/community.go" ];

8
pkgs/servers/imgproxy/default.nix
View File

@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w"; modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w";
buildInputs = [ nativeBuildInputs = [ pkg-config ];
gobject-introspection
pkg-config buildInputs = [ gobject-introspection vips ];
vips
];
preBuild = '' preBuild = ''
export CGO_LDFLAGS_ALLOW='-(s|w)' export CGO_LDFLAGS_ALLOW='-(s|w)'

5
pkgs/servers/teleport/default.nix
View File

@ -14,8 +14,11 @@ buildGoPackage rec {
}; };
goPackagePath = "github.com/gravitational/teleport"; goPackagePath = "github.com/gravitational/teleport";
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
buildInputs = [ zip ];
nativeBuildInputs = [ zip ];
postBuild = '' postBuild = ''
pushd . pushd .
cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport