Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6c2e7b28e7c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b6bfecc0bd3
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 25, 2020

  1. maintainers: add cole-h 

    (cherry picked from commit ecf79a0)
    @cole-h @paumr
    cole-h authored and paumr committed Apr 25, 2020
    Copy the full SHA
    7535e9a View commit details

  2. alacritty: 0.4.1 -> 0.4.2 

    * alacritty now has its own org, so I changed the URLs to point there
* updated the description to match upstream's description
* formatted with nixpkgs-format

(cherry picked from commit 45f53cc)
Reason:
Fixes some bugs on X11, namely:
- Crash when starting on some X11 systems
- Alacritty not ignoring keyboard events for changing WM focus on X11
- Incorrect modifiers tracking on X11 and macOS, leading to 'sticky' modifiers
    @cole-h @paumr
    cole-h authored and paumr committed Apr 25, 2020
    Copy the full SHA
    2b9ad34 View commit details

  3. alacritty: fixed cargo hash 

    The cargo hash differed from the cherry-picked one due to changes to
fetchCargoTarball on the master branch #79975

On the master this happened here:
eb11fea
1f03a34

This should not effect the actual build result.
    @paumr
    paumr committed Apr 25, 2020
    Copy the full SHA
    aa9ea94 View commit details

  4. Merge pull request #85908 from paumr/release-20.03-alacritty 

    [20.03] alacritty: backport 0.4.2
    @worldofpeace
    worldofpeace authored Apr 25, 2020
    Copy the full SHA
    4b6bfec View commit details
Showing with 72 additions and 53 deletions.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +62 −53 pkgs/applications/misc/alacritty/default.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -1427,6 +1427,16 @@
githubId = 5684605;
name = "Cole Scott";
};
cole-h = {
name = "Cole Helbling";
email = "cole.e.helbling@outlook.com";
github = "cole-h";
githubId = 28582702;
keys = [{
longkeyid = "rsa4096/0xB37E0F2371016A4C";
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
copumpkin = {
email = "pumpkingod@gmail.com";
github = "copumpkin";
115 changes: 62 additions & 53 deletions pkgs/applications/misc/alacritty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
{ stdenv,
lib,
fetchFromGitHub,
rustPlatform,

cmake,
gzip,
installShellFiles,
makeWrapper,
ncurses,
pkgconfig,
python3,

expat,
fontconfig,
freetype,
libGL,
libX11,
libXcursor,
libXi,
libXrandr,
libXxf86vm,
libxcb,
libxkbcommon,
wayland,
xdg_utils,
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform

, cmake
, gzip
, installShellFiles
, makeWrapper
, ncurses
, pkgconfig
, python3

, expat
, fontconfig
, freetype
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, libXxf86vm
, libxcb
, libxkbcommon
, wayland
, xdg_utils

# Darwin Frameworks
AppKit,
CoreGraphics,
CoreServices,
CoreText,
Foundation,
OpenGL }:

with rustPlatform;

, AppKit
, CoreGraphics
, CoreServices
, CoreText
, Foundation
, OpenGL
}:
let
rpathLibs = [
expat
@@ -51,18 +49,19 @@ let
libxkbcommon
wayland
];
in buildRustPackage rec {
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.4.1";
version = "0.4.2";

src = fetchFromGitHub {
owner = "jwilm";
owner = "alacritty";
repo = pname;
rev = "v${version}";
sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
};

cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n";
cargoSha256 = "0y7yzbl6hyb89f2lcn3s65jbrzibr8b8x7l84iriw6ifsqnvcyg5";

nativeBuildInputs = [
cmake
@@ -75,9 +74,17 @@ in buildRustPackage rec {
];

buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
++ lib.optionals stdenv.isDarwin [
AppKit
CoreGraphics
CoreServices
CoreText
Foundation
OpenGL
];

outputs = [ "out" "terminfo" ];

postPatch = ''
substituteInPlace alacritty/src/config/mouse.rs \
--replace xdg-open ${xdg_utils}/bin/xdg-open
@@ -90,14 +97,16 @@ in buildRustPackage rec {
install -D target/release/alacritty $out/bin/alacritty
'' + (if stdenv.isDarwin then ''
mkdir $out/Applications
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
'' else ''
install -D extra/linux/alacritty.desktop -t $out/share/applications/
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
'') + ''
'' + (
if stdenv.isDarwin then ''
mkdir $out/Applications
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
'' else ''
install -D extra/linux/Alacritty.desktop -t $out/share/applications/
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
''
) + ''
installShellCompletion --zsh extra/completions/_alacritty
installShellCompletion --bash extra/completions/alacritty.bash
@@ -116,11 +125,11 @@ in buildRustPackage rec {

dontPatchELF = true;

meta = with stdenv.lib; {
description = "GPU-accelerated terminal emulator";
homepage = "https://github.com/jwilm/alacritty";
meta = with lib; {
description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20;
maintainers = with maintainers; [ filalex77 mic92 ];
maintainers = with maintainers; [ filalex77 mic92 cole-h ];
platforms = platforms.unix;
};
}