diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-15 12:01:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 12:01:41 +0000 |
| commit | 2b17e91c71ae2587edd652b5a9a88e3f01d6c4df (patch) | |
| tree | 866959977f6a9a70a6e3f2f7229ce1783db855d0 /pkgs/tools | |
| parent | 8ed005a63f786bdd8738259a27bf488ae1002127 (diff) | |
| parent | 9ad53b7aaf2b9e9e0d7e36ff4f8a779bf9b0195f (diff) | |
| download | nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar.gz nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar.bz2 nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar.lz nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar.xz nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.tar.zst nixlib-2b17e91c71ae2587edd652b5a9a88e3f01d6c4df.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/bcache-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/text/miller/default.nix | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index f6dfdd84d8c4..58f6a05992e9 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { "UDEVLIBDIR=${placeholder "out"}/lib/udev/" ]; - preBuild = '' - sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules - ''; - preInstall = '' mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8" ''; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index df10755f14c9..0fd40b8732bd 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -8,7 +8,6 @@ , bc , ncurses , perl -, glibcLocales , testers , fzf }: @@ -19,7 +18,7 @@ let # warnings on non-nixos machines ourPerl = if !stdenv.isLinux then perl else ( writeShellScriptBin "perl" '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + export PERL_BADLANG=0 exec ${perl}/bin/perl "$@" ''); in diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3a4198fa630e..e2c5fac26f7d 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -11,8 +11,15 @@ buildGoModule rec { sha256 = "sha256-g2Jnqo3U9acyqohGpcEEogq871qJQTc7k0/oIawAQW8="; }; + outputs = [ "out" "man" ]; + vendorHash = "sha256-/1/FTQL3Ki8QzL+1J4Ah8kwiJyGPd024di/1MC8gtkE="; + postInstall = '' + mkdir -p $man/share/man/man1 + mv ./man/mlr.1 $man/share/man/man1 + ''; + subPackages = [ "cmd/mlr" ]; meta = with lib; { |