diff options
author | Francis St-Amour <m_psyco2@hotmail.com> | 2016-06-18 10:03:38 -0400 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-06-22 11:48:37 +0200 |
commit | c5aebc693a00b2897ac503a1b306c0b1219207eb (patch) | |
tree | ec2aab4ad194e644665841dd68e779dbacac3447 /pkgs/applications/window-managers/stumpwm/default.nix | |
parent | 4a7d31a392d78a8afc4a2d78d73dc5c789a602e8 (diff) | |
download | nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar.gz nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar.bz2 nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar.lz nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar.xz nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.tar.zst nixlib-c5aebc693a00b2897ac503a1b306c0b1219207eb.zip |
stumpwm: Added newer version of stumpwm from its git repository (alongside the latest release).
Diffstat (limited to 'pkgs/applications/window-managers/stumpwm/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/stumpwm/default.nix | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index bfbeb9739f1c..c40234d53277 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,24 +1,42 @@ { stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] }: +, extraModulePaths ? [] +, version }: let - version = "0.9.9"; contrib = (fetchgit { url = "https://github.com/stumpwm/stumpwm-contrib.git"; rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f"; sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; }); + versionSpec = { + "latest" = { + name = "0.9.9"; + rev = "refs/tags/0.9.9"; + sha256 = "05fkng2wlmhy3kb9zhrrv9zpa16g2p91p5y0wvmwkppy04cw04ps"; + patches = [ ./fix-module-path.patch ]; + }; + "git" = { + name = "git-20160617"; + rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; + sha256 = "1b7lr9rj29qrazzx4xwr69fw6a89pnkycpy9jn81k84k0v22n1q0"; + patches = []; + }; + }.${version}; in stdenv.mkDerivation rec { - name = "stumpwm-${version}"; + name = "stumpwm-${versionSpec.name}"; src = fetchgit { url = "https://github.com/stumpwm/stumpwm"; - rev = "refs/tags/${version}"; - sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; + rev = "${versionSpec.rev}"; + sha256 = "${versionSpec.sha256}"; }; + # NOTE: The patch needs an update for the next release. + # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. + patches = versionSpec.patches; + buildInputs = [ texinfo4 makeWrapper autoconf sbcl @@ -27,9 +45,6 @@ stdenv.mkDerivation rec { xdpyinfo ]; - # NOTE: The patch needs an update for the next release. - # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. - patches = [ ./fix-module-path.patch ]; # Stripping destroys the generated SBCL image dontStrip = true; |