nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243602 from kirillrdy/doggo

Browse Source 
doggo: unpin go
This commit is contained in:
Nick Cao 2023-07-15 05:45:11 -06:00 committed by GitHub
commit dd4e9123f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { };