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

Commits on Jun 4, 2017

  1. i3lock-color: 2.7-2017-04-01 -> 2.9.1-c

    @iSma
    iSma committed Jun 4, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9caa922 View commit details

  2. Merge pull request #26376 from iSma/update/i3lock-color-2.9.1-c 

    i3lock-color: 2.7-2017-04-01 -> 2.9.1-c
    @offlinehacker
    offlinehacker authored Jun 4, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d747ee View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/window-managers/i3/lock-color.nix
6 changes: 3 additions & 3 deletions pkgs/applications/window-managers/i3/lock-color.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:

stdenv.mkDerivation rec {
version = "2.7-2017-04-01";
version = "2.9.1-c";
name = "i3lock-color-${version}";

src = fetchFromGitHub {
owner = "chrjguill";
repo = "i3lock-color";
rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206";
sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703";
rev = version;
sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11