cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

doggo: unpin go

Browse source
This commit is contained in:
Kirill Radzikhovskyy 2023-07-15 17:26:24 +10:00
parent 27f58aceb0
commit 9d4dab5df8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/doggo/default.nix
View file

@ -2,6 +2,7 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, fetchpatch
}:
buildGoModule rec {
@ -15,7 +16,16 @@ buildGoModule rec {
sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s=";
};
vendorHash = "sha256-UhSdYpK54c4+BAP/d/zU91LIBE05joOLHoV1XkNMYNw=";
patches = [
# go 1.20 support
# https://github.com/mr-karan/doggo/pull/66
(fetchpatch {
url = "https://github.com/mr-karan/doggo/commit/7db5c2144fa4a3f18afe1c724b9367b03f84aed7.patch";
hash = "sha256-cx8s23e02zIvJOtuqTz8XC9ApYODh96Ubl1KhsFUZ9g=";
})
];
vendorHash = "sha256-GVLfPK1DFVSfNSdIxYSaspHFphd8ft2HUK0SMeWiVUg=";
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "cmd/doggo" ];

4
pkgs/top-level/all-packages.nix
View file

@ -7186,9 +7186,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
doggo = callPackage ../tools/networking/doggo {
buildGoModule = buildGo119Module; # build fails with 1.20
};
doggo = callPackage ../tools/networking/doggo { };
dool = callPackage ../tools/system/dool { };