diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-06-13 22:45:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 22:45:38 +0200 |
| commit | 93963c27b934f24289a94b9e3784d60a9b77e92c (patch) | |
| tree | 02d78e9d823a1bec4b68bd2b2d7024e731048e47 | |
| parent | imagemagick6: 6.9.12-14 -> 6.9.12-15 (diff) | |
| parent | tmux: 3.2 -> 3.2a (diff) | |
| download | nixpkgs-93963c27b934f24289a94b9e3784d60a9b77e92c.tar.gz | |
Merge pull request #126502 from NixOS/backport-126468-to-release-21.05
[Backport release-21.05] tmux: 3.2 -> 3.2a
| -rw-r--r-- | pkgs/tools/misc/tmux/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 629cf548c26b..c76912e3c909 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , bison @@ -21,7 +20,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.2"; + version = "3.2a"; outputs = [ "out" "man" ]; @@ -29,18 +28,9 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; + sha256 = "0143ylfk7zsl3xmiasb768238gr582cfhsgv3p0h0f13bp8d6q09"; }; - patches = [ - # Fix cross-compilation - # https://github.com/tmux/tmux/pull/2651 - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch"; - sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr"; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook |