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: 5e115d2d15c8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 631dc221d43e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 25, 2018

  1. Copy the full SHA
    e3d1a7a View commit details
  2. Merge pull request #51024 from mt-caret/keynav

    keynav: 0.20150730.0 -> 0.20180821.0
    c0bw3b authored Nov 25, 2018
    Copy the full SHA
    631dc22 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/X11/keynav/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/X11/keynav/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
, libXinerama, glib, cairo, xdotool }:
, libXinerama, libXrandr, glib, cairo, xdotool }:

let release = "20150730"; in
let release = "20180821"; in
stdenv.mkDerivation rec {
name = "keynav-0.${release}.0";

src = fetchFromGitHub {
owner = "jordansissel";
repo = "keynav";
rev = "4ae486db6697877e84b66583a0502afc7301ba16";
sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5";
rev = "78f9e076a5618aba43b030fbb9344c415c30c1e5";
sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 xextproto libXtst libXi libXext libXinerama
buildInputs = [ libX11 xextproto libXtst libXi libXext libXinerama libXrandr
glib cairo xdotool ];

patchPhase = ''