cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

43
pkgs/tools/typesetting/asciidoc/default.nix
View file

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

36
pkgs/top-level/all-packages.nix
View file

@ -193,12 +193,12 @@ let
# additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } )
deepOverride = newArgs: name: x: if builtins.isAttrs x then (
if x ? deepOverride then (x.deepOverride newArgs) else
if x ? override then (x.override newArgs) else
if x ? override then (x.override newArgs) else
x) else x;
makeOverridable = f: origArgs: f origArgs //
{ override = newArgs:
makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
deepOverride = newArgs:
deepOverride = newArgs:
makeOverridable f ((lib.mapAttrs (deepOverride newArgs) origArgs) // newArgs);
origArgs = origArgs;
};
@ -500,7 +500,7 @@ let
};
asciidoc = import ../tools/typesetting/asciidoc {
inherit fetchurl stdenv bash python;
inherit fetchurl stdenv python;
};
bibtextools = import ../tools/typesetting/bibtex-tools {
@ -3256,8 +3256,8 @@ let
inherit (xlibs) libX11 libXext xproto xextproto;
};
enchant = makeOverridable
(selectVersion ../development/libraries/enchant "1.3.0")
enchant = makeOverridable
(selectVersion ../development/libraries/enchant "1.3.0")
{
inherit fetchurl stdenv aspell pkgconfig;
inherit (gnome) glib;
@ -3568,7 +3568,7 @@ let
gtk = import ../development/libraries/gtk+/1.2.x.nix {
inherit fetchurl stdenv x11 glib;
};
};
gtkLibs216 = rec {
@ -3597,11 +3597,11 @@ let
inherit fetchurl stdenv pkgconfig perl jasper x11 glib atk pango
libtiff libjpeg libpng cairo xlibs;
};
gtkmm = import ../development/libraries/gtkmm/2.14.x.nix {
inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
};
};
gtkLibs218 = rec {
@ -3630,11 +3630,11 @@ let
inherit fetchurl stdenv pkgconfig perl jasper glib atk pango
libtiff libjpeg libpng cairo xlibs cups openssl;
};
gtkmm = import ../development/libraries/gtkmm/2.18.x.nix {
inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
};
};
gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
@ -3722,11 +3722,11 @@ let
jasper = import ../development/libraries/jasper {
inherit fetchurl stdenv unzip xlibs libjpeg;
};
jetty_gwt = import ../development/libraries/java/jetty-gwt {
inherit stdenv fetchurl;
};
jetty_util = import ../development/libraries/java/jetty-util {
inherit stdenv fetchurl;
};
@ -4575,7 +4575,7 @@ let
inherit fetchurl stdenv cmake unzip libtiff expat zlib libpng libjpeg;
};
webkit = builderDefsPackage (import ../development/libraries/webkit)
webkit = builderDefsPackage (import ../development/libraries/webkit)
(lib.mapAttrs (deepOverride
{
# It needs fresh GTK
@ -5671,7 +5671,7 @@ let
inherit (xlibs) xproto libX11 libXext libXcursor;
inherit (gnome) libIDL;
};
virtualboxGuestAdditions = import ../applications/virtualization/virtualbox/guest-additions {
inherit stdenv fetchurl lib patchelf cdrkit kernel;
inherit (xlibs) libX11 libXt libXext libXmu libXcomposite libXfixes;
@ -7049,7 +7049,7 @@ let
ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) {
inherit fetchurl stdenv perl gettext makeWrapper lib;
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder;
inherit git; # The RCS should be optional
monotone = null;
@ -8166,13 +8166,13 @@ let
gnome28 = import ../desktops/gnome-2.28 (pkgs// {
gtkLibs = gtkLibs218;
dbus_glib = dbus_glib.override {
inherit (gtkLibs218) glib;
inherit (gtkLibs218) glib;
};
policykit = policykit.deepOverride {
inherit (gtkLibs218) glib;
inherit (gtkLibs218) glib;
};
hal = hal.deepOverride {
inherit (gtkLibs218) glib;
inherit (gtkLibs218) glib;
};
});