diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 8ab67d35da14..18c674e76fd4 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -18,6 +18,7 @@ pkg-config, bash-completion, help2man, + nix-update-script, sendmailPath ? "/run/wrappers/bin/sendmail", }: @@ -29,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.15"; + version = "2.25.16"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-s2QSfJyHsFr1eiia/yFj3jsS5k38xNewEe/g5PFpqag="; + hash = "sha256-cbaG7yNZt+205fa6HGEjLOjLsW3HloLQHvcGGjmnXDM="; }; patches = [ @@ -51,10 +52,13 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace scripts/debrebuild.pl \ --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl" patchShebangs scripts + '' + + # Remove man7 target to avoid missing *.7 file error - substituteInPlace doc/Makefile \ - --replace-fail " install_man7" "" - ''; + '' + substituteInPlace doc/Makefile \ + --replace-fail " install_man7" "" + ''; nativeBuildInputs = [ makeWrapper @@ -95,11 +99,11 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find lib po4a scripts -type f -exec sed -r \ - -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \ + -e "s@/usr/bin/gpg(2|)@${lib.getExe' gnupg "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@/usr/bin/diff@${lib.getExe' diffutils "diff"}@g" \ + -e "s@/usr/bin/gpgv(2|)@${lib.getExe' gnupg "gpgv"}@g" \ + -e "s@(command -v|/usr/bin/)curl@${lib.getExe curl}@g" \ -e "s@sensible-editor@${sensible-editor}@g" \ -e "s@(^|\W)/bin/bash@\1${stdenv.shell}@g" \ -i {} + @@ -131,6 +135,8 @@ stdenv.mkDerivation (finalAttrs: { ln -s pts-subscribe $out/bin/pts-unsubscribe ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Debian package maintenance scripts"; license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO