diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
commit | 5144a19987ee5148e0a21b0d44be4a00dde24f96 (patch) | |
tree | f81fdffda18c1b10ad1125e16fe9f77bdf80bf34 /pkgs/applications/editors | |
parent | 232da3a29db13a09e98bddab17c88958027ed0e5 (diff) | |
parent | e9974606a50e49c4eb5df609c589234d89385992 (diff) | |
download | nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar.gz nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar.bz2 nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar.lz nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar.xz nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.tar.zst nixpkgs-5144a19987ee5148e0a21b0d44be4a00dde24f96.zip |
svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 59 insertions, 8 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 91307deb220..236c7574d5e 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -4,23 +4,18 @@ , alsaLib }: -# XXX: ? -# - checking for alsa >= 1.0.0... no -# - checking for Wand >= 6.2.8... no -# - imagemagickBig instead of imagemagick? - assert (gtk != null) -> (pkgconfig != null); assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.0.92"; + name = "emacs-24.0.93"; builder = ./builder.sh; src = fetchurl { url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz"; - sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6"; + sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe"; }; buildInputs = diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix new file mode 100644 index 00000000000..8934238ffa3 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -0,0 +1,34 @@ +{ fetchgit, stdenv, emacs }: + +# TODO: byte-compile in build phase - a buildEmacsPackage that does +# that would be nice + +stdenv.mkDerivation rec { + name = "calfw-1.3-5-ga9b6615"; + + src = fetchgit { + url = "git://github.com/kiwanami/emacs-calfw.git"; + rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d"; + sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393"; + }; + + buildInputs = [ emacs ]; + + installPhase = + '' + ensureDir "$out/share/doc/${name}" + cp -v readme.md "$out/share/doc/${name}" + + ensureDir "$out/share/emacs/site-lisp/" + cp *.el "$out/share/emacs/site-lisp/" + ''; + + meta = { + description = "A calendar framework for Emacs"; + + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index a7ff4e624a1..751330550f1 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { inherit date; cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a"; + sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc"; }; buildInputs = [ emacs w3m texinfo autoconf ]; diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix new file mode 100644 index 00000000000..e5958021aa2 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "js2-mode-0-20120130"; + + src = fetchgit { + url = "git://github.com/mooz/js2-mode.git"; + rev = "4c008b1987aa53769899e24808b6d74b41b4ff40"; + sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile js2-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/ + ''; +} |