From 1a0329fa5b5d6f5be74e6ba9767b3085aee91a18 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 27 Dec 2022 14:25:16 -0800 Subject: [PATCH 1/2] debian-devscripts: Fix up a /bin/bash reference https://github.com/Debian/devscripts/blob/v2.22.1/lib/Devscripts/Config.pm#L234 Signed-off-by: Anders Kaseorg --- pkgs/tools/misc/debian-devscripts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 343713c02255..22f091e0c3ea 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -34,13 +34,14 @@ in stdenv.mkDerivation rec { tgtpy="$out/lib/${python.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" - find po4a scripts -type f -exec sed -r \ + find lib po4a scripts -type f -exec sed -r \ -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \ -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -e "s@sensible-editor@${sensible-editor}@g" \ + -e "s@(^|\W)/bin/bash@\1${stdenv.shell}@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile sed -r \ From da8ac76bc4f8dae3b79af76558febf0a03b5d4fb Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 27 Dec 2022 14:25:39 -0800 Subject: [PATCH 2/2] debian-devscripts: Add missing symlinks https://github.com/Debian/devscripts/blob/v2.22.1/debian/links Signed-off-by: Anders Kaseorg --- pkgs/tools/misc/debian-devscripts/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 22f091e0c3ea..6b710f2e2c0d 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -67,6 +67,9 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --prefix PATH : "${dpkg}/bin" done + ln -s cvs-debi $out/bin/cvs-debc + ln -s debchange $out/bin/dch + ln -s pts-subscribe $out/bin/pts-unsubscribe ''; meta = with lib; {