diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-20 10:43:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 10:43:15 -0400 |
| commit | d30ff65b24780acb2323b1873801a77bd4151239 (patch) | |
| tree | 00224ae519d77f2e6f8a17f90f34dfcc0844dac2 | |
| parent | 57eac43da2cde5212eb2c4643ef170c324ef3558 (diff) | |
| parent | 2dc55fedc7740ace4286ad567538a90234ad5102 (diff) | |
| download | nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar.gz nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar.bz2 nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar.lz nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar.xz nixlib-d30ff65b24780acb2323b1873801a77bd4151239.tar.zst nixlib-d30ff65b24780acb2323b1873801a77bd4151239.zip | |
Merge pull request #296715 from linyinfeng/godns-by-name
godns: 3.0.7 -> 3.1.5, migrate to by-name
| -rw-r--r-- | pkgs/by-name/go/godns/package.nix (renamed from pkgs/tools/networking/godns/default.nix) | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/by-name/go/godns/package.nix index a41d1993270b..0e5e155523d6 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -1,25 +1,50 @@ { lib , buildGoModule , fetchFromGitHub +, nodejs +, npmHooks +, fetchNpmDeps , nix-update-script }: buildGoModule rec { pname = "godns"; - version = "3.0.7"; + version = "3.1.5"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-7zgvrEVt8xg54NijcqnXoZcXetzOu9h3Ucw7w03YagU="; + hash = "sha256-kdClyeU0hR0ymVLn9xe/kYVJE/9P/hAz/5UwRAQ2KCU="; }; - vendorHash = "sha256-veDrGB6gjUa8G/UyKzEgH2ItGGEPlXDePahq2XP2nAo="; + vendorHash = "sha256-kSREFNIGH0MXiyKMp1LmrLkhKBhovvNRz46LTXT2XME="; + npmDeps = fetchNpmDeps { + src = "${src}/web"; + hash = "sha256-2yeqLly0guU/kpX+yH/QOoDGzyJTxkTaCt8EleJhybU="; + }; + + npmRoot = "web"; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + overrideModAttrs = oldAttrs: { + # Do not add `npmConfigHook` to `goModules` + nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; + # Do not run `preBuild` when building `goModules` + preBuild = null; + }; # Some tests require internet access, broken in sandbox doCheck = false; + preBuild = '' + npm --prefix="$npmRoot" run build + go generate ./... + ''; + ldflags = [ "-s" "-w" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63535edb8235..039a0aa0b89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1861,8 +1861,6 @@ with pkgs; gofu = callPackage ../applications/misc/gofu { }; - godns = callPackage ../tools/networking/godns { }; - godspeed = callPackage ../tools/networking/godspeed { }; goodhosts = callPackage ../tools/networking/goodhosts { }; |