applying patches provided by griswold

svn path=/nixpkgs/trunk/; revision=19707
This commit is contained in:
Rob Vermaas 2010-01-27 12:12:35 +00:00
parent 77bf39bf82
commit 13417770a3
11 changed files with 221 additions and 11 deletions

View file

@ -7,7 +7,9 @@ if test -n "$rev"; then
cd $out
git checkout $rev
fi
find $out -name .git\* | xargs rm -rf
if test -z "$leaveDotGit"; then
find $out -name .git\* | xargs rm -rf
fi
stopNest

View file

@ -1,5 +1,5 @@
{stdenv, git}:
{url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:
/* NOTE:
fetchgit has one problem: git fetch only works for refs.
@ -32,7 +32,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256;
inherit url rev;
inherit url rev leaveDotGit;
impureEnvVars = [
# We borrow these environment variables from the caller to allow

View file

@ -0,0 +1,71 @@
#! /bin/sh -e
url=$1
rev=$2
expHash=$3
hashType=$NIX_HASH_ALGO
if test -z "$hashType"; then
hashType=sha256
fi
if test -z "$hashFormat"; then
hashFormat=--base32
fi
if test -z "$url"; then
echo "syntax: nix-prefetch-hg URL [rev [EXPECTED-HASH]]" >&2
exit 1
fi
test -n "$rev" || rev="tip"
# If the hash was given, a file with that hash may already be in the
# store.
if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" hg-archive)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath=
fi
hash=$expHash
fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
tmpPath=/tmp/hg-checkout-tmp-$$
tmpClone=$tmpPath/hg-clone
tmpArchive=$tmpPath/hg-archive
mkdir $tmpPath
trap "rm -rf $tmpPath" EXIT
# Perform the checkout.
hg clone -q -y -U "$url" $tmpClone >&2
hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpArchive)
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
# Add the downloaded file to the Nix store.
finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpArchive)
if test -n "$expHash" -a "$expHash" != "$hash"; then
echo "hash mismatch for URL \`$url'"
exit 1
fi
fi
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
echo $hash
if test -n "$PRINT_PATH"; then
echo $finalPath
fi

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
let version = "1.0.4"; in
stdenv.mkDerivation {
name = "classads-${version}";
src = fetchurl {
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24";
};
configureFlags = ''
--enable-namespace --enable-flexible-member
'';
meta = {
homepage = http://www.cs.wisc.edu/condor/classad/;
description = "The Classified Advertisements library provides a generic means for matching resources.";
license = "Apache-2.0";
};
}

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, m4, bison, flex, openssl, zlib }:
let version = "2.7.15"; in
stdenv.mkDerivation {
name = "gsoap-${version}";
src = fetchurl {
url = "mirror://sourceforge/gsoap2/files/gSOAP/2.7.15%20stable/gsoap_${version}.tar.gz";
sha256 = "3ed883ab1a3d32b5bb2bf599306f247f6de3ffedd8890eb0e6303ae15995dc12";
};
buildInputs = [ m4 bison flex openssl zlib ];
meta = {
homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
description = "The gSOAP toolkit is an open source C and C++ software development toolkit for SOAP/WSDL and XML Web services.";
license = "free-non-copyleft";
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
let version = "0.7.5"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "922481aadf72a74cf14012fe3967c60d01e70f7e88908410d57428943ab4eb8b";
};
buildInputs = [ libxml2 gnutls devicemapper perl ];
# fix for redhat bz 531496
patches = [ ./non-absolute-ld.patch ];
# xen currently disabled in nixpkgs
configureFlags = ''
--without-xen
'';
meta = {
homepage = http://libvirt.org/;
description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes).";
license = "LGPLv2+";
};
}

View file

@ -0,0 +1,12 @@
diff -Naur libvirt-0.7.5.orig/configure libvirt-0.7.5/configure
--- libvirt-0.7.5.orig/configure 2009-12-23 09:17:34.000000000 -0600
+++ libvirt-0.7.5/configure 2010-01-13 21:16:02.000000000 -0600
@@ -41051,7 +41051,7 @@
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+`ld --help 2>&1 | grep -- --version-script >/dev/null` || \
VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"

View file

@ -0,0 +1,23 @@
{stdenv, fetchurl, tex, perl, netpbm, ghostscript}:
stdenv.mkDerivation {
name = "latex2html-2002-1";
buildInputs = [ tex perl ghostscript netpbm ];
preConfigure = ''
configureFlags="--with-texpath=$out/share/texmf-nix";
'';
src = fetchurl {
url = mirror://ubuntu/pool/multiverse/l/latex2html/latex2html_2002-2-1-20050114.orig.tar.gz;
sha256 = "22049a77cf88a647776e61e06800ace4f9a06afc6ffe2590574487f023d0881f";
};
meta = {
homepage = http://www.latex2html.org/;
license = "unfree-redistributable";
description = "Convertor written in Perl that converts LaTeX documents to HTML";
};
}

View file

@ -13,6 +13,8 @@ stdenv.mkDerivation {
};
meta = {
homepage = http://sourceforge.net/projects/ncompress/files/ncompress%20%28bugfixes%29/ncompress-4.2.4.2/ncompress-4.2.4.2.tar.gz/download;
homepage = http://ncompress.sourceforge.net/;
license = "free-non-copyleft";
description = "A fast, simple LZW file compressor";
};
}

View file

@ -0,0 +1,16 @@
diff -Naur advanced.orig/pm_config.in.h advanced/pm_config.in.h
--- advanced.orig/pm_config.in.h 2010-01-12 22:04:07.000000000 +0100
+++ advanced/pm_config.in.h 2010-01-12 22:05:56.000000000 +0100
@@ -67,9 +67,9 @@
#define RGB_DB2 "PBMplus_Dir:RGB.TXT"
#define RGB_DB3 "PBMplus_Dir:RGB.TXT"
#else
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
-#define RGB_DB2 "/usr/share/X11/rgb.txt"
-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
+#define RGB_DB1 "@rgbPath1@"
+#define RGB_DB2 "@rgbPath2@"
+#define RGB_DB3 "@rgbPath3@"
#endif
/* CONFIGURE: This is the name of an environment variable that tells

View file

@ -442,10 +442,6 @@ let
inherit fetchurl stdenv;
};
ncompress = import ../tools/compression/ncompress {
inherit fetchurl stdenv;
};
bzip2 = useFromStdenv "bzip2"
(import ../tools/compression/bzip2 {
inherit fetchurl stdenv;
@ -1129,6 +1125,10 @@ let
inherit fetchurl stdenv ncurses coreutils;
};
ncompress = import ../tools/compression/ncompress {
inherit fetchurl stdenv;
};
netcat = import ../tools/networking/netcat {
inherit fetchurl stdenv;
};
@ -1137,11 +1137,9 @@ let
inherit fetchurl stdenv;
};
/*
netpbm = import ../tools/graphics/netpbm {
inherit stdenv fetchsvn libjpeg libpng zlib flex perl libxml2 makeWrapper;
};
*/
netselect = import ../tools/networking/netselect {
inherit fetchurl stdenv;
@ -3239,6 +3237,10 @@ let
inherit (xlibs) libX11 xf86vidmodeproto libXmu libXxf86vm;
};
classads = import ../development/libraries/classads {
inherit fetchurl stdenv;
};
classpath = import ../development/libraries/java/classpath {
javac = gcj;
jvm = gcj;
@ -3633,6 +3635,10 @@ let
inherit fetchurl stdenv;
};
gsoap = import ../development/libraries/gsoap {
inherit fetchurl stdenv m4 bison flex openssl zlib;
};
gtkimageview = import ../development/libraries/gtkimageview {
inherit fetchurl stdenv pkgconfig;
inherit (gnome) gtk;
@ -4216,6 +4222,10 @@ let
inherit fetchurl stdenv;
};
libvirt = import ../development/libraries/libvirt {
inherit stdenv fetchurl libxml2 gnutls devicemapper perl;
};
libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
inherit libtool libjpeg openssl zlib;
inherit (xlibs) xproto libX11 damageproto libXdamage
@ -8647,6 +8657,11 @@ let
inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix;
};
latex2html = import ../misc/tex/latex2html/default.nix {
inherit fetchurl stdenv perl ghostscript netpbm;
tex = tetex;
};
pgadmin = import ../applications/misc/pgadmin {
inherit fetchurl stdenv postgresql libxml2 libxslt openssl;
inherit wxGTK;