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

pkgs/tools/typesetting/asciidoc: updated to version 8.5.1

Browse Source 
New asciidoc versions do have a proper configure script. Using that simplifies
the build instructions a bit.

svn path=/nixpkgs/trunk/; revision=18076
This commit is contained in:
Peter Simons 2009-11-03 15:57:22 +00:00
parent 990d7c05e7
commit 9e98a71eaa
2 changed files with 26 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/tools/typesetting/asciidoc/default.nix
View File

@ -1,47 +1,20 @@
{ fetchurl, stdenv, python, bash }: { fetchurl, stdenv, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "asciidoc-8.2.5"; name = "asciidoc-8.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
sha256 = "1aqmii7qyhnn8pby5rlyrc3sl08br35xsdn7wpx2cy03p46pqr7a"; sha256 = "ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20";
}; };
patchPhase = '' patchPhase = ''
cat "asciidoc.py" | \ for n in asciidoc.py a2x.py; do
sed -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g ; sed -i -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g" "$n"
s,^CONF_DIR = .*$,CONF_DIR = \"$out/etc/asciidoc\",g" \ chmod +x "$n"
> ,,tmp && mv ,,tmp asciidoc.py && chmod +x asciidoc.py done
cat "a2x" | \
sed -e "s,^#!/usr/bin/env bash,#!${bash},g ;
s,^CONF_DIR=.*$,CONF_DIR=\"$out/etc/asciidoc\",g" \
> ,,tmp && mv ,,tmp a2x && chmod +x a2x
cat "install.sh" | \
sed -e "s,^CONFDIR=.*,CONFDIR=$out/etc/asciidoc,g" \
> ,,tmp && mv ,,tmp install.sh
cat "install.sh" | \
sed -e "s,^BINDIR=.*,BINDIR=$out/bin,g" \
> ,,tmp && mv ,,tmp install.sh
cat "install.sh" | \
sed -e "s,^MANDIR=.*,MANDIR=$out/man,g" \
> ,,tmp && mv ,,tmp install.sh
cat "install.sh" | \
sed -e "s,^VIM_CONFDIR=.*,VIM_CONFDIR=$out/etc/vim,g" \
> ,,tmp && mv ,,tmp install.sh
chmod +x install.sh
''; '';
buildInputs = [ python ]; buildInputs = [ python ];
configurePhase = ''true'';
installPhase = ''
ensureDir $out/bin
ensureDir $out/etc
ensureDir $out/etc/vim
ensureDir $out/man
./install.sh
'';
meta = { meta = {
longDescription = '' longDescription = ''

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

@ -500,7 +500,7 @@ let
}; };
asciidoc = import ../tools/typesetting/asciidoc { asciidoc = import ../tools/typesetting/asciidoc {
inherit fetchurl stdenv bash python; inherit fetchurl stdenv python;
}; };
bibtextools = import ../tools/typesetting/bibtex-tools { bibtextools = import ../tools/typesetting/bibtex-tools {