public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stumpwm: Added newer version of stumpwm from its git repository (alongside the latest release).

Browse Source
This commit is contained in:
Francis St-Amour 2016-06-18 10:03:38 -04:00 committed by Moritz Ulrich
parent 4a7d31a392
commit c5aebc693a
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/window-managers/stumpwm/default.nix
View File

@ -1,24 +1,42 @@
{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 { stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
, extraModulePaths ? [] }: , extraModulePaths ? []
, version }:
let let
version = "0.9.9";
contrib = (fetchgit { contrib = (fetchgit {
url = "https://github.com/stumpwm/stumpwm-contrib.git"; url = "https://github.com/stumpwm/stumpwm-contrib.git";
rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f"; rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f";
sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "stumpwm-${version}"; name = "stumpwm-${versionSpec.name}";
src = fetchgit { src = fetchgit {
url = "https://github.com/stumpwm/stumpwm"; url = "https://github.com/stumpwm/stumpwm";
rev = "refs/tags/${version}"; rev = "${versionSpec.rev}";
sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; 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 = [ buildInputs = [
texinfo4 makeWrapper autoconf texinfo4 makeWrapper autoconf
sbcl sbcl
@ -27,9 +45,6 @@ stdenv.mkDerivation rec {
xdpyinfo 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 # Stripping destroys the generated SBCL image
dontStrip = true; dontStrip = true;

6
pkgs/top-level/all-packages.nix
View File

@ -14291,6 +14291,12 @@ in
stp = callPackage ../applications/science/logic/stp {}; stp = callPackage ../applications/science/logic/stp {};
stumpwm = callPackage ../applications/window-managers/stumpwm { stumpwm = callPackage ../applications/window-managers/stumpwm {
version = "latest";
sbcl = sbcl_1_2_5;
lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5);
};
stumpwm-git = callPackage ../applications/window-managers/stumpwm {
version = "git";
sbcl = sbcl_1_2_5; sbcl = sbcl_1_2_5;
lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5);
}; };