diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
| commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
| tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/applications/window-managers/jwm | |
| parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
| parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
| download | nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2 nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip | |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/applications/window-managers/jwm')
| -rw-r--r-- | pkgs/applications/window-managers/jwm/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 40050a69025..85136cb9f97 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1594"; + version = "1600"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2"; + sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; |