diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
| commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
| tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/applications/editors/emacs-modes/org | |
| parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
| parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
| download | nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixlib-84c018503859be28aded86677c9dbc54c7067e11.zip | |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/org')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/org/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index f0a519879370..07ea125afd83 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which }: stdenv.mkDerivation rec { - name = "org-7.5"; + name = "org-7.8"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b"; + sha256 = "0idxsxdr5p0bvnjmhvpdkfwhlpkxmihnaljf43k0311g9z3k22qz"; }; buildInputs = [ emacs texinfo ]; |