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: ad38b7c9aebb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3290964fc75f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 27, 2017

  1. i3: 4.14 -> 4.14.1

    NeQuissimus committed Sep 27, 2017
    Copy the full SHA
    fc7f4f6 View commit details
  2. i3-gaps: 4.14 -> 4.14.1

    NeQuissimus committed Sep 27, 2017
    Copy the full SHA
    bee055f View commit details
  3. Merge pull request #29839 from NeQuissimus/i3_4_14_1

    i3{,-gaps}: 4.14 -> 4.14.1
    fpletz authored Sep 27, 2017
    Copy the full SHA
    3290964 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/window-managers/i3/default.nix
  2. +3 −3 pkgs/applications/window-managers/i3/gaps.nix
4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/i3/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "i3-${version}";
version = "4.14";
version = "4.14.1";

src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "1mm5jazwv4dz3k8vl1lfrcw86agpws5k9lmav1ly51qvmzivsfmf";
sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh";
};

nativeBuildInputs = [ which pkgconfig makeWrapper ];
6 changes: 3 additions & 3 deletions pkgs/applications/window-managers/i3/gaps.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
i3.overrideDerivation (super : rec {

name = "i3-gaps-${version}";
version = "4.14";
releaseDate = "2017-09-04";
version = "4.14.1";
releaseDate = "2017-09-24";

src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
sha256 = "08y2m0afcm8mbzb92qz286fd1hnqfya2pvhpxbgv83sgjcsg6hlr";
sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7";
};

nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];