diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-01-23 17:52:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 17:52:42 +0100 |
| commit | 65319e50ae9f3478dad17d628be8987c268c7e29 (patch) | |
| tree | d4b404c44d13794f1f307bb16d20e662b454ce2f /pkgs/applications/terminal-emulators | |
| parent | 1621a69fa42800f64f7aea6f8b78d9537d300bf3 (diff) | |
| parent | 5947b9e974318a76d942d9edd7ce4ab3078628ad (diff) | |
| download | nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar.gz nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar.bz2 nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar.lz nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar.xz nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.tar.zst nixpkgs-65319e50ae9f3478dad17d628be8987c268c7e29.zip | |
Merge pull request #152099 from ncfavier/alacritty
alacritty: 0.9.0 -> 0.10.0
Diffstat (limited to 'pkgs/applications/terminal-emulators')
| -rw-r--r-- | pkgs/applications/terminal-emulators/alacritty/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index a25613ba58e..78c6c0988c5 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kgZEbOGmO+uRKaWR+oQBiGkBzDSuCznUyWNUoMICHhk="; + sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ="; }; - cargoSha256 = "sha256-JqnYMDkagWNGliUxi5eqJN92ULsvT7Fwmah8um1xaRw="; + cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM="; nativeBuildInputs = [ cmake @@ -88,19 +88,13 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - patches = [ - # Handle PTY EIO error for Rust 1.55+ - (fetchpatch { - url = "https://github.com/alacritty/alacritty/commit/58985a4dcbe464230b5d2566ee68e2d34a1788c8.patch"; - sha256 = "sha256-Z6589yRrQtpx3/vNqkMiGgGsLysd/QyfaX7trqX+k5c="; - }) - ]; - postPatch = '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; + checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 + postInstall = ( if stdenv.isDarwin then '' mkdir $out/Applications @@ -126,6 +120,7 @@ rustPlatform.buildRustPackage rec { install -dm 755 "$out/share/man/man1" gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" + gzip -c extra/alacritty-msg.man > "$out/share/man/man1/alacritty-msg.1.gz" install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml |