Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go_1_18: Use apple_sdk_11_0.callPackage #180704

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
23bb886
go,goBuildModules: bump default go version to 1.18
SuperSandro2000 Jun 29, 2022
3e55e5f
cod: mark broken
SuperSandro2000 Jun 29, 2022
9f11f30
cosign: pin to go 1.17
SuperSandro2000 Jun 29, 2022
dd9699f
mole: pin to go 1.17
SuperSandro2000 Jun 29, 2022
47bcda1
garble: pin to go 1.17
SuperSandro2000 Jun 29, 2022
70a90a9
dendrite: pin to go 1.17
SuperSandro2000 Jun 29, 2022
6bfc087
hyprspace: pin to go 1.17
SuperSandro2000 Jun 29, 2022
54eade4
gomplate: pin to go 1.17
SuperSandro2000 Jun 29, 2022
466be9c
gophernotes: pin to go 1.17
SuperSandro2000 Jun 29, 2022
078497b
livedl: pin to go 1.17
SuperSandro2000 Jun 29, 2022
268e167
go-chromecast: pin to go 1.17
SuperSandro2000 Jun 29, 2022
d41c831
go-mockery: pin to go 1.17
SuperSandro2000 Jun 29, 2022
af4c956
grafana-agent: pin to go 1.17
SuperSandro2000 Jun 29, 2022
0d03879
vegeta: pin to go 1.17
SuperSandro2000 Jun 29, 2022
2dfb68c
gowitness: pin to go 1.17
SuperSandro2000 Jun 29, 2022
b28fee2
kconf: pint to go 1.17
SuperSandro2000 Jun 29, 2022
0e15084
marathonctl: pin to go 1.17
SuperSandro2000 Jun 29, 2022
60de972
prometheus-nats-exporter: pin to go 1.17
SuperSandro2000 Jun 29, 2022
b096ce2
unconvert: pin to go 1.17
SuperSandro2000 Jun 30, 2022
c11a46f
toxiproxy: pin to go 1.17
SuperSandro2000 Jun 30, 2022
74236d1
photon: fix hash
SuperSandro2000 Jul 4, 2022
2d8f89b
proto-contrib: fix hash, remove redundand platforms
SuperSandro2000 Jul 4, 2022
c61a3e7
sqlc: fix vendor hash, fix meta.platforms
SuperSandro2000 Jul 4, 2022
6a9d1ff
steampipe: fix vendor hash
SuperSandro2000 Jul 4, 2022
f38e7e4
pigeon: fix vendor hash
SuperSandro2000 Jul 4, 2022
6b80151
vgo2nix: remove myself from maintainers
SuperSandro2000 Jul 4, 2022
0e571ff
vgo2nix: mark broken
SuperSandro2000 Jul 4, 2022
761038c
protoc-gen-twirp_typescript: fix vendor hash
SuperSandro2000 Jul 4, 2022
006aaa9
argocd-autopilot: fix vendor hash
SuperSandro2000 Jul 5, 2022
2668913
protolock: fix vendor hash
SuperSandro2000 Jul 5, 2022
2337315
wails: fix vendor hash
SuperSandro2000 Jul 5, 2022
9c44720
endlessh-go: fix vendor hash
SuperSandro2000 Jul 5, 2022
9d7aee2
telegraf: fix vendor hash
SuperSandro2000 Jul 5, 2022
bd5990e
zsh-history: fix vendor hash, formatting
SuperSandro2000 Jul 5, 2022
5c0377b
opentelemetry-collector: fix vendor hash
SuperSandro2000 Jul 5, 2022
69b4db6
go_1_18: Use apple_sdk_11_0.callPackage
toonn Jul 8, 2022
6fcbfcd
Merge branch 'SuperSandro2000-go-1-18' into go-118-darwin
toonn Jul 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-dLmJQCASdWkzWOPQ0bdJLe2AD06+L2ghP2yWry1XL1k=";
};

vendorSha256 = "sha256-0v/HTiQf/mZUU1b55jAnSj86NEFOUaiM+/MrVvwJYBM=";
vendorSha256 = "sha256-irX6XbqSbBIrlsCBZP4jd3eUCYPoYOTlJEzw2hXfirc=";

proxyVendor = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildGoModule rec {

proxyVendor = true;

vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g=";
vendorSha256 = "sha256-n9XNqXIoqn+f0xKCenJWXUYXtQhtbNBar68onWH/WV4=";

meta = with lib; {
description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/protolock/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo=";
};

vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk=";
vendorSha256 = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4=";

postInstall = ''
rm $out/bin/plugin*
Expand Down
9 changes: 3 additions & 6 deletions pkgs/development/tools/database/sqlc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@ buildGoModule {
};

proxyVendor = true;
vendorSha256 = "sha256-zZ0IrtfQvczoB7th9ZCUlYOtyZr3Y3yF0pKzRCqmCjo=";
vendorSha256 = "sha256-miyNIF6RNOuvNEA9Hf+hOyRJG+5IcXU4Vo4Fzn+nIb4=";

subPackages = [ "cmd/sqlc" ];

meta = let
inherit (lib) licenses platforms maintainers;
in {
description = " Generate type-safe code from SQL";
meta = with lib; {
description = "Generate type-safe code from SQL";
homepage = "https://sqlc.dev/";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.adisbladis ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/pigeon/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
};

vendorSha256 = "sha256-07zoQL4mLPSERBkZ3sz35Av7zdZsjTyGR8zbA86EEjU=";
vendorSha256 = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E=";

proxyVendor = true;

Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/tools/proto-contrib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk";
};

vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc";
vendorSha256 = "sha256-XAFB+DDWN7CLfNxIBqYJy88gUNrUJYExzy2/BFnBe8c=";

doCheck = false;

Expand All @@ -20,6 +20,5 @@ buildGoModule rec {
homepage = "https://github.com/emicklei/proto-contrib";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule {
sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA=";
};

vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M=";
vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ=";

subPackages = [ "." ];

Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/tools/vgo2nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ buildGoModule {
description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files";
homepage = "https://github.com/nix-community/vgo2nix";
license = licenses.mit;
maintainers = with maintainers; [ adisbladis SuperSandro2000 ];
maintainers = with maintainers; [ adisbladis ];
mainProgram = "vgo2nix";
# vendoring fails with cryptic error:
# reading file:///nix/store/..../github.com/orivej/e/@v/v0.0.0-20180728214217-ac3492690fda.zip: no such file or directory
broken = true;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/wails/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildGoModule rec {
sha256 = "sha256-KelPMb0ANEh0eW0vBGMydrwWm93wiwcIBoOetQ6EJgM=";
} + "/v2";

vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";
vendorSha256 = "sha256-QpBFsIDjE8ycMqNhGRcMGq9e3L11jl1zMuiEBM9DrHE=";

proxyVendor = true;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/endlessh-go/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildGoModule rec {
hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw=";
};

vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A=";
vendorSha256 = "sha256-5a/V2OQGVRIJVl/YG+lvtbLeHCy/1eiZu69zKIFqRKM=";

proxyVendor = true;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/telegraf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk=";
};

vendorSha256 = "sha256-E1p9hnxNFse7Zg8FGcZrbVqThrGTVSP04nH/ZP8WBlk=";
vendorSha256 = "sha256-VyNPIYRMAC51zp38BKoM5/bLbfwULtFEtRC3LQjVJK4=";
proxyVendor = true;

ldflags = [
Expand Down
13 changes: 6 additions & 7 deletions pkgs/shells/zsh/zsh-history/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ buildGoModule rec {
sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3";
};

nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8=";

vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws";
nativeBuildInputs = [ installShellFiles ];

doCheck = false;

Expand All @@ -23,16 +23,15 @@ buildGoModule rec {
installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
'';

passthru.tests = {
zsh-history-shell-integration = nixosTests.zsh-history;
};

meta = with lib; {
description = "A CLI to provide enhanced history for your ZSH shell";
homepage = "https://github.com/b4b4r07/history";
license = licenses.mit;
maintainers = with maintainers; [ ];
mainProgram = "history";
platforms = platforms.unix;
};

passthru.tests = {
zsh-history-shell-integration = nixosTests.zsh-history;
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/misc/cod/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ buildGoModule rec {
'';

meta = with lib; {
broken = stdenv.isDarwin;
description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output";
homepage = "https://github.com/dim-an/cod/";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
broken = true;
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/misc/opentelemetry-collector/contrib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildGoModule rec {
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-CzFcSvJCMfS83Semk92XUd9iSX6OjOrDzRUNNLVtpi4=";
vendorSha256 = "sha256-G3sIWkYKYnqDmmwspQNw+8yU/SWBBr8KX7Osae9mXe4=";

subPackages = [ "cmd/otelcontribcol" ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/misc/steampipe/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-Qq8i/uU2TtrEpvTPFmnZdku2vNo5O240dAT2OQKel1U=";
};

vendorSha256 = "sha256-pEQG9BHhsVDVSOoKJBocLXMLjmP72RM+GXz4nYD4D7s=";
vendorSha256 = "sha256-e4dpWD3a1mJzAqaW0na6pq+HIqJwK8tDIA+ENdyqyAU=";
proxyVendor = true;

nativeBuildInputs = [ installShellFiles ];
Expand All @@ -30,10 +30,10 @@ buildGoModule rec {
'';

meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://steampipe.io/";
description = "select * from cloud;";
license = licenses.agpl3;
maintainers = with maintainers; [ hardselius ];
broken = stdenv.isDarwin;
};
}
Loading