From eda22858950b00b6d6cfe15c313367ef06979a59 Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Fri, 21 Feb 2025 10:34:45 +0100 Subject: [PATCH 1/2] mydumper: 0.17.1-1 -> 0.18.1-1 --- pkgs/by-name/my/mydumper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index 280455d6df2a..88fe4124355f 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "mydumper"; - version = "0.17.1-1"; + version = "0.18.1-1"; src = fetchFromGitHub { owner = pname; repo = pname; tag = "v${version}"; - hash = "sha256-PidivIe9zzLeRpn9ECfF6qVmkP/Xd+6kIYQXo64V9fM="; + hash = "sha256-7CnNcaZ2jLlLx211DA5Zk3uf724yCMpt/0zgjvZl3fM="; # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule fetchSubmodules = true; }; From d8e8273ddca3a26c3077c05c718d5d252c241061 Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Fri, 21 Feb 2025 12:04:19 +0100 Subject: [PATCH 2/2] mydumper: copy pre-built docs instead of building them --- pkgs/by-name/my/mydumper/package.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index 88fe4124355f..68e8fda87c6f 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -3,9 +3,8 @@ stdenv, fetchFromGitHub, cmake, + installShellFiles, pkg-config, - sphinx, - python3Packages, glib, pcre, pcre2, @@ -45,11 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - # for docs - sphinx - python3Packages.furo - python3Packages.sphinx-copybutton - python3Packages.sphinx-inline-tabs + installShellFiles ]; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -73,7 +68,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_DOCS=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" ]; @@ -92,14 +86,13 @@ stdenv.mkDerivation rec { # as of mydumper v0.14.5-1, mydumper tries to install its config to /etc substituteInPlace CMakeLists.txt\ --replace-fail "/etc" "$out/etc" - - # as of mydumper v0.16.5-1, mydumper disables building docs by default - substituteInPlace CMakeLists.txt\ - --replace-fail "# add_subdirectory(docs)" "add_subdirectory(docs)" ''; - preBuild = '' - cp -r $src/docs/images ./docs + # copy man files & docs over + postInstall = '' + installManPage $src/docs/man/* + mkdir -p $doc/share/doc/mydumper + cp -r $src/docs/html/* $doc/share/doc/mydumper ''; passthru.updateScript = nix-update-script {