diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
commit | 7f410ef923b5959147e3902f727bb91b08543f72 (patch) | |
tree | 5081fe1dbc7731c179ac8ab945e9ae2d9caefcfd /pkgs/applications/editors/emacs-modes | |
parent | f77abc8b7a8b4279258862a7b6d3810e73d4b092 (diff) | |
parent | 7491fccfe65e204ecbc7addc7ccac7b6b69fe3c5 (diff) | |
download | nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar.gz nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar.bz2 nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar.lz nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar.xz nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.tar.zst nixpkgs-7f410ef923b5959147e3902f727bb91b08543f72.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/misc/vim-plugins/default.nix
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
-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 e52011547c7..ba2437f1a2b 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -2,11 +2,11 @@ , texLiveAggregationFun }: stdenv.mkDerivation rec { - name = "org-8.2.7"; + name = "org-8.2.7b"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "1n864hnjvx5n2gfi7n0xbwvb1k8l5rdh4a3vpbhw23hy8rx3bvaw"; + sha256 = "07hq2q126d967nj7xq46q4mkca5r2rw61bn8d6nzkhksghp8b2v1"; }; buildInputs = [ emacs ]; |