diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
| commit | 34b58aaefccdb5c64b912903973ba729bae58be3 (patch) | |
| tree | e18a96bc0f066422356a8da655453403baa97e64 /nixpkgs/pkgs/tools/misc | |
| parent | 7be318098d7fe87d896e8787bfadc0345149cb59 (diff) | |
| parent | 3fb937a1e9f4157f57011965b99fcb7f4139d9ad (diff) | |
| download | nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.gz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.bz2 nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.lz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.xz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.zst nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/multitail/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/pipe-rename/default.nix | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix index 75e5340c2613..647991b412a2 100644 --- a/nixpkgs/pkgs/tools/misc/multitail/default.nix +++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.1.1"; + version = "7.1.2"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-qQc7FqpkAri/RE1hJIC4P6n1Jc6TJwBcR0Dp5n5QDQg="; + sha256 = "sha256-00NZI/KFcgEAkvESnx0KQFW1GvX6FgZLA4Z1Fv2qi+E="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix index 826d77815bc3..dc8e545a7d8e 100644 --- a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ python3 ]; + checkFlags = [ + # tests are failing upstream + "--skip=test_dot" + "--skip=test_dotdot" + ]; + preCheck = '' patchShebangs tests/editors/env-editor.py ''; |