diff --git a/pkgs/applications/package-management/rpm/default.nix b/pkgs/applications/package-management/rpm/default.nix new file mode 100644 index 00000000000..58328a26638 --- /dev/null +++ b/pkgs/applications/package-management/rpm/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, python, tcl, readline, file, cpio, beecrypt, unzip, neon, gnupg, libxml2, perl}: + +stdenv.mkDerivation { + name = "rpm-4.4.5"; + + src = fetchurl { + url = http://losser.labs.cs.uu.nl/~armijn/.nix/rpm-4.4.5.tar.gz; + #md5 = "e24ce468082479fe850c9d6563f56db5"; + md5 = "3f277388b0486c6e8ce9b07fdf53993e"; + }; + buildInputs = [python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl]; + configureFlags = "--without-python --with-selinux=no --without-lua"; + patches = [./rpm-4.4.5-lua.patch ./rpm-4.4.5-beecrypt-include.patch ./rpm-4.4.5-neon-include.patch ./rpm-4.4.5-libxml2-include.patch]; + inherit beecrypt neon libxml2; +} diff --git a/pkgs/applications/package-management/rpm/rpm-4.4.2-lua.patch b/pkgs/applications/package-management/rpm/rpm-4.4.2-lua.patch new file mode 100644 index 00000000000..5841471c2e6 --- /dev/null +++ b/pkgs/applications/package-management/rpm/rpm-4.4.2-lua.patch @@ -0,0 +1,12 @@ +diff -ruN rpm-4.4.2/Makefile.in rpm-4.4.2.new/Makefile.in +--- rpm-4.4.2/Makefile.in 2005-07-17 16:58:58.000000000 +0200 ++++ rpm-4.4.2.new/Makefile.in 2005-12-19 16:23:55.000000000 +0100 +@@ -404,7 +404,7 @@ + po/*.in po/*.po po/rpm.pot \ + rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c + +-SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc . ++SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc . + INCLUDES = \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ diff --git a/pkgs/applications/package-management/rpm/rpm-4.4.5-beecrypt-include.patch b/pkgs/applications/package-management/rpm/rpm-4.4.5-beecrypt-include.patch new file mode 100644 index 00000000000..5b250973ebe --- /dev/null +++ b/pkgs/applications/package-management/rpm/rpm-4.4.5-beecrypt-include.patch @@ -0,0 +1,12 @@ +diff -ruN rpm-4.4.5/configure rpm-4.4.5.new/configure +--- rpm-4.4.5/configure 2005-12-13 15:19:03.000000000 +0100 ++++ rpm-4.4.5.new/configure 2005-12-19 18:27:35.000000000 +0100 +@@ -25944,7 +25944,7 @@ + fi + + +- WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt" ++ WITH_BEECRYPT_INCLUDE="-I${beecrypt}/include/beecrypt" + WITH_BEECRYPT_LIB="-lbeecrypt" + + fi diff --git a/pkgs/applications/package-management/rpm/rpm-4.4.5-libxml2-include.patch b/pkgs/applications/package-management/rpm/rpm-4.4.5-libxml2-include.patch new file mode 100644 index 00000000000..73f058fff6d --- /dev/null +++ b/pkgs/applications/package-management/rpm/rpm-4.4.5-libxml2-include.patch @@ -0,0 +1,29 @@ +diff -ruN rpm-4.4.5/tools/Makefile.in rpm-4.4.5.new/tools/Makefile.in +--- rpm-4.4.5/tools/Makefile.in 2005-12-13 15:19:00.000000000 +0100 ++++ rpm-4.4.5.new/tools/Makefile.in 2005-12-19 23:41:44.000000000 +0100 +@@ -424,11 +424,11 @@ + rpmsort_SOURCES = rpmsort.c + #rpmsort_LDFLAGS = (staticLDFLAGS) + rpmtool_SOURCES = rpmtool.c rpmxp.c +-rpmtool_CFLAGS = -I$(includedir)/libxml2 ++rpmtool_CFLAGS = -I$(libxml2)/include/libxml2 + #rpmtool_LDFLAGS = $(staticLDFLAGS) + rpmtool_LDADD = $(LDADD) -lxml2 + rpmxml_SOURCES = rpmxml.c # rpmxp.c +-rpmxml_CFLAGS = -I$(includedir)/libxml2 ++rpmxml_CFLAGS = -I$(libxml2)/include/libxml2 + #rpmxml_LDFLAGS = $(staticLDFLAGS) + rpmxml_LDADD = $(LDADD) -lxml2 + all: all-am +diff -ruN rpm-4.4.5/wnh/Makefile.in rpm-4.4.5.new/wnh/Makefile.in +--- rpm-4.4.5/wnh/Makefile.in 2005-12-13 15:19:00.000000000 +0100 ++++ rpm-4.4.5.new/wnh/Makefile.in 2005-12-19 23:42:13.000000000 +0100 +@@ -349,7 +349,7 @@ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ + @WITH_POPT_INCLUDE@ \ +- -I$(includedir)/libxml2 \ ++ -I$(libxml2)/include/libxml2 \ + -I$(top_srcdir)/misc \ + @INCPATH@ + diff --git a/pkgs/applications/package-management/rpm/rpm-4.4.5-lua.patch b/pkgs/applications/package-management/rpm/rpm-4.4.5-lua.patch new file mode 100644 index 00000000000..54687634a7e --- /dev/null +++ b/pkgs/applications/package-management/rpm/rpm-4.4.5-lua.patch @@ -0,0 +1,12 @@ +diff -ruN rpm-4.4.5/Makefile.in rpm-4.4.5.new/Makefile.in +--- rpm-4.4.5/Makefile.in 2005-12-13 15:19:01.000000000 +0100 ++++ rpm-4.4.5.new/Makefile.in 2005-12-19 17:54:34.000000000 +0100 +@@ -411,7 +411,7 @@ + po/*.in po/*.po po/rpm.pot \ + rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c + +-SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc . ++SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc . + INCLUDES = \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ diff --git a/pkgs/applications/package-management/rpm/rpm-4.4.5-neon-include.patch b/pkgs/applications/package-management/rpm/rpm-4.4.5-neon-include.patch new file mode 100644 index 00000000000..97aae1c4662 --- /dev/null +++ b/pkgs/applications/package-management/rpm/rpm-4.4.5-neon-include.patch @@ -0,0 +1,14 @@ +diff -ruN rpm-4.4.5/configure rpm-4.4.5.new/configure +--- rpm-4.4.5/configure 2005-12-13 15:19:03.000000000 +0100 ++++ rpm-4.4.5.new/configure 2005-12-20 00:40:06.000000000 +0100 +@@ -26333,8 +26333,8 @@ + + fi + +- WITH_NEON_INCLUDE="-I${includedir}/neon" +- WITH_NEON_LIB="-lneon" ++ WITH_NEON_INCLUDE="-I${neon}/include/neon" ++ WITH_NEON_LIB="-L${neon}/lib -lneon" + + fi + diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 1ee996104a3..682cc5a159a 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1554,6 +1554,10 @@ rec { }; }; + rpm = (import ../applications/package-management/rpm) { + inherit fetchurl stdenv python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl; + }; + cvs = (import ../applications/version-management/cvs) { inherit fetchurl stdenv vim; };