From 2548deea19f07e362af6da7bf4b5749fb54bb5e0 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 8 Feb 2026 19:28:39 +0100 Subject: [PATCH] lockfile-progs: rename from lockfileProgs fit attrname to pname --- .../lo/{lockfileProgs => lockfile-progs}/package.nix | 0 pkgs/by-name/lo/logcheck/package.nix | 6 +++--- pkgs/by-name/mo/monkeysphere/package.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/by-name/lo/{lockfileProgs => lockfile-progs}/package.nix (100%) diff --git a/pkgs/by-name/lo/lockfileProgs/package.nix b/pkgs/by-name/lo/lockfile-progs/package.nix similarity index 100% rename from pkgs/by-name/lo/lockfileProgs/package.nix rename to pkgs/by-name/lo/lockfile-progs/package.nix diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix index 0f4861ca51e8..1681923c84a4 100644 --- a/pkgs/by-name/lo/logcheck/package.nix +++ b/pkgs/by-name/lo/logcheck/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - lockfileProgs, + lockfile-progs, perlPackages, }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace src/logtail --replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl" substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl" - sed -i -e 's|! -f /usr/bin/lockfile|! -f ${lockfileProgs}/bin/lockfile|' \ - -e 's|^\([ \t]*\)lockfile-|\1${lockfileProgs}/bin/lockfile-|' \ + sed -i -e 's|! -f /usr/bin/lockfile|! -f ${lockfile-progs}/bin/lockfile|' \ + -e 's|^\([ \t]*\)lockfile-|\1${lockfile-progs}/bin/lockfile-|' \ -e "s|/usr/sbin/logtail2|$out/sbin/logtail2|" \ -e 's|mime-construct|${perlPackages.mimeConstruct}/bin/mime-construct|' \ -e 's|\$(run-parts --list "\$dir")|"$dir"/*|' src/logcheck diff --git a/pkgs/by-name/mo/monkeysphere/package.nix b/pkgs/by-name/mo/monkeysphere/package.nix index 8393ce4b4d6c..8f00f2e84ae0 100644 --- a/pkgs/by-name/mo/monkeysphere/package.nix +++ b/pkgs/by-name/mo/monkeysphere/package.nix @@ -7,7 +7,7 @@ libassuan, libgcrypt, perlPackages, - lockfileProgs, + lockfile-progs, gnupg, coreutils, # For the tests: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cpio hexdump procps - lockfileProgs + lockfile-progs ] ++ (with perlPackages; [ CryptOpenSSLRSA @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { wrapPrograms = runtimeDeps: programs: lib.concatMapStrings (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] - + wrapPrograms [ gnupg lockfileProgs ] [ "monkeysphere" ] + + wrapPrograms [ gnupg lockfile-progs ] [ "monkeysphere" ] + '' # These 4 programs depend on the program name ($0): for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45239bd1f633..2970e320adbc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1164,6 +1164,7 @@ mapAliases { llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12 llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 + lockfileProgs = warnAlias "'lockfileProgs' has been renamed to 'lockfile-progs'" lockfile-progs; # Added 2026-02-08 loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27 log4j-detect = throw "'log4j-detect' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 log4j-scan = throw "'log4j-scan' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15