From 80f15f204a6ce1fa5a0a66a9a42d034eb80fc6bd Mon Sep 17 00:00:00 2001 From: sempiternal-aurora <78790545+sempiternal-aurora@users.noreply.github.com> Date: Mon, 18 May 2026 01:02:41 +1000 Subject: [PATCH] nginx-doc: update source Upstream has migrated the repos from mercurial to github No longer need the google analytics patch as they don't seem to include it anymore. --- .../nginx-doc/exclude-google-analytics.patch | 29 ------------------- pkgs/by-name/ng/nginx-doc/package.nix | 14 ++++----- 2 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch diff --git a/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch b/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch deleted file mode 100644 index c2f3f520c3d1..000000000000 --- a/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch +++ /dev/null @@ -1,29 +0,0 @@ -Kill google analytics from local documentation. - -diff -r bb0a2fbdc886 xslt/ga.xslt ---- a/xslt/ga.xslt Mon Apr 06 11:17:11 2020 +0100 -+++ b/xslt/ga.xslt Thu Apr 09 10:29:02 2020 -0400 -@@ -6,23 +6,6 @@ - - - -- -- -- - - - diff --git a/pkgs/by-name/ng/nginx-doc/package.nix b/pkgs/by-name/ng/nginx-doc/package.nix index f662c9696f7b..82ce623bb70b 100644 --- a/pkgs/by-name/ng/nginx-doc/package.nix +++ b/pkgs/by-name/ng/nginx-doc/package.nix @@ -3,7 +3,7 @@ stdenv, libxml2, libxslt, - fetchhg, + fetchFromGitHub, }: # Upstream maintains documentation (sources of https://nginx.org) in separate @@ -14,13 +14,13 @@ # $out/bin/nginx, but we have no better options. stdenv.mkDerivation { pname = "nginx-doc-unstable"; - version = "2022-05-05"; - src = fetchhg { - url = "https://hg.nginx.org/nginx.org"; - rev = "a3aee2697d4e"; - sha256 = "029n4mnmjw94h01qalmjgf1c2h3h7wm798xv5knk3padxiy4m28b"; + version = "0-unstable-2026-05-15"; + src = fetchFromGitHub { + owner = "nginx"; + repo = "nginx.org"; + rev = "7884e3ae20269c6aa718dc104c0c578f797e5269"; + hash = "sha256-ut2LRZg2gyGPbili7XcOH0wZ/nI3ArA2RGWJKcZTBOk="; }; - patches = [ ./exclude-google-analytics.patch ]; nativeBuildInputs = [ libxslt libxml2