diff --git a/pkgs/applications/audio/bmp-plugins/wma/builder.sh b/pkgs/applications/audio/bmp-plugins/wma/builder.sh deleted file mode 100644 index c70264d098c..00000000000 --- a/pkgs/applications/audio/bmp-plugins/wma/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -buildFlags="-f Makefile.bmp" - -installPhase=installPhase -installPhase() { - ensureDir "$out/lib/bmp/Input" - cp libwma.so "$out/lib/bmp/Input" -} - -genericBuild diff --git a/pkgs/applications/audio/bmp-plugins/wma/default.nix b/pkgs/applications/audio/bmp-plugins/wma/default.nix index 2812f4ce280..617db6232a7 100644 --- a/pkgs/applications/audio/bmp-plugins/wma/default.nix +++ b/pkgs/applications/audio/bmp-plugins/wma/default.nix @@ -2,10 +2,18 @@ stdenv.mkDerivation { name = "bmp-plugin-wma-1.0.5"; - builder = ./builder.sh; + src = fetchurl { url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2; md5 = "5d62a0f969617aeb40096362c7a8a506"; }; + buildInputs = [pkgconfig bmp]; + + buildFlags = "-f Makefile.bmp"; + + installPhase = '' + ensureDir "$out/lib/bmp/Input" + cp libwma.so "$out/lib/bmp/Input" + ''; } diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index ad9d3356cda..4eef90b575c 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { }; buildInputs = [libogg]; + + patches = [ + # Fix for building on GCC 4.3. + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; + sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; + }) + ]; meta = { homepage = http://flac.sourceforge.net; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix new file mode 100644 index 00000000000..767db2c0cf4 --- /dev/null +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx +, libglademm, libcanberra, intltool, gettext }: + +stdenv.mkDerivation rec { + name = "pavucontrol-0.9.7"; + + src = fetchurl { + url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz"; + sha256 = "1a1v06hbl1j78ryqy5aiccg6w5hf1yzday2b9h31kx7vr42ir1w0"; + }; + + buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra + intltool gettext ]; + + configureFlags = "--disable-lynx"; + + meta = { + description = "PulseAudio Volume Control"; + + longDescription = '' + PulseAudio Volume Control (pavucontrol) provides a GTK+ + graphical user interface to connect to a PulseAudio server and + easily control the volume of all clients, sinks, etc. + ''; + + homepage = http://0pointer.de/lennart/projects/pavucontrol/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/editors/eclipse/eclipse_classic.nix b/pkgs/applications/editors/eclipse/eclipse_classic.nix new file mode 100644 index 00000000000..2d3b22e476e --- /dev/null +++ b/pkgs/applications/editors/eclipse/eclipse_classic.nix @@ -0,0 +1,57 @@ +# Note, if you want to install plugins using the update manager you should +# copy the store path to a local directory and chown -R $USER yourcopy +# Then start your local copy + +args: with args; +let arch = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "x86" + else throw "not supported system"; +in +args.stdenv.mkDerivation rec { + #name = "eclipse-classic-3.4M5"; + name = "eclipse-classic-3.3.1.1"; + + unpackPhase = "unzip \$src; set -x "; + buildInputs = [ unzip jdk gtk glib libXtst ant makeWrapper]; + + + patches=./build_with_jdk_compiler; + + buildPhase = "./build -os linux -ws gtk -arch ${arch}"; + + libraries = [gtk glib libXtst]; + + installPhase = " + t=\$out/share/${name} + ensureDir \$t \$out/bin + cd result + tar xfz linux-gtk-*.tar.gz + mv eclipse \$out + " + #copied from other eclipse expressions + +" rpath= + for i in \$libraries; do + rpath=\$rpath\${rpath:+:}\$i/lib + done + find \$out \\( -type f -a -perm +0100 \\) \\ + -print \\ + -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\ + --set-rpath \"\$rpath\" {} \\; + + # Make a wrapper script so that the proper JDK is found. + makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\ + --prefix PATH \":\" \"\$jdk/bin\" \\ + --prefix LD_LIBRARY_PATH \":\" \"\$rpath\" + sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse + "; + # using dirname so that eclipse still runs after copying the whole store + # directory somewhere else (so that you can use the update manager + + src = args.fetchurl { + #url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/eclipse-sourceBuild-srcIncluded-3.4M5.zip; + #sha256 = "1w6fbpwkys65whygc045556772asggj24x8assnaba6nl70z00az"; + + url = http://download.micromata.de/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip; + sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4"; + }; +} diff --git a/pkgs/applications/editors/emacs-21/builder.sh b/pkgs/applications/editors/emacs-21/builder.sh index e9c909739d5..acd98aefd04 100644 --- a/pkgs/applications/editors/emacs-21/builder.sh +++ b/pkgs/applications/editors/emacs-21/builder.sh @@ -8,6 +8,5 @@ postConfigure() { cp $myglibc/lib/crti.o src cp $myglibc/lib/crtn.o src } -postConfigure=postConfigure genericBuild diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh index 33e72409ea1..7a82f6552ef 100644 --- a/pkgs/applications/editors/emacs-22/builder.sh +++ b/pkgs/applications/editors/emacs-22/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { libc=$(cat ${NIX_GCC}/nix-support/orig-libc) echo "libc: $libc" diff --git a/pkgs/applications/editors/emacs-unicode/builder.sh b/pkgs/applications/editors/emacs-unicode/builder.sh index 953965716b7..677311c4fd3 100644 --- a/pkgs/applications/editors/emacs-unicode/builder.sh +++ b/pkgs/applications/editors/emacs-unicode/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { libc=$(cat ${NIX_GCC}/nix-support/orig-libc) echo "libc: $libc" diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh index a4f6edad04c..c069edb3a6d 100644 --- a/pkgs/applications/editors/monodevelop/builder.sh +++ b/pkgs/applications/editors/monodevelop/builder.sh @@ -3,7 +3,6 @@ source $makeWrapper export MONO_GAC_PREFIX=$monodoc:$gtksharp -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh index ee80be9d95c..bcea7a7a89a 100644 --- a/pkgs/applications/editors/monodoc/builder.sh +++ b/pkgs/applications/editors/monodoc/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup source $makeWrapper -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh index a16ff3f32e9..51b5f183654 100644 --- a/pkgs/applications/editors/nedit/builder.sh +++ b/pkgs/applications/editors/nedit/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" -installPhase=installPhase installPhase() { ensureDir $out/bin cp -p source/nedit source/nc $out/bin diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh index 2e3aaf894bf..252c4f91e0c 100644 --- a/pkgs/applications/graphics/f-spot/builder.sh +++ b/pkgs/applications/graphics/f-spot/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup source $makeWrapper -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f2379220a65..cf708da62a9 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li"; }; - patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ]; + patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { configureFlags = "--with-python"; + # Fix compilation on glibc 2.9 by adding missing string header + preConfigure = '' + echo "#include " > tmp.cpp + cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new + rm tmp.cpp + mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp + ''; + preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script" ''; diff --git a/pkgs/applications/graphics/inkscape/gtk-clist.patch b/pkgs/applications/graphics/inkscape/gtk-clist.patch new file mode 100644 index 00000000000..6518538fcc1 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/gtk-clist.patch @@ -0,0 +1,11 @@ +--- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008/06/07 22:06:52 1.1 ++++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008/06/07 22:09:22 +@@ -13,7 +13,7 @@ + */ + + #include +-#include ++#include + #include "../xml/repr.h" + + #include diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh index 39fe5852309..3f3f2d7649a 100644 --- a/pkgs/applications/graphics/xfig/builder.sh +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" -preBuild=preBuild preBuild() { echo "#define XAW3D" >> Imakefile.tmp echo "#define XAW3D1_5E" >> Imakefile.tmp diff --git a/pkgs/applications/misc/cdrtools/builder.sh b/pkgs/applications/misc/cdrtools/builder.sh deleted file mode 100644 index 0e2afe08299..00000000000 --- a/pkgs/applications/misc/cdrtools/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -prefix=$out - -configurePhase() { - echo ; -} - -configurePhase=configurePhase - -genericBuild diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 271ed1a7ebb..94af2ee58f5 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation { name = "cdrtools-2.01"; - builder = ./builder.sh; + + configurePhase = "prefix=$out"; + #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script preInstall = '' mkdir "$TMP/bin" @@ -12,10 +14,12 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; + src = fetchurl { url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2; md5 = "d44a81460e97ae02931c31188fe8d3fd"; }; + patches = [./cdrtools-2.01-install.patch]; meta = { diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix index 44cdd864787..f516e4fa337 100644 --- a/pkgs/applications/misc/evince/default.nix +++ b/pkgs/applications/misc/evince/default.nix @@ -1,26 +1,26 @@ -{ fetchurl, stdenv, perl, perlXMLParser, gettext +{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme , libgnome, libgnomeui, scrollkeeper, libxslt , libglade, dbus, dbus_glib , poppler, libspectre, djvulibre, shared_mime_info -, makeWrapper }: +, makeWrapper, which }: stdenv.mkDerivation rec { - name = "evince-2.23.4"; + name = "evince-2.26.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.23/${name}.tar.bz2"; - sha256 = "0svdpx9vkh99vbxsfk5ppi6xl0wqvqsrii7m26irinf0bkfyc964"; + url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/${name}.tar.bz2"; + sha256 = "1wsl5vdrj0829wq223dryq5p7izgzsz6mfl4igix7b5wga42zff1"; }; buildInputs = [ - perl perlXMLParser gettext + perl perlXMLParser gettext intltool pkgconfig glib gtk gnomedocutils gnomeicontheme libgnome libgnomeui libglade scrollkeeper libxslt # for `xsltproc' dbus dbus_glib poppler libspectre djvulibre - makeWrapper + makeWrapper which ]; configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 0ce5f321799..a881ef2e272 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.2"; + name = "gphoto2-2.4.5"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0wna84rli816d830hirdv3ficr3q16zs471l725rgsdvc4pqrvy9"; + sha256 = "0bjbgz9n7ijf8167i1bm7q3pg366axgx5zydck13d2znhd30x069"; }; buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool]; diff --git a/pkgs/applications/msic/ttf2pt1/default.nix b/pkgs/applications/msic/ttf2pt1/default.nix new file mode 100644 index 00000000000..870c5b1e121 --- /dev/null +++ b/pkgs/applications/msic/ttf2pt1/default.nix @@ -0,0 +1,28 @@ +args: with args; +stdenv.mkDerivation { + name = "ttf2pt1-3.4.4"; + + src = fetchurl { + url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz; + sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; + }; + + preConfigure = '' + find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@' + ensureDir $out + sed -e 's/chown/true/' \ + -e 's/chgrp/true/' \ + -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \ + -i scripts/{inst_dir,inst_file} Makefile + makeFlags="INSTDIR=$out OWNER=`id -u`" + ''; + + buildInputs = [freetype]; + patches = ./gentoo-makefile.patch; # also contains the freetype patch + + meta = { + description = "True Type to Postscript Type 3 converter, fpdf"; + homepage = "http://ttf2pt1.sourceforge.net/index.html"; + license = "ttf2pt1"; + }; +} diff --git a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch new file mode 100644 index 00000000000..84854606131 --- /dev/null +++ b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch @@ -0,0 +1,98 @@ +diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile +--- ttf2pt1-3.4.4-orig/Makefile 2007-07-15 20:06:50.000000000 -0600 ++++ ttf2pt1-3.4.4/Makefile 2007-07-15 20:12:40.000000000 -0600 +@@ -9,7 +9,7 @@ + # + # Use GNU C even if it's not the default compiler + # +-#CC=gcc ++CC=gcc + # + # Use the standard ANSI C compiler on HP-UX even if it's not default + # +@@ -60,18 +60,18 @@ + # (if the include and lib directory do not match your installation, + # modify them), also uncomment LIBS_FT + # +-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include ++CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include + + # + # The FreeType-2 library flags (disabled by default) + +-LIBS_FT= ++#LIBS_FT= + + # To enable use of the FreeType-2 library + # (if the include and lib directory do not match your installation, + # modify them), also uncomment CFLAGS_FT + # +-#LIBS_FT= -L/usr/local/lib -lfreetype ++LIBS_FT= -L/usr/lib -lfreetype + + # + # The flags for C compiler for the Autotrace library (disabled by default). +@@ -120,18 +120,18 @@ + # Installation-related stuff + # + # The base dir for installation and subdirs in it +-INSTDIR = /usr/local ++INSTDIR = /usr + # for binaries + BINDIR = $(INSTDIR)/bin + # for binaries of little general interest + LIBXDIR = $(INSTDIR)/libexec/ttf2pt1 + # for scripts, maps/encodings etc. + SHAREDIR = $(INSTDIR)/share/ttf2pt1 +-MANDIR = $(INSTDIR)/man ++MANDIR = $(INSTDIR)/share/man + + # owner and group of installed files + OWNER = root +-GROUP = bin ++GROUP = root + + # After you have configured the Makefile, comment out the following + # definition: +@@ -244,17 +244,19 @@ + chmod -R go-w $(SHAREDIR) + scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755 + [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755 +- sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\ +- s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\ +- s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' cvt.tmp ++ sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \ ++ -e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \ ++ -e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \ ++ cvt.tmp + scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755 + scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755 + rm cvt.tmp + scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755 + for i in $(MANS1); do { \ +- sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\ +- s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\ +- s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \ ++ sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \ ++ -e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \ ++ -e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \ ++ <$$i >$(MANDIR)/man1/$$i \ + && chown $(OWNER) $(MANDIR)/man1/$$i \ + && chgrp $(GROUP) $(MANDIR)/man1/$$i \ + && chmod 0644 $(MANDIR)/man1/$$i \ + + + + + +diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c +--- ttf2pt1-3.4.4-orig/ft.c 2007-07-15 20:23:43.000000000 -0600 ++++ ttf2pt1-3.4.4/ft.c 2007-07-15 20:24:02.000000000 -0600 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/applications/networking/browsers/firefox-2/builder.sh b/pkgs/applications/networking/browsers/firefox-2/builder.sh index 4fa7fbb84ab..e77bd2211de 100644 --- a/pkgs/applications/networking/browsers/firefox-2/builder.sh +++ b/pkgs/applications/networking/browsers/firefox-2/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -postInstall=postInstall postInstall() { # Strip some more stuff diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index a525ef5b774..69c0c94cc6a 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { "--enable-optimize" "--disable-debug" - "--disable-static" # needed for `libxul' "--enable-strip" "--with-system-jpeg" "--with-system-zlib" diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh index c82d3d9783e..483585dd170 100644 --- a/pkgs/applications/networking/browsers/mozilla/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { cat > .mozconfig <> AutoConfig.kmk << END_PATHS + VBOX_PATH_APP_PRIVATE := $out + VBOX_PATH_APP_DOCS := $out/doc + END_PATHS + ''; + + buildPhase = '' + source env.sh + kmk + cd out/linux.*/release/bin/src + export KERN_DIR=${kernel}/lib/modules/*/build + make + cd ../../../../.. + ''; + + installPhase = '' + cd out/linux.*/release/bin + ensureDir $out/virtualbox + cp -av * $out/virtualbox + cd src + kernelVersion=$(cd ${kernel}/lib/modules; ls) + export MODULE_DIR=$out/lib/modules/$kernelVersion/misc + ensureDir $MODULE_DIR + make install + ensureDir $out/bin + cp -v ${vboxScript} $out/bin/VBox.sh + sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ + -e "s|@QT4_PATH@|${qt4}/lib|" \ + -e "s|which|${which}/bin/which|" \ + -e "s|gawk|${stdenv.gawk}/bin/gawk|" \ + $out/bin/VBox.sh + chmod 755 $out/bin/VBox.sh + for file in VirtualBox VBoxManage VBoxSDL + do + [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file + done + ensureDir $out/share/applications + ln -sfv $out/virtualbox/VirtualBox.desktop $out/share/applications + ''; + + meta = { + description = "PC emulator"; + homepage = http://www.virtualbox.org/; + }; +} diff --git a/pkgs/build-support/gcc-wrapper-new/add-flags b/pkgs/build-support/gcc-wrapper-new/add-flags deleted file mode 100644 index ace0a789628..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/add-flags +++ /dev/null @@ -1,24 +0,0 @@ -# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld. -export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" - -if test -e @out@/nix-support/libc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS" -fi - -if test -e @out@/nix-support/gcc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/gcc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS" -fi - -if test -e @out@/nix-support/libc-ldflags-before; then - export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" -fi - -export NIX_GCC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-wrapper-new/builder.sh b/pkgs/build-support/gcc-wrapper-new/builder.sh deleted file mode 100644 index 1a23294dd74..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/builder.sh +++ /dev/null @@ -1,139 +0,0 @@ -source $stdenv/setup - - -ensureDir $out/bin -ensureDir $out/nix-support - - -if test -z "$nativeLibc"; then - dynamicLinker="$libc/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker - - if test -e $libc/lib/32/ld-linux.so.2; then - echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - # The "-B$libc/lib/" flag is a quick hack to force gcc to link - # against the crt1.o from our own glibc, rather than the one in - # /usr/lib. (This is only an issue when using an `impure' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags - - echo "-L$libc/lib" > $out/nix-support/libc-ldflags - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to gcc/ld - # (the *last* value counts, so ours should come first). - echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before -fi - -if test -n "$nativeTools"; then - gccPath="$nativePrefix/bin" - ldPath="$nativePrefix/bin" -else - if test -e "$gcc/lib64"; then - gccLDFlags="$gccLDFlags -L$gcc/lib64" - fi - gccLDFlags="$gccLDFlags -L$gcc/lib" - echo "$gccLDFlags" > $out/nix-support/gcc-ldflags - - # Explicitly add the libstdc++ header files to the search path. - # G++ already finds them automatically, but it adds them to the - # very end of the header search path. This means that - # #include_next constructs in the libstdc++ headers won't find the - # Glibc headers, since they appear *before* the libstdc++ headers. - # So we add them here using -isystem. Note that `add-flags' adds - # the libc flags before the gcc flags. - if test -e $gcc/include/c++/*.*; then - gccCFlags="$gccCFlags -isystem $(echo $gcc/include/c++/*.*)" - fi - - # GCC shows $gcc/lib in `gcc -print-search-dirs', but not - # $gcc/lib64 (even though it does actually search there...).. - # This confuses libtool. So add it to the compiler tool search - # path explicitly. - if test -e "$gcc/lib64"; then - gccCFlags="$gccCFlags -B$gcc/lib64" - fi - echo "$gccCFlags" > $out/nix-support/gcc-cflags - - gccPath="$gcc/bin" - ldPath="$binutils/bin" -fi - - -doSubstitute() { - local src=$1 - local dst=$2 - # Can't use substitute() here, because replace may not have been - # built yet (in the bootstrap). - sed \ - -e "s^@out@^$out^g" \ - -e "s^@shell@^$shell^g" \ - -e "s^@gcc@^$gcc^g" \ - -e "s^@gccProg@^$gccProg^g" \ - -e "s^@binutils@^$binutils^g" \ - -e "s^@libc@^$libc^g" \ - -e "s^@ld@^$ldPath/ld^g" \ - < "$src" > "$dst" -} - - -# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks -# cc, c++, and f77. -mkGccWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return - fi - - gccProg="$src" - doSubstitute "$gccWrapper" "$dst" - chmod +x "$dst" -} - -mkGccWrapper $out/bin/gcc $gccPath/gcc -ln -s gcc $out/bin/cc - -mkGccWrapper $out/bin/g++ $gccPath/g++ -ln -s g++ $out/bin/c++ - -if test -e $gccPath/gfortran; then - mkGccWrapper $out/bin/gfortran $gccPath/gfortran - ln -s gfortran $out/bin/g77 - ln -s gfortran $out/bin/f77 -fi - - -# Create a symlink to as (the assembler). This is useful when a -# gcc-wrapper is installed in a user environment, as it ensures that -# the right assembler is called. -ln -s $ldPath/as $out/bin/as - - -# Make a wrapper around the linker. -doSubstitute "$ldWrapper" "$out/bin/ld" -chmod +x "$out/bin/ld" - - -# Emit a setup hook. Also store the path to the original GCC and -# Glibc. -test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc -test -n "$libc" && echo $libc > $out/nix-support/orig-libc - -doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" - -doSubstitute "$setupHook" "$out/nix-support/setup-hook" - -cp -p $utils $out/nix-support/utils.sh - - -# Propagate the wrapped gcc so that if you install the wrapper, you get -# tools like gcov, the manpages, etc. as well (including for binutils -# and Glibc). -if test -z "$nativeTools"; then - echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages -fi diff --git a/pkgs/build-support/gcc-wrapper-new/default.nix b/pkgs/build-support/gcc-wrapper-new/default.nix deleted file mode 100644 index 8d38db791f2..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't -# know where the C library and standard header files are. Therefore -# the compiler produced by that package cannot be installed directly -# in a user environment and used from the command line. This -# stdenv.mkDerivation provides a wrapper that sets up the right environment -# variables so that the compiler and the linker just "work". - -{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, shell ? "" -}: - -assert nativeTools -> nativePrefix != ""; -assert !nativeTools -> gcc != null && binutils != null; -assert !nativeLibc -> libc != null; - -stdenv.mkDerivation { - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - gccWrapper = ./gcc-wrapper.sh; - ldWrapper = ./ld-wrapper.sh; - utils = ./utils.sh; - addFlags = ./add-flags; - - inherit nativeTools nativeLibc nativePrefix gcc; - libc = if nativeLibc then null else libc; - binutils = if nativeTools then null else binutils; - - name = if name == "" then gcc.name else name; - langC = if nativeTools then true else gcc.langC; - langCC = if nativeTools then true else gcc.langCC; - langFortran = if nativeTools then false else gcc ? langFortran; - shell = if shell == "" then stdenv.shell else shell; - - meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else - { description = "System C compiler wrapper"; - }; - - # The dynamic linker has different names on different Linux platforms. - dynamicLinker = - if !nativeLibc then - (if stdenv.system == "i686-linux" then "ld-linux.so.2" else - if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - if stdenv.system == "powerpc-linux" then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform") - else ""; -} diff --git a/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh deleted file mode 100644 index 8a49fcb9b06..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh +++ /dev/null @@ -1,148 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then - source "$NIX_GCC_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -getVersion=0 -nonFlagArgs=0 - -for i in "$@"; do - if test "$i" = "-c"; then - dontLink=1 - elif test "$i" = "-S"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-M"; then - dontLink=1 - elif test "$i" = "-MM"; then - dontLink=1 - elif test "${i:0:1}" != "-"; then - nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then gcc will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "gcc" (should just print -# "gcc: no input files") and "gcc -v" (should print the version). -if test "$nonFlagArgs" = "0"; then - dontLink=1 -fi - - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-I" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-isystem" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -# Add the flags for the C compiler proper. -extraAfter=($NIX_CFLAGS_COMPILE) -extraBefore=() - -if test "$dontLink" != "1"; then - - # Add the flags that should only be passed to the compiler when - # linking. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) - - # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") - done - for i in $NIX_LDFLAGS; do - if test "${i:0:3}" = "-L/"; then - extraAfter=(${extraAfter[@]} "$i") - else - extraAfter=(${extraAfter[@]} "-Wl,$i") - fi - done - export NIX_LDFLAGS_SET=1 - - if test "$NIX_STRIP_DEBUG" = "1"; then - # Add executable-stripping flags. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) - fi -fi - -# As a very special hack, if the arguments are just `-v', then don't -# add anything. This is to prevent `gcc -v' (which normally prints -# out the version number and returns exit code 0) from printing out -# `No input files specified' and returning exit code 1. -if test "$*" = "-v"; then - extraAfter=() - extraBefore=() -fi - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gccProg@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @gccProg@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @gccProg@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then - source "$NIX_GCC_WRAPPER_EXEC_HOOK" -fi - - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GCC_NEEDS_GREP"; then - @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi diff --git a/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh deleted file mode 100644 index 94241e42ce9..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh +++ /dev/null @@ -1,145 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_LD_WRAPPER_START_HOOK"; then - source "$NIX_LD_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-rpath" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-dynamic-linker" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:1}" = "/" && badPath "$p"; then - # We cannot skip this; barf. - echo "impure path \`$p' used in link" >&2 - exit 1 - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -extra=() -extraBefore=() - -if test -z "$NIX_LDFLAGS_SET"; then - extra=(${extra[@]} $NIX_LDFLAGS) - extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE) -fi - - -# Add all used dynamic libraries to the rpath. -if test "$NIX_DONT_SET_RPATH" != "1"; then - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - libPath="" - addToLibPath() { - local path="$1" - if test "${path:0:1}" != "/"; then return 0; fi - case "$path" in - *..*|*./*|*/.*|*//*) - local path2 - if path2=$(readlink -f "$path"); then - path="$path2" - fi - ;; - esac - case $libPath in - *\ $path\ *) return 0 ;; - esac - libPath="$libPath $path " - } - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:3}" = "-L/"; then - addToLibPath ${p:2} - elif test "$p" = "-L"; then - addToLibPath ${p2} - n=$((n + 1)) - fi - n=$((n + 1)) - done - - # Second, for each -l... switch, find the directory containing the - # library and add it to the rpath. - rpath="" - addToRPath() { - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi - case $rpath in - *\ $1\ *) return 0 ;; - esac - rpath="$rpath $1 " - } - findLib() { - for i in $libPath; do - if test -f $i/lib$1.so; then - addToRPath $i - fi - done - } - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:2}" = "-l"; then - findLib ${p:2} - elif test "$p" = "-l"; then - # I haven't seen `-l foo', but you never know... - findLib ${p2} - n=$((n + 1)) - fi - n=$((n + 1)) - done - - # Finally, add `-rpath' switches. - for i in $rpath; do - extra=(${extra[@]} -rpath $i) - done -fi - - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @ld@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extra flags to @ld@:" >&2 - for i in ${extra[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then - source "$NIX_LD_WRAPPER_EXEC_HOOK" -fi - -exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/gcc-wrapper-new/setup-hook.sh b/pkgs/build-support/gcc-wrapper-new/setup-hook.sh deleted file mode 100644 index 60aad0fe4dc..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/setup-hook.sh +++ /dev/null @@ -1,29 +0,0 @@ -addCVars () { - if test -d $1/include; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include" - fi - - if test -d $1/lib64; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" - fi - - if test -d $1/lib; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" - fi -} - -envHooks=(${envHooks[@]} addCVars) - -# Note: these come *after* $out in the PATH (see setup.sh). - -if test -n "@gcc@"; then - PATH=$PATH:@gcc@/bin -fi - -if test -n "@binutils@"; then - PATH=$PATH:@binutils@/bin -fi - -if test -n "@libc@"; then - PATH=$PATH:@libc@/bin -fi diff --git a/pkgs/build-support/gcc-wrapper-new/utils.sh b/pkgs/build-support/gcc-wrapper-new/utils.sh deleted file mode 100644 index 9a664e1d1e6..00000000000 --- a/pkgs/build-support/gcc-wrapper-new/utils.sh +++ /dev/null @@ -1,23 +0,0 @@ -skip () { - if test "$NIX_DEBUG" = "1"; then - echo "skipping impure path $1" >&2 - fi -} - - -# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but -# `/nix/store/.../lib/foo.so' isn't. -badPath() { - local p=$1 - - # Relative paths are okay (since they're presumably relative to - # the temporary build directory). - if test "${p:0:1}" != "/"; then return 1; fi - - # Otherwise, the path should refer to the store or some temporary - # directory (including the build directory). - test \ - "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ - "${p:0:4}" != "/tmp" -a \ - "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" -} diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index ace0a789628..02755e44541 100644 --- a/pkgs/build-support/gcc-wrapper/add-flags +++ b/pkgs/build-support/gcc-wrapper/add-flags @@ -5,16 +5,16 @@ if test -e @out@/nix-support/libc-cflags; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" fi -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS" -fi - if test -e @out@/nix-support/gcc-cflags; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" fi +if test -e @out@/nix-support/libc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +fi + if test -e @out@/nix-support/gcc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS" + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" fi if test -e @out@/nix-support/libc-ldflags-before; then diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 7a2f9c20f27..0691b427325 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -9,11 +9,15 @@ if test -z "$nativeLibc"; then dynamicLinker="$libc/lib/$dynamicLinker" echo $dynamicLinker > $out/nix-support/dynamic-linker + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + # The "-B$libc/lib/" flag is a quick hack to force gcc to link # against the crt1.o from our own glibc, rather than the one in # /usr/lib. (This is only an issue when using an `impure' # compiler/linker, i.e., one that searches /usr/lib and so on.) - echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags + echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags echo "-L$libc/lib" > $out/nix-support/libc-ldflags @@ -64,7 +68,7 @@ doSubstitute() { } -# Make wrapper scripts around gcc, g++, and g77. Also make symlinks +# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks # cc, c++, and f77. mkGccWrapper() { local dst=$1 @@ -86,8 +90,11 @@ ln -s gcc $out/bin/cc mkGccWrapper $out/bin/g++ $gccPath/g++ ln -s g++ $out/bin/c++ -mkGccWrapper $out/bin/g77 $gccPath/g77 -ln -s g77 $out/bin/f77 +if test -e $gccPath/gfortran; then + mkGccWrapper $out/bin/gfortran $gccPath/gfortran + ln -s gfortran $out/bin/g77 + ln -s gfortran $out/bin/f77 +fi # Create a symlink to as (the assembler). This is useful when a diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 1cd84d77547..91b41706099 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -13,7 +13,18 @@ assert nativeTools -> nativePrefix != ""; assert !nativeTools -> gcc != null && binutils != null; assert !nativeLibc -> libc != null; +let + + gccVersion = (builtins.parseDrvName gcc.name).version; + gccName = (builtins.parseDrvName gcc.name).name; + +in + stdenv.mkDerivation { + name = + (if name != "" then name else gccName + "-wrapper") + + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); + builder = ./builder.sh; setupHook = ./setup-hook.sh; gccWrapper = ./gcc-wrapper.sh; @@ -25,14 +36,17 @@ stdenv.mkDerivation { libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; - name = if name == "" then gcc.name else name; langC = if nativeTools then true else gcc.langC; langCC = if nativeTools then true else gcc.langCC; - langF77 = if nativeTools then false else gcc.langF77; + langFortran = if nativeTools then false else gcc ? langFortran; shell = if shell == "" then stdenv.shell else shell; - meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else - { description = "System C compiler wrapper"; + meta = + let gcc_ = if gcc != null then gcc else {}; in + (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // + { description = + stdenv.lib.getAttr ["meta" "description"] "System C compiler" gcc_ + + " (wrapper script)"; }; # The dynamic linker has different names on different Linux platforms. diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index a76684806b8..8a49fcb9b06 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -32,6 +32,10 @@ for i in "$@"; do dontLink=1 elif test "${i:0:1}" != "-"; then nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi fi done diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 94241e42ce9..962adf43861 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -85,9 +85,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then n=$((n + 1)) done - # Second, for each -l... switch, find the directory containing the - # library and add it to the rpath. + # Second, for each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. rpath="" + addToRPath() { # If the path is not in the store, don't add it to the rpath. # This typically happens for libraries in /tmp that are later @@ -98,26 +100,25 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then esac rpath="$rpath $1 " } - findLib() { - for i in $libPath; do - if test -f $i/lib$1.so; then + + for i in $libPath; do + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then addToRPath $i + break + elif test "$p" = "-l" -a -f "$i/lib${p2}"; then + # I haven't seen `-l foo', but you never know... + addToRPath $i + break fi - done - } - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:2}" = "-l"; then - findLib ${p:2} - elif test "$p" = "-l"; then - # I haven't seen `-l foo', but you never know... - findLib ${p2} n=$((n + 1)) - fi - n=$((n + 1)) + done + done + # Finally, add `-rpath' switches. for i in $rpath; do diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index 60aad0fe4dc..76167df3c31 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -17,13 +17,13 @@ envHooks=(${envHooks[@]} addCVars) # Note: these come *after* $out in the PATH (see setup.sh). if test -n "@gcc@"; then - PATH=$PATH:@gcc@/bin + addToSearchPath PATH @gcc@/bin fi if test -n "@binutils@"; then - PATH=$PATH:@binutils@/bin + addToSearchPath PATH @binutils@/bin fi if test -n "@libc@"; then - PATH=$PATH:@libc@/bin + addToSearchPath PATH @libc@/bin fi diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh index c13f623bcda..461f30780ee 100644 --- a/pkgs/build-support/make-wrapper/make-wrapper.sh +++ b/pkgs/build-support/make-wrapper/make-wrapper.sh @@ -66,7 +66,9 @@ makeWrapper() { fi done - echo "exec \"$original\" $flagsBefore \"\$@\"" >> $wrapper + # Note: extraFlagsArray is an array containing additional flags + # that may be set by --run actions. + echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper chmod +x $wrapper } @@ -90,7 +92,7 @@ filterExisting() { # Syntax: wrapProgram wrapProgram() { local prog="$1" - local hidden="$(dirname "$prog")/.wrapped-$(basename "$prog")" + local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped mv $prog $hidden makeWrapper $hidden $prog "$@" } diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 867262c516b..429a5a8dee4 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -4,9 +4,11 @@ ensureDir $out/bin cat > $out/bin/nuke-refs < \$i.tmp - if test -x \$i; then chmod +x \$i.tmp; fi - mv \$i.tmp \$i + if test ! -L \$i -a -f \$i; then + cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp + if test -x \$i; then chmod +x \$i.tmp; fi + mv \$i.tmp \$i + fi done EOF chmod +x $out/bin/nuke-refs diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index b352e993b94..94a1508441d 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -57,7 +57,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( ensureDir $out/debs find . -name "*.deb" -exec cp {} $out/debs \; - shopt -s nullglob for i in $out/debs/*.deb; do header "Generated DEB package: $i" dpkg-deb --info "$i" diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 52ed7d60b49..1177024c857 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -5,8 +5,7 @@ with pkgs; rec { sourceTarball = args: import ./source-tarball.nix ( - { inherit autoconf automake libtool; - stdenv = stdenvNew; + { inherit stdenv autoconf automake libtool; } // args); makeSourceTarball = sourceTarball; # compatibility diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 97e86dd3c68..3e12eaccba9 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -26,7 +26,6 @@ vmTools.buildRPM ( ''; # */ postInstall = '' - shopt -s nullglob for i in $out/rpms/*/*.rpm; do echo "file rpm $i" >> $out/nix-support/hydra-build-products done diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index be0345df939..579127f3a4d 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation ( postHook = '' ensureDir $out/nix-support - shopt -s nullglob ''; postUnpack = '' diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index b151570c7f1..0ab2a902281 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, gettext, intltool, libxml2, glib}: +{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool +, libxml2, glib}: stdenv.mkDerivation rec { name = "shared-mime-info-0.51"; @@ -8,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w"; }; - buildInputs = [pkgconfig gettext intltool libxml2 glib]; + buildInputs = [ + pkgconfig gettext intltool perl perlXMLParser libxml2 glib + ]; meta = { description = "A database of common MIME types"; diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix deleted file mode 100644 index c7c92cd6c27..00000000000 --- a/pkgs/data/misc/xkeyboard-config/0.9.nix +++ /dev/null @@ -1,23 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "xkeyboard-config-0.9"; - - src = fetchurl { - url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2; - sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v"; - }; - - buildInputs = [perl perlXMLParser xkbcomp]; - - ICONV = "iconv"; - - preConfigure = " - configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\" - "; - - postInstall = '' - rm ''${out}/etc/X11/xkb/compiled - cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us - ''; -} diff --git a/pkgs/data/misc/xkeyboard-config/1.2.nix b/pkgs/data/misc/xkeyboard-config/1.2.nix deleted file mode 100644 index b95e280f491..00000000000 --- a/pkgs/data/misc/xkeyboard-config/1.2.nix +++ /dev/null @@ -1,25 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "xkeyboard-config-${version}"; - - src = fetchurl { - url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2; - sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4"; - }; - buildInputs = [perl perlXMLParser xkbcomp gettext]; - - ICONV = "iconv"; - - preConfigure = " - configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\" - "; - - patches = [ ./eo.patch ]; - - postInstall = '' - rm ''${out}/etc/X11/xkb/compiled || true; - cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us - sed -e '/xkb_symbols "polytonic"/,/^partial /d' -i $out/etc/X11/xkb/symbols/gr - ''; -} diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 31836d24ecf..c36f83aa153 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -1,23 +1,22 @@ -{stdenv, fetchurl, perl, perlXMLParser, xkbcomp}: +{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}: stdenv.mkDerivation { - name = "xkeyboard-config-0.9"; + name = "xkeyboard-config-1.4"; src = fetchurl { - url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2; - sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v"; + url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2; + sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj"; }; - buildInputs = [perl perlXMLParser xkbcomp]; + buildInputs = [perl perlXMLParser xkbcomp gettext intltool]; ICONV = "iconv"; - preConfigure = " - configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\" - "; + preConfigure = '' + configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86" + ''; postInstall = '' - rm ''${out}/etc/X11/xkb/compiled - cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us + cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us ''; } diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 3b59476ac6c..acbcdc508d9 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -8,7 +8,7 @@ rec { # Platform - platform = import ./src-gnome-platform-2.22.1.nix { + platform = import ./src-gnome-platform-2.26.0.nix { inherit fetchurl; }; @@ -43,7 +43,11 @@ rec { GConf = stdenv.mkDerivation { inherit (platform.GConf) name src; - buildInputs = [pkgconfig perl glib gtk libxml2 popt gettext perlXMLParser]; + buildInputs = [ + pkgconfig perl glib gtk libxml2 + dbus dbus_glib + popt gettext perlXMLParser intltool + ]; propagatedBuildInputs = [ORBit2]; }; @@ -56,7 +60,7 @@ rec { inherit (platform.gnomevfs) name src; buildInputs = [ pkgconfig perl glib libxml2 libbonobo - gnomemimedata popt perlXMLParser gettext bzip2 + gnomemimedata popt perlXMLParser gettext intltool bzip2 dbus_glib hal openssl samba fam ]; propagatedBuildInputs = [GConf]; @@ -64,13 +68,17 @@ rec { }; gail = stdenv.mkDerivation { - inherit (platform.gail) name src; + name = "gail-1.22.3"; + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/gail/1.22/gail-1.22.3.tar.bz2"; + sha256 = "1s4s0ndjh42i8x2mchz0xm3qcp942vkmz0jsq7ig1d3y4wlk1w03"; + }; buildInputs = [pkgconfig atk gtk]; }; libgnome = import ./libgnome.nix { inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser - popt zlib esound gettext; + popt zlib esound gettext intltool; input = platform.libgnome; }; @@ -84,39 +92,48 @@ rec { input = platform.libglade; }; + libglademm = import ./libglademm.nix { + inherit fetchurl stdenv pkgconfig libglade; + inherit (gtkLibs) gtkmm; + }; + libgnomecanvas = stdenv.mkDerivation { inherit (platform.libgnomecanvas) name src; - buildInputs = [pkgconfig libglade perl perlXMLParser gail gettext]; + buildInputs = [ + pkgconfig libglade perl perlXMLParser gail + gettext intltool + ]; propagatedBuildInputs = [gtk libart_lgpl]; }; libbonobo = import ./libbonobo.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex gettext; + inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 + dbus dbus_glib libxml2 popt flex + gettext intltool; yacc = bison; input = platform.libbonobo; }; libbonoboui = import ./libbonoboui.nix { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade - libgnome libgnomecanvas gettext; + libgnome libgnomecanvas gettext intltool; input = platform.libbonoboui; }; libgnomeui = import ./libgnomeui.nix { inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser - libjpeg esound gettext; + libjpeg esound gettext intltool; input = platform.libgnomeui; }; intltool = import ./intltool.nix { inherit fetchurl stdenv pkgconfig perl perlXMLParser; - input = platform.intltool; }; # Desktop - desktop = import ./src-gnome-desktop-2.22.1.nix { + desktop = import ./src-gnome-desktop-2.26.0.nix { inherit fetchurl; }; @@ -125,7 +142,7 @@ rec { buildInputs = [ perl perlXMLParser pkgconfig popt libxml2 - glib pango bison flex gettext + glib pango bison flex gettext intltool ]; propagatedBuildInputs = [libxml2 libart_lgpl]; @@ -136,7 +153,7 @@ rec { buildInputs = [ perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme - gettext + gettext intltool ]; propagatedBuildInputs = [ @@ -145,7 +162,7 @@ rec { }; gtkhtml = import ./gtkhtml.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext; + inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext intltool enchant isocodes; inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme; input = desktop.gtkhtml; }; @@ -161,7 +178,10 @@ rec { gnomekeyring = stdenv.mkDerivation { inherit (desktop.gnomekeyring) name src; - buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext GConf libgcrypt libtasn1]; + buildInputs = [ + pkgconfig gtk glib perl perlXMLParser gettext intltool + GConf libgcrypt libtasn1 dbus dbus_glib python + ]; CFLAGS = "-DENABLE_NLS=0"; }; @@ -201,21 +221,30 @@ rec { }; }; - gnomedesktop = import ./gnome-desktop.nix { - inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser - libjpeg gettext which python libxml2Python libxslt; - input = desktop.gnomedesktop; + gnomedesktop = stdenv.mkDerivation { + inherit (desktop.gnomedesktop) name src; + + # !!! should get rid of libxml2Python, see gnomedocutils + + buildInputs = [ + pkgconfig perl perlXMLParser gtk glib libgnomeui + scrollkeeper libjpeg gnomedocutils gettext which + python libxml2Python libxslt intltool + ]; + + configureFlags = "--disable-scrollkeeper"; }; - libwnck = import ./libwnck.nix { - inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext; - input = desktop.libwnck; + libwnck = stdenv.mkDerivation { + inherit (desktop.libwnck) name src; + buildInputs = [pkgconfig gtk perl perlXMLParser gettext intltool]; }; - gnomemenus = import ./gnome-menus.nix { - inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser - python gettext; - input = desktop.gnomemenus; + gnomemenus = stdenv.mkDerivation { + inherit (desktop.gnomemenus) name src; + buildInputs = [ + pkgconfig perl perlXMLParser glib python gettext intltool + ]; }; librsvg = stdenv.mkDerivation { @@ -225,7 +254,10 @@ rec { libgweather = stdenv.mkDerivation { inherit (desktop.libgweather) name src; - buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs]; + buildInputs = [ + gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs + intltool libsoup + ]; }; gnomepanel = stdenv.mkDerivation { @@ -261,7 +293,7 @@ rec { metacity = import ./metacity.nix { inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk - GConf startupnotification gettext libcm; + GConf startupnotification gettext libcm intltool; inherit (xlibs) libXinerama libXrandr libXcursor libXcomposite libXfixes libXdamage; enableCompositor = true; @@ -274,47 +306,65 @@ rec { input = desktop.gnomedocutils; }; - gconfeditor = import ./gconf-editor.nix { - inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser - gettext libxslt; - input = desktop.gconfeditor; + gconfeditor = stdenv.mkDerivation { + inherit (desktop.gconfeditor) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser GConf gnomedocutils + gtk libgnome libgnomeui gettext libxslt intltool + ]; + + configureFlags = "--disable-scrollkeeper"; }; - vte = import ./vte.nix { - inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser ncurses - python gettext; - input = desktop.vte; + vte = stdenv.mkDerivation { + inherit (desktop.vte) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser glib gtk python gettext intltool + ]; + + propagatedBuildInputs = [ncurses]; }; gnometerminal = stdenv.mkDerivation { inherit (desktop.gnometerminal) name src; buildInputs = [ - pkgconfig perl perlXMLParser gtk GConf libglade - libgnomeui startupnotification gnomevfs vte - gnomedocutils gettext which scrollkeeper - python libxml2Python libxslt + pkgconfig perl perlXMLParser gtk GConf libglade libgnomeui + startupnotification gnomevfs vte gnomedocutils gettext which + scrollkeeper python libxml2Python libxslt intltool + dbus_glib ]; configureFlags = "--disable-scrollkeeper"; }; - libgtop = import ./libgtop.nix { - inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser - popt gettext; - input = desktop.libgtop; + libgtop = stdenv.mkDerivation { + inherit (desktop.libgtop) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser glib popt gettext intltool + ]; }; - gnomeutils = import ./gnome-utils.nix { - inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser - gettext libxslt /* which python libxml2Python libxslt */; - inherit (xlibs) libXmu; - input = desktop.gnomeutils; - }; + gnomeutils = stdenv.mkDerivation { + inherit (desktop.gnomeutils) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser glib gtk libgnome libgnomeui + libglade libgnomeprintui gnomedesktop gnomepanel libgtop + scrollkeeper gnomedocutils gettext libxslt xlibs.libXmu intltool + ]; + configureFlags = "--disable-scrollkeeper"; + }; + gtkdoc = import ./gtkdoc.nix { inherit (platform) gtkdoc; - inherit stdenv args; + inherit stdenv pkgconfig gnomedocutils perl python libxml2 + xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt + scrollkeeper; }; }; diff --git a/pkgs/desktops/gnome/gconf-editor.nix b/pkgs/desktops/gnome/gconf-editor.nix deleted file mode 100644 index 1da67ae0598..00000000000 --- a/pkgs/desktops/gnome/gconf-editor.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, gettext, libxslt -}: - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.GConf gnome.gnomedocutils - gnome.gtk gnome.libgnome gnome.libgnomeui gettext libxslt - ]; - - configureFlags = "--disable-scrollkeeper"; -} diff --git a/pkgs/desktops/gnome/gnome-desktop.nix b/pkgs/desktops/gnome/gnome-desktop.nix deleted file mode 100644 index 7aeae28e74f..00000000000 --- a/pkgs/desktops/gnome/gnome-desktop.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, libjpeg, gettext, which, python, libxml2Python, libxslt -}: - -# !!! should get rid of libxml2Python, see gnomedocutils - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.libgnomeui - gnome.scrollkeeper libjpeg gnome.gnomedocutils gettext which - python libxml2Python libxslt - ]; - - configureFlags = "--disable-scrollkeeper"; -} diff --git a/pkgs/desktops/gnome/gnome-menus.nix b/pkgs/desktops/gnome/gnome-menus.nix deleted file mode 100644 index 66cea23f6ca..00000000000 --- a/pkgs/desktops/gnome/gnome-menus.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, python, gettext -}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [ - pkgconfig perl perlXMLParser gnome.glib python gettext - ]; -} diff --git a/pkgs/desktops/gnome/gnome-utils.nix b/pkgs/desktops/gnome/gnome-utils.nix deleted file mode 100644 index 6714212915a..00000000000 --- a/pkgs/desktops/gnome/gnome-utils.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, gettext, libxslt, libXmu -#, which, python, libxml2Python, libxslt -}: - -# !!! should get rid of libxml2Python, see gnomedocutils - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.glib gnome.gtk gnome.libgnome - gnome.libgnomeui gnome.libglade gnome.libgnomeprintui - gnome.gnomedesktop gnome.gnomepanel gnome.libgtop gnome.scrollkeeper - gnome.gnomedocutils gettext libxslt libXmu - # gnome.gtk gnome.GConf gnome.libglade - #gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte - #gnome.gnomedocutils gettext which gnome.scrollkeeper - #python libxml2Python libxslt - ]; - - configureFlags = "--disable-scrollkeeper"; -} diff --git a/pkgs/desktops/gnome/gtkdoc.nix b/pkgs/desktops/gnome/gtkdoc.nix index f65c908b6d9..5ecb3df72b4 100644 --- a/pkgs/desktops/gnome/gtkdoc.nix +++ b/pkgs/desktops/gnome/gtkdoc.nix @@ -1,12 +1,14 @@ -{ stdenv, gtkdoc, args }: with args; +{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl, python +, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_43 +, libxslt, scrollkeeper }: stdenv.mkDerivation { inherit (gtkdoc) name src; - inherit docbook_xml_dtd_412; - buildInputs = [ perl - libxml2 - xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt ]; + inherit docbook_xml_dtd_43; + buildInputs = [ pkgconfig perl python gnomedocutils + libxml2 scrollkeeper + xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt ]; # maybe there is a better way to pass the needed dtd and xsl files @@ -18,9 +20,10 @@ stdenv.mkDerivation { - + EOF - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml" + + configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; ''; } diff --git a/pkgs/desktops/gnome/gtkhtml.nix b/pkgs/desktops/gnome/gtkhtml.nix index b5b6caad469..c3b28f2765d 100644 --- a/pkgs/desktops/gnome/gtkhtml.nix +++ b/pkgs/desktops/gnome/gtkhtml.nix @@ -1,6 +1,6 @@ { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, atk, gail, gtk , libgnomeprint, libgnomeprintui, libgnomeui, libglade, gnomeicontheme -, libjpeg, gettext +, libjpeg, gettext, intltool, enchant, isocodes }: # TODO build complains about missing libsoup and soup. Optional dependency? @@ -12,7 +12,7 @@ stdenv.mkDerivation { perl perlXMLParser pkgconfig libjpeg atk gail gtk libglade libgnomeprint libgnomeprintui libgnomeui - gnomeicontheme gettext + gnomeicontheme gettext intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome/intltool.nix b/pkgs/desktops/gnome/intltool.nix index 8807f7ab897..57262e11dd9 100644 --- a/pkgs/desktops/gnome/intltool.nix +++ b/pkgs/desktops/gnome/intltool.nix @@ -1,6 +1,13 @@ -{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser]; +stdenv.mkDerivation rec { + name = "intltool-0.40.6"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/${name}.tar.bz2"; + sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ perl perlXMLParser ]; } diff --git a/pkgs/desktops/gnome/libbonobo.nix b/pkgs/desktops/gnome/libbonobo.nix index 5a4bdf5f958..0b7d949247e 100644 --- a/pkgs/desktops/gnome/libbonobo.nix +++ b/pkgs/desktops/gnome/libbonobo.nix @@ -1,4 +1,6 @@ -{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex, gettext}: +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser +, dbus, dbus_glib, ORBit2, libxml2 +, popt, yacc, flex, gettext, intltool }: assert pkgconfig != null && perl != null && ORBit2 != null && libxml2 != null && popt != null && yacc != null && flex != null; @@ -6,6 +8,10 @@ assert pkgconfig != null && perl != null && ORBit2 != null # todo 2.8.1 doesn;t work stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex gettext]; + buildInputs = [ + pkgconfig perl perlXMLParser libxml2 yacc flex + dbus dbus_glib + gettext intltool + ]; propagatedBuildInputs = [ORBit2 popt]; } diff --git a/pkgs/desktops/gnome/libbonoboui.nix b/pkgs/desktops/gnome/libbonoboui.nix index ba0b3aee0ad..ca2d5a2f56f 100644 --- a/pkgs/desktops/gnome/libbonoboui.nix +++ b/pkgs/desktops/gnome/libbonoboui.nix @@ -1,5 +1,5 @@ { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome -, libgnomecanvas, gettext}: +, libgnomecanvas, gettext, intltool }: assert pkgconfig != null && perl != null && libxml2 != null && libglade != null && libgnome != null && libgnomecanvas != null; @@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null # TODO 2.8.1 doesn't work stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser libglade gettext]; + buildInputs = [ pkgconfig perl perlXMLParser libglade gettext intltool ]; propagatedBuildInputs = [libxml2 libgnome libgnomecanvas]; LDFLAGS="-lglib-2.0"; # !!! why? diff --git a/pkgs/desktops/gnome/libglademm.nix b/pkgs/desktops/gnome/libglademm.nix new file mode 100644 index 00000000000..415963dab42 --- /dev/null +++ b/pkgs/desktops/gnome/libglademm.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, libglade, gtkmm }: + +stdenv.mkDerivation rec { + name = "libglademm-2.6.7"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/${name}.tar.bz2"; + sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; + }; + + buildInputs = [ pkgconfig ]; + + # `libglade' must be propagated so that `pkg-config libglademm + # --libs' (or `--cflags') works. + propagatedBuildInputs = [ libglade gtkmm ]; + + meta = { + description = "C++ interface to the libglade graphical user interface library"; + + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK+. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/desktops/gnome/libgnome.nix b/pkgs/desktops/gnome/libgnome.nix index 2ac05487cf8..9a34009834f 100644 --- a/pkgs/desktops/gnome/libgnome.nix +++ b/pkgs/desktops/gnome/libgnome.nix @@ -1,5 +1,5 @@ { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, popt, zlib, esound, gettext +, popt, zlib, esound, gettext, intltool }: # !!! TODO CHECK: @@ -9,6 +9,6 @@ stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext]; + buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext intltool]; propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf]; } diff --git a/pkgs/desktops/gnome/libgnomeui.nix b/pkgs/desktops/gnome/libgnomeui.nix index 3d014349dd9..3e56a44198a 100644 --- a/pkgs/desktops/gnome/libgnomeui.nix +++ b/pkgs/desktops/gnome/libgnomeui.nix @@ -1,11 +1,12 @@ { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, esound, libjpeg, gettext +, esound, libjpeg, gettext, intltool }: stdenv.mkDerivation { inherit (input) name src; buildInputs = [ pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext + intltool ]; propagatedBuildInputs = [ gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg diff --git a/pkgs/desktops/gnome/libgtop.nix b/pkgs/desktops/gnome/libgtop.nix deleted file mode 100644 index 2ab1841155e..00000000000 --- a/pkgs/desktops/gnome/libgtop.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser, popt -, gettext -}: - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.glib popt gettext - ]; -} diff --git a/pkgs/desktops/gnome/libwnck.nix b/pkgs/desktops/gnome/libwnck.nix deleted file mode 100644 index 03912ef8044..00000000000 --- a/pkgs/desktops/gnome/libwnck.nix +++ /dev/null @@ -1,6 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, gtk, perl, perlXMLParser, gettext}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig gtk perl perlXMLParser gettext]; -} diff --git a/pkgs/desktops/gnome/metacity.nix b/pkgs/desktops/gnome/metacity.nix index 5d6f0acd535..184efc2a165 100644 --- a/pkgs/desktops/gnome/metacity.nix +++ b/pkgs/desktops/gnome/metacity.nix @@ -1,6 +1,6 @@ { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk , GConf, startupnotification, libXinerama, libXrandr, libXcursor -, gettext +, gettext, intltool , enableCompositor ? false , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null @@ -14,11 +14,11 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig perl perlXMLParser glib gtk GConf startupnotification - libXinerama libXrandr libXcursor gettext + libXinerama libXrandr libXcursor gettext intltool ] - ++ (if enableCompositor then [libXcomposite libXfixes libXdamage libcm] else []); + ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm]; - configureFlags = " + configureFlags = '' ${if enableCompositor then "--enable-compositor" else ""} - "; + ''; } diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix deleted file mode 100644 index 18c913465d6..00000000000 --- a/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix +++ /dev/null @@ -1,536 +0,0 @@ -# Note: this file was generated automatically by make-listing.sh! - -{fetchurl} : { - alacarte = { - name = "alacarte-0.10.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/alacarte-0.10.2.tar.bz2; - md5 = "abf5d95b968a34d034c47e3bfab95719"; - }; - }; - bugbuddy = { - name = "bug-buddy-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/bug-buddy-2.16.1.tar.bz2; - md5 = "c15641ebfd90a91f185179d67bde88e3"; - }; - }; - controlcenter = { - name = "control-center-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/control-center-2.16.2.tar.bz2; - md5 = "fc6e2f5de89f4482758395d941ec6ae1"; - }; - }; - dasher = { - name = "dasher-4.2.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/dasher-4.2.2.tar.bz2; - md5 = "eff0aeda6c02b03263c4712f56bd3b1c"; - }; - }; - deskbarapplet = { - name = "deskbar-applet-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/deskbar-applet-2.16.2.tar.bz2; - md5 = "6a4780813a55e2f464e69cdfac89894d"; - }; - }; - eel = { - name = "eel-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eel-2.16.3.tar.bz2; - md5 = "8a5fa25a9c1fb7cb58ea9fae9d27f8f7"; - }; - }; - ekiga = { - name = "ekiga-2.0.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/ekiga-2.0.3.tar.bz2; - md5 = "37c57468c7c15ff9bcea91e7fc32aea9"; - }; - }; - eog = { - name = "eog-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eog-2.16.3.tar.bz2; - md5 = "82468185d766b9676d7f06c124939f9d"; - }; - }; - epiphany = { - name = "epiphany-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/epiphany-2.16.3.tar.bz2; - md5 = "3ee93d168eb5720a96f4c7adf2cdf2d4"; - }; - }; - evince = { - name = "evince-0.6.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evince-0.6.1.tar.bz2; - md5 = "55a1d4af3cac209c7cfbe83b7ffcee1d"; - }; - }; - evolution = { - name = "evolution-2.8.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-2.8.3.tar.bz2; - md5 = "099876b347b114ec08ce6998b4a48d8c"; - }; - }; - evolutiondataserver = { - name = "evolution-data-server-1.8.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-data-server-1.8.3.tar.bz2; - md5 = "f6a824f2553fd97555b8785a452fb6ab"; - }; - }; - evolutionexchange = { - name = "evolution-exchange-2.8.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-exchange-2.8.3.tar.bz2; - md5 = "8a6be6640c7824285088f6a2e98f12a4"; - }; - }; - evolutionwebcal = { - name = "evolution-webcal-2.8.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-webcal-2.8.0.tar.bz2; - md5 = "6dd4821ce90e238acbd8a959fee1ee14"; - }; - }; - fastuserswitchapplet = { - name = "fast-user-switch-applet-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/fast-user-switch-applet-2.16.0.tar.bz2; - md5 = "749de0f0279991515ca8d82526f5b329"; - }; - }; - fileroller = { - name = "file-roller-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/file-roller-2.16.3.tar.bz2; - md5 = "3ee134c04b73a584c9ec494d5e542c6d"; - }; - }; - gcalctool = { - name = "gcalctool-5.8.25"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gcalctool-5.8.25.tar.bz2; - md5 = "28074081a9625b8b3d1f7499bc27bbfb"; - }; - }; - gconfeditor = { - name = "gconf-editor-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gconf-editor-2.16.0.tar.bz2; - md5 = "e52b3177ef6ebd1fcf2c84acbe90a663"; - }; - }; - gdm = { - name = "gdm-2.16.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gdm-2.16.5.tar.bz2; - md5 = "8f223458b0e957650f6d865a06a271e4"; - }; - }; - gedit = { - name = "gedit-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gedit-2.16.2.tar.bz2; - md5 = "9ed4fb2891d07c022b487723d1c72161"; - }; - }; - gnomeapplets = { - name = "gnome-applets-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-applets-2.16.2.tar.bz2; - md5 = "1a46b8557ff05ca75e7db6adb4dd6707"; - }; - }; - gnomebackgrounds = { - name = "gnome-backgrounds-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-backgrounds-2.16.2.tar.bz2; - md5 = "765c19d28d39483769687691941129c9"; - }; - }; - gnomedesktop = { - name = "gnome-desktop-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-desktop-2.16.3.tar.bz2; - md5 = "42c21d18589f4955bb0d70c82236d999"; - }; - }; - gnomedocutils = { - name = "gnome-doc-utils-0.8.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-doc-utils-0.8.0.tar.bz2; - md5 = "50726331fef362dc94921f366fcc8ed2"; - }; - }; - gnomegames = { - name = "gnome-games-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-games-2.16.3.tar.bz2; - md5 = "88baa9ab64b84bfcac2a1ba05f84d2f9"; - }; - }; - gnomeicontheme = { - name = "gnome-icon-theme-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-icon-theme-2.16.1.tar.bz2; - md5 = "4a5da64a6084fdddf056e553a929c169"; - }; - }; - gnomekeyring = { - name = "gnome-keyring-0.6.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-0.6.0.tar.bz2; - md5 = "1e3a3a12b19fc5ebe95363658c2256d8"; - }; - }; - gnomekeyringmanager = { - name = "gnome-keyring-manager-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-manager-2.16.0.tar.bz2; - md5 = "d63bfa5e9cfe334694438a74c157344c"; - }; - }; - gnomemag = { - name = "gnome-mag-0.13.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-mag-0.13.2.tar.bz2; - md5 = "093c153c0d8bad40d40d4f7c21be8975"; - }; - }; - gnomemedia = { - name = "gnome-media-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-media-2.16.1.tar.bz2; - md5 = "4fa1e8e8bd31e2db1cb49679170a98a8"; - }; - }; - gnomemenus = { - name = "gnome-menus-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-menus-2.16.1.tar.bz2; - md5 = "a5c467abe68003d23ec09a795ebfd29f"; - }; - }; - gnomenetstatus = { - name = "gnome-netstatus-2.12.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-netstatus-2.12.0.tar.bz2; - md5 = "a5f23731a3bf232969e82afef8792a36"; - }; - }; - gnomenettool = { - name = "gnome-nettool-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-nettool-2.16.0.tar.bz2; - md5 = "58d9171efdf368910934fb71194763eb"; - }; - }; - gnomepanel = { - name = "gnome-panel-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-panel-2.16.2.tar.bz2; - md5 = "82b98a9b2685cca2d381e185cae47596"; - }; - }; - gnomepowermanager = { - name = "gnome-power-manager-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-power-manager-2.16.3.tar.bz2; - md5 = "48166c6aaf41f2225090517ae655d05d"; - }; - }; - gnomepythondesktop = { - name = "gnome-python-desktop-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-python-desktop-2.16.0.tar.bz2; - md5 = "ea79fe3e6a65d8380539a9ef6eed963f"; - }; - }; - gnomescreensaver = { - name = "gnome-screensaver-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-screensaver-2.16.3.tar.bz2; - md5 = "cbd3e3b96b24038c7838b89acae318dd"; - }; - }; - gnomesession = { - name = "gnome-session-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-session-2.16.3.tar.bz2; - md5 = "d35a7f541adecc112b7c73f95353a183"; - }; - }; - gnomesharp = { - name = "gnome-sharp-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-sharp-2.16.0.tar.bz2; - md5 = "09034669acec52f9d9818d9a31c032d5"; - }; - }; - gnomespeech = { - name = "gnome-speech-0.4.8"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-speech-0.4.8.tar.bz2; - md5 = "f1abbdc7b23fd62f98153aff13161a0d"; - }; - }; - gnomesystemmonitor = { - name = "gnome-system-monitor-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-monitor-2.16.1.tar.bz2; - md5 = "37b44e0e84865fc0aba8bfd4bbdf2338"; - }; - }; - gnomesystemtools = { - name = "gnome-system-tools-2.14.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-tools-2.14.0.tar.bz2; - md5 = "3aded3a37f4f5b4962bf253d25cebea1"; - }; - }; - gnometerminal = { - name = "gnome-terminal-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-terminal-2.16.1.tar.bz2; - md5 = "861e1b780819214b4d5a398e7999c093"; - }; - }; - gnomethemes = { - name = "gnome-themes-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-themes-2.16.3.tar.bz2; - md5 = "ecb4d4b9b90507ba4f3d6e9e63d872d5"; - }; - }; - gnomeuserdocs = { - name = "gnome-user-docs-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-user-docs-2.16.1.tar.bz2; - md5 = "4b0abfe5e24438414c22083851bae19e"; - }; - }; - gnomeutils = { - name = "gnome-utils-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-utils-2.16.2.tar.bz2; - md5 = "4e70e667a78fc5bee4a4b8f2f3ae8440"; - }; - }; - gnomevolumemanager = { - name = "gnome-volume-manager-2.15.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-volume-manager-2.15.0.tar.bz2; - md5 = "d723bc2069fd19cf1c31961fbc1cf3c8"; - }; - }; - gok = { - name = "gok-1.2.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gok-1.2.1.tar.bz2; - md5 = "cba5eef61ed1a8f6a83fa18015781721"; - }; - }; - gstpluginsbase = { - name = "gst-plugins-base-0.10.7"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-base-0.10.7.tar.bz2; - md5 = "d66b09de993aefd22d8fc341e5f50521"; - }; - }; - gstpluginsgood = { - name = "gst-plugins-good-0.10.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-good-0.10.3.tar.bz2; - md5 = "2b59bce477349628ee549c2ce1d80a3a"; - }; - }; - gstreamer = { - name = "gstreamer-0.10.8"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gstreamer-0.10.8.tar.bz2; - md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10"; - }; - }; - gtkengines = { - name = "gtk-engines-2.8.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtk-engines-2.8.2.tar.bz2; - md5 = "0c5b0254b57910b1ebcda47ac6a3b1ba"; - }; - }; - gtkhtml = { - name = "gtkhtml-3.12.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtkhtml-3.12.2.tar.bz2; - md5 = "8c943647fd26cf4594b2e97055e22584"; - }; - }; - gtksourceview = { - name = "gtksourceview-1.8.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtksourceview-1.8.3.tar.bz2; - md5 = "1da36ae813b6234dc9d327c3500afef9"; - }; - }; - gucharmap = { - name = "gucharmap-1.8.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gucharmap-1.8.0.tar.bz2; - md5 = "a75cc3dcc9fb3d2edecc4da936e80e3a"; - }; - }; - libgailgnome = { - name = "libgail-gnome-1.1.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgail-gnome-1.1.3.tar.bz2; - md5 = "1d12c5375b3404f4f20b214b763e5225"; - }; - }; - libgnomeprint = { - name = "libgnomeprint-2.12.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprint-2.12.1.tar.bz2; - md5 = "ea729d4968fe2169c84efb12ace5f6cc"; - }; - }; - libgnomeprintui = { - name = "libgnomeprintui-2.12.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprintui-2.12.1.tar.bz2; - md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5"; - }; - }; - libgtop = { - name = "libgtop-2.14.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgtop-2.14.6.tar.bz2; - md5 = "4aa425a6b66b976be6f364904eeda78a"; - }; - }; - librsvg = { - name = "librsvg-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/librsvg-2.16.1.tar.bz2; - md5 = "37e046571097ff7ce77ae6e07f096324"; - }; - }; - libsoup = { - name = "libsoup-2.2.99"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libsoup-2.2.99.tar.bz2; - md5 = "b2f5df25de4a5c00653d1667eb1b5687"; - }; - }; - libwnck = { - name = "libwnck-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libwnck-2.16.3.tar.bz2; - md5 = "0a36d269b19f78df7bd861033792f550"; - }; - }; - metacity = { - name = "metacity-2.16.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/metacity-2.16.5.tar.bz2; - md5 = "7ac14eb4caffbb15df91b70b0def2f5e"; - }; - }; - nautilus = { - name = "nautilus-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-2.16.3.tar.bz2; - md5 = "05a0fe98d524ca5287da21845ab8490c"; - }; - }; - nautiluscdburner = { - name = "nautilus-cd-burner-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-cd-burner-2.16.3.tar.bz2; - md5 = "6e3653c849e24aacd7e29b4030327b4e"; - }; - }; - orca = { - name = "orca-1.0.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/orca-1.0.1.tar.bz2; - md5 = "860172c6dadf6a655d8e0b2b3df90628"; - }; - }; - scrollkeeper = { - name = "scrollkeeper-0.3.14"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2; - md5 = "b175e582a6cec3e50a9de73a5bb7455a"; - }; - }; - soundjuicer = { - name = "sound-juicer-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/sound-juicer-2.16.3.tar.bz2; - md5 = "cfe4199f4f50c2a8f8178db4097209e4"; - }; - }; - startupnotification = { - name = "startup-notification-0.8"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/startup-notification-0.8.tar.bz2; - md5 = "d9b2e9fba18843314ae42334ceb4336d"; - }; - }; - systemtoolsbackends = { - name = "system-tools-backends-1.4.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/system-tools-backends-1.4.2.tar.bz2; - md5 = "a0af1513becdf3b9bfed3535ad8f7dab"; - }; - }; - tomboy = { - name = "tomboy-0.4.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/tomboy-0.4.1.tar.bz2; - md5 = "40e0f51d832d04f762851fc9a88c01ea"; - }; - }; - totem = { - name = "totem-2.16.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/totem-2.16.5.tar.bz2; - md5 = "fa8eb90b52d70d876e1d42ec43cf8448"; - }; - }; - vino = { - name = "vino-2.13.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vino-2.13.5.tar.bz2; - md5 = "9bc8c3f0e639fdc7b9ed023501308359"; - }; - }; - vte = { - name = "vte-0.14.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vte-0.14.2.tar.bz2; - md5 = "eceafec1b564cc059fa3407f83631817"; - }; - }; - yelp = { - name = "yelp-2.16.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/yelp-2.16.2.tar.bz2; - md5 = "ac55332d62c1871b3de92b5c1f0befaa"; - }; - }; - zenity = { - name = "zenity-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/zenity-2.16.3.tar.bz2; - md5 = "773579408f3237b38fa4d18a182c0ca6"; - }; - }; -} diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix deleted file mode 100644 index 866882569c3..00000000000 --- a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix +++ /dev/null @@ -1,603 +0,0 @@ -# Note: this file was generated automatically by make-listing.pl! - -{fetchurl} : { - alacarte = { - name = "alacarte-0.11.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/alacarte-0.11.5.tar.bz2; - md5 = "e4dc193d36c76b974e66e517e9c7ea33"; - }; - }; - bugbuddy = { - name = "bug-buddy-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/bug-buddy-2.22.0.tar.bz2; - md5 = "092e1f91d0be4ca133cd0650622a6b06"; - }; - }; - cheese = { - name = "cheese-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/cheese-2.22.1.tar.bz2; - md5 = "0f3c583081f56263541f9a8644569829"; - }; - }; - dasher = { - name = "dasher-4.7.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/dasher-4.7.3.tar.bz2; - md5 = "f97dfd3c54f6d6c5f2873d4f82cb33c4"; - }; - }; - deskbarapplet = { - name = "deskbar-applet-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/deskbar-applet-2.22.1.tar.bz2; - md5 = "b506328780abaa6a7e0e59a1f262c22c"; - }; - }; - eel = { - name = "eel-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eel-2.22.1.tar.bz2; - md5 = "dd393ad7de2e230a7604af9560140920"; - }; - }; - ekiga = { - name = "ekiga-2.0.12"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/ekiga-2.0.12.tar.bz2; - md5 = "d86636c2195b4fb95aec427c17570008"; - }; - }; - eog = { - name = "eog-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eog-2.22.1.tar.bz2; - md5 = "ca40ada77bda9b396809e08782f5d718"; - }; - }; - epiphany = { - name = "epiphany-2.22.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/epiphany-2.22.1.1.tar.bz2; - md5 = "24bb8c430a6165b9c43a2ed0452cc6a5"; - }; - }; - evince = { - name = "evince-2.22.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evince-2.22.1.1.tar.bz2; - md5 = "568ff7211a185d71d0e9de15a07f4987"; - }; - }; - evolution = { - name = "evolution-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-2.22.1.tar.bz2; - md5 = "b8eddd6e26b59b1fe6ad0ae849916836"; - }; - }; - evolutiondataserver = { - name = "evolution-data-server-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-data-server-2.22.1.tar.bz2; - md5 = "1972fa3dbd46c25216b00c1d35f83eaf"; - }; - }; - evolutionexchange = { - name = "evolution-exchange-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-exchange-2.22.1.tar.bz2; - md5 = "213db2462016f18ad3261d3e7fb00004"; - }; - }; - evolutionwebcal = { - name = "evolution-webcal-2.21.92"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-webcal-2.21.92.tar.bz2; - md5 = "049ea414f6d82a1e4b1e88f71a4f19cb"; - }; - }; - fastuserswitchapplet = { - name = "fast-user-switch-applet-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/fast-user-switch-applet-2.22.0.tar.bz2; - md5 = "540f2567582e77cdd673dde3546b61db"; - }; - }; - fileroller = { - name = "file-roller-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/file-roller-2.22.2.tar.bz2; - md5 = "68f89c4723e4f2d2e58b15f7b2a20d23"; - }; - }; - gcalctool = { - name = "gcalctool-5.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gcalctool-5.22.1.tar.bz2; - md5 = "a4103972f07e85cf242b9a5e4efcfa91"; - }; - }; - gconfeditor = { - name = "gconf-editor-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gconf-editor-2.22.0.tar.bz2; - md5 = "7ca99aec214dd855b5de7dacc8937055"; - }; - }; - gdm = { - name = "gdm-2.20.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gdm-2.20.5.tar.bz2; - md5 = "151d90901abc2088a0825ee1dd8da7f6"; - }; - }; - gedit = { - name = "gedit-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gedit-2.22.1.tar.bz2; - md5 = "ee797f4e2eed291dc28ef8ff7082445e"; - }; - }; - gnomeapplets = { - name = "gnome-applets-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-applets-2.22.1.tar.bz2; - md5 = "d6df0a48c875b77a4fafe47fc81bde29"; - }; - }; - gnomebackgrounds = { - name = "gnome-backgrounds-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-backgrounds-2.22.0.tar.bz2; - md5 = "1997e020288ea6b91ed460c2c6bfc8d4"; - }; - }; - gnomecontrolcenter = { - name = "gnome-control-center-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-control-center-2.22.1.tar.bz2; - md5 = "170815bcf2627bf64436283f86c751aa"; - }; - }; - gnomedesktop = { - name = "gnome-desktop-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-2.22.1.tar.bz2; - md5 = "39d1421dbfe54d0838a00b055edcb5cf"; - }; - }; - gnomedesktopsharp = { - name = "gnome-desktop-sharp-2.20.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-sharp-2.20.1.tar.bz2; - md5 = "874cfcf8a6547476906b638355a0ed2f"; - }; - }; - gnomedocutils = { - name = "gnome-doc-utils-0.12.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-doc-utils-0.12.2.tar.bz2; - md5 = "e1a9e9ba923b8950f8803c90ebeaadb8"; - }; - }; - gnomegames = { - name = "gnome-games-2.22.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-games-2.22.1.1.tar.bz2; - md5 = "57500e063a6f26f2fbfd364a68842297"; - }; - }; - gnomeicontheme = { - name = "gnome-icon-theme-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.25/2.25.1/sources/gnome-icon-theme-2.24.0.tar.bz2; - sha256 = "1ciid3p21n5m2ixdc7b6sqjvw68pzg1adxljrcy7snnnxbwqj7xp"; - }; - #src = fetchurl { - # url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2; - # md5 = "a4c03092da28ad53ed3867aef83f29d9"; - #}; - }; - gnomekeyring = { - name = "gnome-keyring-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-keyring-2.22.1.tar.bz2; - md5 = "4ca9c19fa6ada61cdc93ab24214b5c4f"; - }; - }; - gnomemag = { - name = "gnome-mag-0.15.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-mag-0.15.0.tar.bz2; - md5 = "a297f2b2fae4cd0cde2a30bfacc4c380"; - }; - }; - gnomemedia = { - name = "gnome-media-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-media-2.22.0.tar.bz2; - md5 = "e3fabb87abd2731d7f345d724b40333a"; - }; - }; - gnomemenus = { - name = "gnome-menus-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-menus-2.22.1.tar.bz2; - md5 = "6e31d10da8c1ef315ca2d7f02e807395"; - }; - }; - gnomenetstatus = { - name = "gnome-netstatus-2.12.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-netstatus-2.12.1.tar.bz2; - md5 = "8651ca1694a6c222ae5cad6e21814d24"; - }; - }; - gnomenettool = { - name = "gnome-nettool-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-nettool-2.22.0.tar.bz2; - md5 = "290dd50a08a3859332afb6daf46dde25"; - }; - }; - gnomepanel = { - name = "gnome-panel-2.22.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-panel-2.22.1.1.tar.bz2; - md5 = "c80f265af2dd009917aece662fd6ab37"; - }; - }; - gnomepowermanager = { - name = "gnome-power-manager-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-power-manager-2.22.1.tar.bz2; - md5 = "bfb10f96771dd161ff16171f78a7dc21"; - }; - }; - gnomepythondesktop = { - name = "gnome-python-desktop-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-python-desktop-2.22.0.tar.bz2; - md5 = "504877a973f6abc0788283232cd703cb"; - }; - }; - gnomescreensaver = { - name = "gnome-screensaver-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-screensaver-2.22.2.tar.bz2; - md5 = "496a2e0cba5c27db57a72ecf2e17f789"; - }; - }; - gnomesession = { - name = "gnome-session-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-session-2.22.1.tar.bz2; - md5 = "8cd499f49cecfdcb32fd4f97965e9017"; - }; - }; - gnomesettingsdaemon = { - name = "gnome-settings-daemon-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-settings-daemon-2.22.1.tar.bz2; - md5 = "959d0d289ed81f950004fa64dbcff89d"; - }; - }; - gnomesharp = { - name = "gnome-sharp-2.20.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-sharp-2.20.0.tar.bz2; - md5 = "1cdb85652a6504afe6fad569daa901ee"; - }; - }; - gnomespeech = { - name = "gnome-speech-0.4.18"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-speech-0.4.18.tar.bz2; - md5 = "f325037fdc74e19d943f397066454ac3"; - }; - }; - gnomesystemmonitor = { - name = "gnome-system-monitor-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-monitor-2.22.0.tar.bz2; - md5 = "7b809a4db72902ca5f47a63f62917d14"; - }; - }; - gnomesystemtools = { - name = "gnome-system-tools-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-tools-2.22.0.tar.bz2; - md5 = "6559bb97fc75bc28b559dc530571d527"; - }; - }; - gnometerminal = { - name = "gnome-terminal-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-terminal-2.22.1.tar.bz2; - md5 = "0e6c71def04b2a56e8d6725cef7950b4"; - }; - }; - gnomethemes = { - name = "gnome-themes-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-themes-2.22.0.tar.bz2; - md5 = "e902194175c6f7298bd53e5aa7eef56b"; - }; - }; - gnomeuserdocs = { - name = "gnome-user-docs-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-user-docs-2.22.0.tar.bz2; - md5 = "f3af808e754701b83105eab2f5ca690c"; - }; - }; - gnomeutils = { - name = "gnome-utils-2.20.0.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-utils-2.20.0.1.tar.bz2; - md5 = "2d4385df2fb566b437b283bd2ce70190"; - }; - }; - gnomevolumemanager = { - name = "gnome-volume-manager-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-volume-manager-2.22.1.tar.bz2; - md5 = "a0cb86f541515f33443c848879d04785"; - }; - }; - gok = { - name = "gok-1.3.7"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gok-1.3.7.tar.bz2; - md5 = "14b2407604ceec0ffcbf4866fef35502"; - }; - }; - gstpluginsbase = { - name = "gst-plugins-base-0.10.19"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-base-0.10.19.tar.bz2; - md5 = "9c9614cbb6497b7fee1c954b9d5ae3b7"; - }; - }; - gstpluginsgood = { - name = "gst-plugins-good-0.10.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-good-0.10.6.tar.bz2; - md5 = "25f111360c2930705b91b4fcf93ae5c5"; - }; - }; - gstreamer = { - name = "gstreamer-0.10.19"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gstreamer-0.10.19.tar.bz2; - md5 = "12072a3168420350ea450749a3b63be8"; - }; - }; - gtkengines = { - name = "gtk-engines-2.14.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtk-engines-2.14.1.tar.bz2; - md5 = "eef8ee067bad0b76b9773aef1994930c"; - }; - }; - gtkhtml = { - name = "gtkhtml-3.18.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtkhtml-3.18.1.tar.bz2; - md5 = "e314eba21158afa018d47f63c67000d3"; - }; - }; - gtksourceview = { - name = "gtksourceview-2.2.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtksourceview-2.2.1.tar.bz2; - md5 = "1c5bd86f854ead3aedb96463ebbb275f"; - }; - }; - gucharmap = { - name = "gucharmap-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gucharmap-2.22.1.tar.bz2; - md5 = "cd5f6ae44d29a7582dc179ebc64b42b4"; - }; - }; - gvfs = { - name = "gvfs-0.2.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gvfs-0.2.3.tar.bz2; - md5 = "cefc1279b98838f26bc7878029ed13b3"; - }; - }; - libgailgnome = { - name = "libgail-gnome-1.20.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgail-gnome-1.20.0.tar.bz2; - md5 = "5a7662e3d637c86baa95a50adb225e56"; - }; - }; - libgnomekbd = { - name = "libgnomekbd-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomekbd-2.22.0.tar.bz2; - md5 = "a8b64278ae3471583607d734db9347eb"; - }; - }; - libgnomeprint = { - name = "libgnomeprint-2.18.4"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprint-2.18.4.tar.bz2; - md5 = "bc460f875425a956176f07440b3fa46e"; - }; - }; - libgnomeprintui = { - name = "libgnomeprintui-2.18.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprintui-2.18.2.tar.bz2; - md5 = "88b404e7b62bb9ad96b25908c1315dcd"; - }; - }; - libgtop = { - name = "libgtop-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgtop-2.22.1.tar.bz2; - md5 = "d157224c951f1284132361e50a8195b5"; - }; - }; - libgweather = { - name = "libgweather-2.22.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgweather-2.22.1.1.tar.bz2; - md5 = "6b0e12931db8c640992bef75bd3cc24b"; - }; - }; - liboobs = { - name = "liboobs-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/liboobs-2.22.0.tar.bz2; - md5 = "1b090ecd6c0df58b131795ff9a5c9057"; - }; - }; - librsvg = { - name = "librsvg-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/librsvg-2.22.2.tar.bz2; - md5 = "aae602677ce201b1a0ed6a0c18c207f2"; - }; - }; - libsoup = { - name = "libsoup-2.4.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libsoup-2.4.1.tar.bz2; - md5 = "d0fc91ccb9da401e9e40d2f4612bdac9"; - }; - }; - libwnck = { - name = "libwnck-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libwnck-2.22.1.tar.bz2; - md5 = "6b16643a107d9fc37136335939ab3f1a"; - }; - }; - metacity = { - name = "metacity-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/metacity-2.22.0.tar.bz2; - md5 = "8cb6d02cf66a1003532b4f5d2754d696"; - }; - }; - mousetweaks = { - name = "mousetweaks-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/mousetweaks-2.22.1.tar.bz2; - md5 = "16ef7e51728c27c7ea3378a9f296f352"; - }; - }; - nautilus = { - name = "nautilus-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-2.22.2.tar.bz2; - md5 = "4758815c46f350bd314d9e104f0a1b72"; - }; - }; - nautiluscdburner = { - name = "nautilus-cd-burner-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-cd-burner-2.22.1.tar.bz2; - md5 = "6bf96cb55a11813a26118eabafa69143"; - }; - }; - orca = { - name = "orca-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/orca-2.22.1.tar.bz2; - md5 = "ef477a5b43846060ccbc636f5b731f21"; - }; - }; - pygtksourceview = { - name = "pygtksourceview-2.2.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/pygtksourceview-2.2.0.tar.bz2; - md5 = "5dd0a9aa99168f989ed04123a65077e4"; - }; - }; - seahorse = { - name = "seahorse-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/seahorse-2.22.1.tar.bz2; - md5 = "e0e409ab825c954b5937b8b115dd5118"; - }; - }; - soundjuicer = { - name = "sound-juicer-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/sound-juicer-2.22.0.tar.bz2; - md5 = "20f83a28915b7d7029198396258d1b4f"; - }; - }; - swfdecgnome = { - name = "swfdec-gnome-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/swfdec-gnome-2.22.2.tar.bz2; - md5 = "7de99aff7978bc870e1eabb4ba8f0fc7"; - }; - }; - tomboy = { - name = "tomboy-0.10.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/tomboy-0.10.1.tar.bz2; - md5 = "c9b2534e2ea58bf0a8cf7c8dc5643fc1"; - }; - }; - totem = { - name = "totem-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-2.22.1.tar.bz2; - md5 = "f4920ffef2a90f019ff7e9d6a411e532"; - }; - }; - totemplparser = { - name = "totem-pl-parser-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-pl-parser-2.22.2.tar.bz2; - md5 = "d2f5e023de8d24c21e863dd7257594f0"; - }; - }; - vinagre = { - name = "vinagre-0.5.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vinagre-0.5.1.tar.bz2; - md5 = "48e0079631952216743720fa1c59f621"; - }; - }; - vino = { - name = "vino-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vino-2.22.1.tar.bz2; - md5 = "01c5ffd0b252edb8921bfcca88438339"; - }; - }; - vte = { - name = "vte-0.16.13"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vte-0.16.13.tar.bz2; - md5 = "40480f20f6b7664f3d364e4f2ed27889"; - }; - }; - yelp = { - name = "yelp-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/yelp-2.22.1.tar.bz2; - md5 = "a292c6712bb820e6aa2ade84ebdc9609"; - }; - }; - zenity = { - name = "zenity-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/zenity-2.22.1.tar.bz2; - md5 = "4e1e1f080e7253ee4f6a5cee3306c78d"; - }; - }; -} diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix new file mode 100644 index 00000000000..3b5a611241c --- /dev/null +++ b/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix @@ -0,0 +1,613 @@ +# Note: this file was generated automatically by make-listing.pl! + +{fetchurl} : { + alacarte = { + name = "alacarte-0.11.10"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/alacarte-0.11.10.tar.bz2; + md5 = "1888f6206c5bf4659214ac1b7487efd6"; + }; + }; + brasero = { + name = "brasero-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/brasero-2.26.0.tar.bz2; + md5 = "ef968fe98874da4e26b61591ee57be4a"; + }; + }; + bugbuddy = { + name = "bug-buddy-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/bug-buddy-2.26.0.tar.bz2; + md5 = "f92663a1a819f83e3eb3004f9e8a687a"; + }; + }; + cheese = { + name = "cheese-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/cheese-2.26.0.tar.bz2; + md5 = "17c991c695c3a7549da6e42d1b327d79"; + }; + }; + dasher = { + name = "dasher-4.10.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/dasher-4.10.0.tar.bz2; + md5 = "d07fa31c3a8ead147f981efa90193c56"; + }; + }; + deskbarapplet = { + name = "deskbar-applet-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/deskbar-applet-2.26.0.tar.bz2; + md5 = "168044d1312bf30e71f2ed587d2bffb6"; + }; + }; + ekiga = { + name = "ekiga-3.2.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/ekiga-3.2.0.tar.bz2; + md5 = "01c4c944a1b900b5b3bfa95d3a820b22"; + }; + }; + empathy = { + name = "empathy-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/empathy-2.26.0.tar.bz2; + md5 = "f5b2d8ca7bd5e315491e3d05a7fd03c1"; + }; + }; + eog = { + name = "eog-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/eog-2.26.0.tar.bz2; + md5 = "5d513046f80bc989e715243d8cee2825"; + }; + }; + epiphany = { + name = "epiphany-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/epiphany-2.26.0.tar.bz2; + md5 = "98043cd7332fd3025e9b69f65904e5a4"; + }; + }; + evince = { + name = "evince-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evince-2.26.0.tar.bz2; + md5 = "11c440e48702231e40066a78aae56f84"; + }; + }; + evolution = { + name = "evolution-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-2.26.0.tar.bz2; + md5 = "97234b1ecded0232a1b68d2fc03b0252"; + }; + }; + evolutiondataserver = { + name = "evolution-data-server-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-data-server-2.26.0.tar.bz2; + md5 = "d010845a4ee9604f050403b106c2f416"; + }; + }; + evolutionexchange = { + name = "evolution-exchange-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-exchange-2.26.0.tar.bz2; + md5 = "845f0a74e4565a6639f3b8adb736cbc1"; + }; + }; + evolutionmapi = { + name = "evolution-mapi-0.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-mapi-0.26.0.tar.bz2; + md5 = "b0f27b8deda6945356da035e28537d1a"; + }; + }; + evolutionwebcal = { + name = "evolution-webcal-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-webcal-2.26.0.tar.bz2; + md5 = "a36036a94dd043f57a6d84ab9b6c732c"; + }; + }; + fileroller = { + name = "file-roller-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/file-roller-2.26.0.tar.bz2; + md5 = "795c6b0a2b3b02c5f407b1d9f9b643ef"; + }; + }; + gcalctool = { + name = "gcalctool-5.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gcalctool-5.26.0.tar.bz2; + md5 = "c2162ac18e9c1dae145cb79e677023c5"; + }; + }; + gconfeditor = { + name = "gconf-editor-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gconf-editor-2.26.0.tar.bz2; + md5 = "2dc76415b22d805cfacfcd5fb98f185c"; + }; + }; + gdm = { + name = "gdm-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gdm-2.26.0.tar.bz2; + md5 = "b1a8db2f0e058d3c7b4c9a4600839a14"; + }; + }; + gedit = { + name = "gedit-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gedit-2.26.0.tar.bz2; + md5 = "577b30e6f17f6dce0af7be3e522d6058"; + }; + }; + gnomeapplets = { + name = "gnome-applets-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-applets-2.26.0.tar.bz2; + md5 = "eed64366b0a1f4032506ac7221ce898a"; + }; + }; + gnomebackgrounds = { + name = "gnome-backgrounds-2.24.1"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-backgrounds-2.24.1.tar.bz2; + md5 = "28e09fcdeef5616bc612b36e5068e413"; + }; + }; + gnomecontrolcenter = { + name = "gnome-control-center-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-control-center-2.26.0.tar.bz2; + md5 = "eed8feccc37712e34d88bd3b20e46962"; + }; + }; + gnomedesktop = { + name = "gnome-desktop-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-2.26.0.tar.bz2; + md5 = "796fc830e0baff24381809a7abe012f8"; + }; + }; + gnomedesktopsharp = { + name = "gnome-desktop-sharp-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-sharp-2.26.0.tar.bz2; + md5 = "4bc990900bb318b2ba0b0e7998bb47d1"; + }; + }; + gnomedocutils = { + name = "gnome-doc-utils-0.16.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-doc-utils-0.16.0.tar.bz2; + md5 = "45971197fd48147ee928462d5b74f234"; + }; + }; + gnomegames = { + name = "gnome-games-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-games-2.26.0.tar.bz2; + md5 = "77e03e0caa57daec39e7cf8e09c87598"; + }; + }; + gnomeicontheme = { + name = "gnome-icon-theme-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-icon-theme-2.26.0.tar.bz2; + md5 = "36a4e5e1b2c7c053779a9a399f6146a2"; + }; + }; + gnomekeyring = { + name = "gnome-keyring-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-keyring-2.26.0.tar.bz2; + md5 = "0395fcf79b990465030a2795dcddacb9"; + }; + }; + gnomemag = { + name = "gnome-mag-0.15.5"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-mag-0.15.5.tar.bz2; + md5 = "8d380056b90619f2e0b86e785836fbc4"; + }; + }; + gnomemedia = { + name = "gnome-media-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-media-2.26.0.tar.bz2; + md5 = "3d519bc7d812aed8f6e4288b6d3cdf26"; + }; + }; + gnomemenus = { + name = "gnome-menus-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-menus-2.26.0.tar.bz2; + md5 = "55fd07e67d8334de2e03e4e23c011452"; + }; + }; + gnomenetstatus = { + name = "gnome-netstatus-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-netstatus-2.26.0.tar.bz2; + md5 = "f116157535ec185f0ea7503fafc5edd6"; + }; + }; + gnomenettool = { + name = "gnome-nettool-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-nettool-2.26.0.tar.bz2; + md5 = "34bc06209bb72bd85d45829eecc078cb"; + }; + }; + gnomepanel = { + name = "gnome-panel-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-panel-2.26.0.tar.bz2; + md5 = "27965de9b12952b22b7e232af6acb0de"; + }; + }; + gnomepowermanager = { + name = "gnome-power-manager-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-power-manager-2.26.0.tar.bz2; + md5 = "a3d8815e143323083870f75e71fa1098"; + }; + }; + gnomepythondesktop = { + name = "gnome-python-desktop-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-python-desktop-2.26.0.tar.bz2; + md5 = "fbcf4ef5ec4a8c4eec4d390c5889c80f"; + }; + }; + gnomescreensaver = { + name = "gnome-screensaver-2.25.2"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-screensaver-2.25.2.tar.bz2; + md5 = "e0aa87be6034e0274103f0ef30c1d31d"; + }; + }; + gnomesession = { + name = "gnome-session-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-session-2.26.0.tar.bz2; + md5 = "e17dbce7446b3e42fac2b1cea7dedffd"; + }; + }; + gnomesettingsdaemon = { + name = "gnome-settings-daemon-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-settings-daemon-2.26.0.tar.bz2; + md5 = "c3a2934deccfcf13de15507d4be802d3"; + }; + }; + gnomesharp = { + name = "gnome-sharp-2.24.1"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-sharp-2.24.1.tar.bz2; + md5 = "408f83f790a5189bcf76ea9299bc6410"; + }; + }; + gnomespeech = { + name = "gnome-speech-0.4.25"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-speech-0.4.25.tar.bz2; + md5 = "89cbc23fc131c33396c0346085759f63"; + }; + }; + gnomesystemmonitor = { + name = "gnome-system-monitor-2.26.0.1"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-monitor-2.26.0.1.tar.bz2; + md5 = "553de9c4912f4af25f92a3380626c0f1"; + }; + }; + gnomesystemtools = { + name = "gnome-system-tools-2.22.2"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-tools-2.22.2.tar.bz2; + md5 = "c2c9a2570dd01a38b46a6adb91a2cb2f"; + }; + }; + gnometerminal = { + name = "gnome-terminal-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-terminal-2.26.0.tar.bz2; + md5 = "013e51a2c4dd7dde5db49587952065ae"; + }; + }; + gnomethemes = { + name = "gnome-themes-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-themes-2.26.0.tar.bz2; + md5 = "3f841154544867585504153d57df1fda"; + }; + }; + gnomeuserdocs = { + name = "gnome-user-docs-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-docs-2.26.0.tar.bz2; + md5 = "3735096cf4b076696ebed217bf600190"; + }; + }; + gnomeusershare = { + name = "gnome-user-share-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-share-2.26.0.tar.bz2; + md5 = "c99133b74a81a78ac0e4e10ef73fada7"; + }; + }; + gnomeutils = { + name = "gnome-utils-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-utils-2.26.0.tar.bz2; + md5 = "667400cfb9bee954028024ac3cf91a09"; + }; + }; + gok = { + name = "gok-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gok-2.26.0.tar.bz2; + md5 = "8cc28ad6010a977c9ccbe8d5b690f636"; + }; + }; + gstpluginsbase = { + name = "gst-plugins-base-0.10.22"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-base-0.10.22.tar.bz2; + md5 = "5d0f1e07f8f6db564971b50f75261e8a"; + }; + }; + gstpluginsgood = { + name = "gst-plugins-good-0.10.14"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-good-0.10.14.tar.bz2; + md5 = "a861ccbb90a176d1242608502f45f0ac"; + }; + }; + gstreamer = { + name = "gstreamer-0.10.22"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gstreamer-0.10.22.tar.bz2; + md5 = "35dd8598837af4074753afe5b59e8ef2"; + }; + }; + gtkengines = { + name = "gtk-engines-2.18.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtk-engines-2.18.0.tar.bz2; + md5 = "6a7ac01fc9f9429bfb126e068e74eb4f"; + }; + }; + gtkhtml = { + name = "gtkhtml-3.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtkhtml-3.26.0.tar.bz2; + md5 = "75d3b6dcd939c2ddcad8aa255ab76f90"; + }; + }; + gtksourceview = { + name = "gtksourceview-2.6.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtksourceview-2.6.0.tar.bz2; + md5 = "dd065ab2e96e51aade949249c5556439"; + }; + }; + gucharmap = { + name = "gucharmap-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gucharmap-2.26.0.tar.bz2; + md5 = "c4384767bd11f43ef997bda7d77600a4"; + }; + }; + gvfs = { + name = "gvfs-1.2.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gvfs-1.2.0.tar.bz2; + md5 = "d30aa7b099e4a3746da81265d27363da"; + }; + }; + hamsterapplet = { + name = "hamster-applet-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/hamster-applet-2.26.0.tar.bz2; + md5 = "4e2e5853b1101fa98e69c231a2378ae5"; + }; + }; + libgailgnome = { + name = "libgail-gnome-1.20.1"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgail-gnome-1.20.1.tar.bz2; + md5 = "5c5b71af5a8ab2a9403bdae52b20e46c"; + }; + }; + libgnomekbd = { + name = "libgnomekbd-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomekbd-2.26.0.tar.bz2; + md5 = "aee58c088c4fd980e1bf813ea813c156"; + }; + }; + libgnomeprint = { + name = "libgnomeprint-2.18.6"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprint-2.18.6.tar.bz2; + md5 = "a5aa248058a07de4b3cf444673cfc683"; + }; + }; + libgnomeprintui = { + name = "libgnomeprintui-2.18.4"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprintui-2.18.4.tar.bz2; + md5 = "e76d763f6279b900a63e5fb2909f8810"; + }; + }; + libgtop = { + name = "libgtop-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgtop-2.26.0.tar.bz2; + md5 = "a51ff49eddcce4573f7385e4be33158a"; + }; + }; + libgweather = { + name = "libgweather-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgweather-2.26.0.tar.bz2; + md5 = "b96016d7b35c66cf251189e9851ee252"; + }; + }; + liboobs = { + name = "liboobs-2.22.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/liboobs-2.22.0.tar.bz2; + md5 = "1b090ecd6c0df58b131795ff9a5c9057"; + }; + }; + librsvg = { + name = "librsvg-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/librsvg-2.26.0.tar.bz2; + md5 = "65dbd726a514fe8b797d26254b8efc1e"; + }; + }; + libsoup = { + name = "libsoup-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libsoup-2.26.0.tar.bz2; + md5 = "9df9d2b3304213641d3214a774d75ee1"; + }; + }; + libwnck = { + name = "libwnck-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libwnck-2.26.0.tar.bz2; + md5 = "73873bf666fc18dff04d66c48400b0c5"; + }; + }; + metacity = { + name = "metacity-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/metacity-2.26.0.tar.bz2; + md5 = "eafb624e79fbcdab6da59acc222430b1"; + }; + }; + mousetweaks = { + name = "mousetweaks-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/mousetweaks-2.26.0.tar.bz2; + md5 = "f63556d0db84287118b34e4a1e7421f1"; + }; + }; + nautilus = { + name = "nautilus-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/nautilus-2.26.0.tar.bz2; + md5 = "d26e673de34be4c6d8ab09af89b92270"; + }; + }; + orca = { + name = "orca-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/orca-2.26.0.tar.bz2; + md5 = "d097f28747943a32d50e3b91eab5c518"; + }; + }; + pygtksourceview = { + name = "pygtksourceview-2.5.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/pygtksourceview-2.5.0.tar.bz2; + md5 = "e3d66310ce16bb138e216982ef6697ee"; + }; + }; + seahorse = { + name = "seahorse-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-2.26.0.tar.bz2; + md5 = "ddecca2181d4c9f0dfbe412b68508e5d"; + }; + }; + seahorseplugins = { + name = "seahorse-plugins-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-plugins-2.26.0.tar.bz2; + md5 = "8936feb29cf9e4b935d1059ee4e416c6"; + }; + }; + soundjuicer = { + name = "sound-juicer-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/sound-juicer-2.26.0.tar.bz2; + md5 = "6dd30f5a8119f9698eabd8220d5c5392"; + }; + }; + swfdecgnome = { + name = "swfdec-gnome-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/swfdec-gnome-2.26.0.tar.bz2; + md5 = "53d611d9a76a06a703650c4b73fd44cc"; + }; + }; + tomboy = { + name = "tomboy-0.14.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/tomboy-0.14.0.tar.bz2; + md5 = "75ab86e08d925c7ab74d88999e2121e7"; + }; + }; + totem = { + name = "totem-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-2.26.0.tar.bz2; + md5 = "c4204177970911e46b555dd317c37611"; + }; + }; + totemplparser = { + name = "totem-pl-parser-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-pl-parser-2.26.0.tar.bz2; + md5 = "2514b1035a5c8a418580b59e0dcec7ca"; + }; + }; + vinagre = { + name = "vinagre-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vinagre-2.26.0.tar.bz2; + md5 = "6930bec2968c96dfb3407d6492ae42d4"; + }; + }; + vino = { + name = "vino-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vino-2.26.0.tar.bz2; + md5 = "7a10464824d8446411b90c162d34401e"; + }; + }; + vte = { + name = "vte-0.20.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vte-0.20.0.tar.bz2; + md5 = "12dde859bc98e039336baff6e9e6b15b"; + }; + }; + yelp = { + name = "yelp-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/yelp-2.26.0.tar.bz2; + md5 = "3413fd051c5ecbfe98819a8fb4ac83dd"; + }; + }; + zenity = { + name = "zenity-2.26.0"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/zenity-2.26.0.tar.bz2; + md5 = "6660ce6dac0a6ca495a0e954cb6b40a2"; + }; + }; +} diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix deleted file mode 100644 index 28c458ea7df..00000000000 --- a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix +++ /dev/null @@ -1,179 +0,0 @@ -# Note: this file was generated automatically by make-listing.sh! - -{fetchurl} : { - atk = { - name = "atk-1.12.4"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/atk-1.12.4.tar.bz2; - md5 = "0a2c6a7bbc380e3a3d94e9061f76a849"; - }; - }; - atspi = { - name = "at-spi-1.7.12"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/at-spi-1.7.12.tar.bz2; - md5 = "ca4e69bb28c409e25bbc10293fa34941"; - }; - }; - audiofile = { - name = "audiofile-0.2.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/audiofile-0.2.6.tar.bz2; - md5 = "3d01302834660850b6141cac1e6f5501"; - }; - }; - esound = { - name = "esound-0.2.36"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/esound-0.2.36.tar.bz2; - md5 = "3facb5aa0115cc1c31771b9ad454ae76"; - }; - }; - gail = { - name = "gail-1.9.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gail-1.9.3.tar.bz2; - md5 = "1e8825da60fd19833dfc6b2068f05ec9"; - }; - }; - GConf = { - name = "GConf-2.14.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/GConf-2.14.0.tar.bz2; - md5 = "d07c2efcaf477cf34225c604a04b6271"; - }; - }; - glib = { - name = "glib-2.12.9"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/glib-2.12.9.tar.bz2; - md5 = "b3f6a2a318610af6398b3445f1a2d6c6"; - }; - }; - gnomemimedata = { - name = "gnome-mime-data-2.4.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-mime-data-2.4.3.tar.bz2; - md5 = "2abe573a6e84b71c58a661d4bafa9bd6"; - }; - }; - gnomevfs = { - name = "gnome-vfs-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-2.16.3.tar.bz2; - md5 = "586d6fe3740385c000a864d5e2cf8215"; - }; - }; - gnomevfsmonikers = { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-monikers-2.15.3.tar.bz2; - md5 = "b16f0db0482263be3318e269f52bb5b6"; - }; - }; - gtk = { - name = "gtk+-2.10.9"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk+-2.10.9.tar.bz2; - md5 = "20d763198efb38263b22dee347f69da6"; - }; - }; - gtkdoc = { - name = "gtk-doc-1.7"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk-doc-1.7.tar.bz2; - md5 = "2543a3f5a7b5347fb135855ca55adea1"; - }; - }; - intltool = { - name = "intltool-0.35.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/intltool-0.35.0.tar.bz2; - md5 = "95c4bd2a91419083ee880a3f53f86edf"; - }; - }; - libart_lgpl = { - name = "libart_lgpl-2.3.17"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libart_lgpl-2.3.17.tar.bz2; - md5 = "dfca42529393c8a8f59dc4dc10675a46"; - }; - }; - libbonobo = { - name = "libbonobo-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonobo-2.16.0.tar.bz2; - md5 = "30cdcf2b5316888f10fea6362b38499c"; - }; - }; - libbonoboui = { - name = "libbonoboui-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonoboui-2.16.0.tar.bz2; - md5 = "603ffc92491ef27ccfbc2b69abd3906b"; - }; - }; - libglade = { - name = "libglade-2.6.2"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2; - md5 = "da4f9d1c6cd1337f6ef5e2db768d8557"; - }; - }; - libgnome = { - name = "libgnome-2.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnome-2.16.0.tar.bz2; - md5 = "b3f030f6c677b0e1bcfca7c7e58d6c4a"; - }; - }; - libgnomecanvas = { - name = "libgnomecanvas-2.14.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomecanvas-2.14.0.tar.bz2; - md5 = "516c46fb4a1401b05cfef58c350fbd3d"; - }; - }; - libgnomeui = { - name = "libgnomeui-2.16.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomeui-2.16.1.tar.bz2; - md5 = "d9b975952bf5feee8818d3fb18cca0b3"; - }; - }; - libIDL = { - name = "libIDL-0.8.7"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libIDL-0.8.7.tar.bz2; - md5 = "53a3874beb42ddfd9a5030047a0db740"; - }; - }; - libxml2 = { - name = "libxml2-2.6.27"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxml2-2.6.27.tar.bz2; - md5 = "3617f7dc07534025a4898f2b62fb46df"; - }; - }; - libxslt = { - name = "libxslt-1.1.20"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxslt-1.1.20.tar.bz2; - md5 = "aa0b4817c38104d9a724ee12b81e286e"; - }; - }; - ORBit2 = { - name = "ORBit2-2.14.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/ORBit2-2.14.5.tar.bz2; - md5 = "5b3ca3d7ed13a76c9e7bb4a890fe68af"; - }; - }; - pango = { - name = "pango-1.14.10"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/pango-1.14.10.tar.bz2; - md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06"; - }; - }; -} diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix deleted file mode 100644 index 0f83354b1e2..00000000000 --- a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix +++ /dev/null @@ -1,165 +0,0 @@ -# Note: this file was generated automatically by make-listing.pl! - -{fetchurl} : { - atk = { - name = "atk-1.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/atk-1.22.0.tar.bz2; - md5 = "06a2b39a22d5ca35c47435da6b9643ac"; - }; - }; - atspi = { - name = "at-spi-1.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/at-spi-1.22.1.tar.bz2; - md5 = "2ee1b35ef25e753e6bac840a418608f5"; - }; - }; - audiofile = { - name = "audiofile-0.2.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/audiofile-0.2.6.tar.bz2; - md5 = "3d01302834660850b6141cac1e6f5501"; - }; - }; - esound = { - name = "esound-0.2.38"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/esound-0.2.38.tar.bz2; - md5 = "1c48c100b450d617b58dacb59837d34f"; - }; - }; - gail = { - name = "gail-1.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gail-1.22.1.tar.bz2; - md5 = "521e2e1ae1dfe4699c037b1be205b0b3"; - }; - }; - GConf = { - name = "GConf-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/GConf-2.22.0.tar.bz2; - md5 = "a56c043afeb1052abaf45407409b0331"; - }; - }; - glib = { - name = "glib-2.16.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/glib-2.16.3.tar.bz2; - md5 = "195f9a803cc5279dbb39afdf985f44cb"; - }; - }; - gnomemimedata = { - name = "gnome-mime-data-2.18.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-mime-data-2.18.0.tar.bz2; - md5 = "541858188f80090d12a33b5a7c34d42c"; - }; - }; - gnomevfs = { - name = "gnome-vfs-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-2.22.0.tar.bz2; - md5 = "369105fd82cb99e69e63acab8f3b89b7"; - }; - }; - gnomevfsmonikers = { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-monikers-2.15.3.tar.bz2; - md5 = "b16f0db0482263be3318e269f52bb5b6"; - }; - }; - gtk = { - name = "gtk+-2.12.9"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk+-2.12.9.tar.bz2; - md5 = "33499772fdc3bea569c6d5673e5831b4"; - }; - }; - gtkdoc = { - name = "gtk-doc-1.9"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk-doc-1.9.tar.bz2; - md5 = "bcd002f381385812737a05538eb8b21e"; - }; - }; - intltool = { - name = "intltool-0.37.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/intltool-0.37.1.tar.bz2; - md5 = "860d392f04299c2740d0752501639c3b"; - }; - }; - libart_lgpl = { - name = "libart_lgpl-2.3.20"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libart_lgpl-2.3.20.tar.bz2; - md5 = "d0ce67f2ebcef1e51a83136c69242a73"; - }; - }; - libbonobo = { - name = "libbonobo-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonobo-2.22.0.tar.bz2; - md5 = "998a576ad26784ac87eab99e96013527"; - }; - }; - libbonoboui = { - name = "libbonoboui-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonoboui-2.22.0.tar.bz2; - md5 = "e4e4d74c9387d08c956574f981cf91f2"; - }; - }; - libglade = { - name = "libglade-2.6.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libglade-2.6.2.tar.bz2; - md5 = "da4f9d1c6cd1337f6ef5e2db768d8557"; - }; - }; - libgnome = { - name = "libgnome-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnome-2.22.0.tar.bz2; - md5 = "52db42762589826c66d27def66112807"; - }; - }; - libgnomecanvas = { - name = "libgnomecanvas-2.20.1.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomecanvas-2.20.1.1.tar.bz2; - md5 = "948ed771d2957d24a0c9a414e9581055"; - }; - }; - libgnomeui = { - name = "libgnomeui-2.22.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomeui-2.22.1.tar.bz2; - md5 = "5a60405f006e873ba7bc97ec9c8e4c5d"; - }; - }; - libIDL = { - name = "libIDL-0.8.10"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libIDL-0.8.10.tar.bz2; - md5 = "9e10a77ff225587e59c0a28c66b4faa7"; - }; - }; - ORBit2 = { - name = "ORBit2-2.14.12"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/ORBit2-2.14.12.tar.bz2; - md5 = "6f4bf7d803d442e9d093a0daa203d506"; - }; - }; - pango = { - name = "pango-1.20.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/pango-1.20.1.tar.bz2; - md5 = "376e6d94686b888fb70f24d191b84f82"; - }; - }; -} diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix b/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix new file mode 100644 index 00000000000..cf77ccf3119 --- /dev/null +++ b/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix @@ -0,0 +1,151 @@ +# Note: this file was generated automatically by make-listing.pl! + +{fetchurl} : { + atk = { + name = "atk-1.26.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/atk-1.26.0.tar.bz2; + md5 = "719229408019c548855673840679f156"; + }; + }; + atspi = { + name = "at-spi-1.26.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/at-spi-1.26.0.tar.bz2; + md5 = "3f2f7d29b45eff08adf56af0d31d3984"; + }; + }; + audiofile = { + name = "audiofile-0.2.6"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/audiofile-0.2.6.tar.bz2; + md5 = "3d01302834660850b6141cac1e6f5501"; + }; + }; + esound = { + name = "esound-0.2.41"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/esound-0.2.41.tar.bz2; + md5 = "8d9aad3d94d15e0d59ba9dc0ea990c6c"; + }; + }; + GConf = { + name = "GConf-2.26.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/GConf-2.26.0.tar.bz2; + md5 = "b010f0de356ea093c6a73778b13de956"; + }; + }; + glib = { + name = "glib-2.20.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/glib-2.20.0.tar.bz2; + md5 = "05188e560dbd8bddd568e24ce10dd003"; + }; + }; + gnomemimedata = { + name = "gnome-mime-data-2.18.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-mime-data-2.18.0.tar.bz2; + md5 = "541858188f80090d12a33b5a7c34d42c"; + }; + }; + gnomevfs = { + name = "gnome-vfs-2.24.1"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-2.24.1.tar.bz2; + md5 = "100f9af16dc659e375ee8da45175a28d"; + }; + }; + gnomevfsmonikers = { + name = "gnome-vfs-monikers-2.15.3"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-monikers-2.15.3.tar.bz2; + md5 = "b16f0db0482263be3318e269f52bb5b6"; + }; + }; + gtk = { + name = "gtk+-2.16.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk+-2.16.0.tar.bz2; + md5 = "139528802794287427fd4d18875b5cf5"; + }; + }; + gtkdoc = { + name = "gtk-doc-1.11"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk-doc-1.11.tar.bz2; + md5 = "b5e268c71fa90aad890cf53715664d0a"; + }; + }; + libart_lgpl = { + name = "libart_lgpl-2.3.20"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libart_lgpl-2.3.20.tar.bz2; + md5 = "d0ce67f2ebcef1e51a83136c69242a73"; + }; + }; + libbonobo = { + name = "libbonobo-2.24.1"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonobo-2.24.1.tar.bz2; + md5 = "8868b6083392964a6969547ceb8d7cd1"; + }; + }; + libbonoboui = { + name = "libbonoboui-2.24.1"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonoboui-2.24.1.tar.bz2; + md5 = "9ff3ec1c7aefd0b1a15a5b21ecc7b4e4"; + }; + }; + libglade = { + name = "libglade-2.6.4"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libglade-2.6.4.tar.bz2; + md5 = "d1776b40f4e166b5e9c107f1c8fe4139"; + }; + }; + libgnome = { + name = "libgnome-2.26.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnome-2.26.0.tar.bz2; + md5 = "a5634fe9ddc54bbb726cbaaa35abc0b9"; + }; + }; + libgnomecanvas = { + name = "libgnomecanvas-2.26.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomecanvas-2.26.0.tar.bz2; + md5 = "9bbc635e5ae70e63af071af74ba7e72f"; + }; + }; + libgnomeui = { + name = "libgnomeui-2.24.1"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomeui-2.24.1.tar.bz2; + md5 = "8e7d36dd1decfcf5cc4d5cb93bc4d217"; + }; + }; + libIDL = { + name = "libIDL-0.8.13"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libIDL-0.8.13.tar.bz2; + md5 = "b43b289a859eb38a710f70622c46e571"; + }; + }; + ORBit2 = { + name = "ORBit2-2.14.17"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/ORBit2-2.14.17.tar.bz2; + md5 = "10bfb957fa4a8935a0b4afaee7d71df7"; + }; + }; + pango = { + name = "pango-1.24.0"; + src = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/pango-1.24.0.tar.bz2; + md5 = "d209f41079833cd2ef2c5e580ab9c5ee"; + }; + }; +} diff --git a/pkgs/desktops/gnome/vte.nix b/pkgs/desktops/gnome/vte.nix deleted file mode 100644 index dc79027e84e..00000000000 --- a/pkgs/desktops/gnome/vte.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, ncurses, python, gettext -}: - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext - ]; - - propagatedBuildInputs = [ncurses]; -} diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix index 86a85ab042b..984e72c8d7b 100644 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ b/pkgs/desktops/kde-3/kdelibs/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation { sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; }; + patches = [ + # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. + # Adapted from Gentoo. + ./inotify.patch + ]; + passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;}; buildInputs = [ diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch new file mode 100644 index 00000000000..3d0b470811a --- /dev/null +++ b/pkgs/desktops/kde-3/kdelibs/inotify.patch @@ -0,0 +1,30 @@ +diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp +*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 +--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 +*************** +*** 64,74 **** + // debug + #include + +! #ifdef HAVE_INOTIFY + #include + #include + #include +- #include + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H + #include +--- 64,76 ---- + // debug + #include + +! #if 1 +! #include +! #include +! #elif HAVE_INOTIFY + #include + #include + #include + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H + #include diff --git a/pkgs/desktops/kde-4.2/support/strigi/default.nix b/pkgs/desktops/kde-4.2/support/strigi/default.nix index 85d7099d8a4..1e50dad9e16 100644 --- a/pkgs/desktops/kde-4.2/support/strigi/default.nix +++ b/pkgs/desktops/kde-4.2/support/strigi/default.nix @@ -1,13 +1,23 @@ -{stdenv, fetchurl, cmake, perl, -bzip2, qt4, libxml2, exiv2, fam, log4cxx, cluceneCore}: +{ stdenv, fetchurl, cmake, perl, bzip2, qt4, libxml2, exiv2, fam +, log4cxx, cluceneCore +}: stdenv.mkDerivation { name = "strigi-0.6.4"; + src = fetchurl { url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2; md5 = "324fd9606ac77765501717ff92c04f9a"; }; - CLUCENE_HOME=cluceneCore; - buildInputs = [ cmake perl - bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam log4cxx cluceneCore ]; + + CLUCENE_HOME = cluceneCore; + + buildInputs = [ + cmake perl bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam /* log4cxx */ cluceneCore + ]; + + meta = { + homepage = http://strigi.sourceforge.net/; + description = "A very fast and efficient crawler to index data on your harddrive"; + }; } diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix new file mode 100644 index 00000000000..814d4629157 --- /dev/null +++ b/pkgs/desktops/kde/kdebase/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl +, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib +}: + +# Note: the glib dependency is needed for nspluginviewer. + +let version = "3.5.10"; in + +stdenv.mkDerivation { + name = "kdebase-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2"; + sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp"; + }; + + buildInputs = [ + pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2 + fontconfig pam hal dbus glib + xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp + xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf + xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc + xlibs.scrnsaverproto xlibs.libXScrnSaver + xlibs.libXcomposite xlibs.libXfixes + ]; + + configureFlags = '' + --without-arts + --with-ssl-dir=${openssl} + --with-extra-includes=${libjpeg}/include + ''; + + # Prevent configure from looking for pkg-config and freetype-config + # in the wrong location (it looks in /usr/bin etc. *before* looking + # in $PATH). + preConfigure = '' + substituteInPlace configure \ + --replace /usr/bin /no-such-path \ + --replace /usr/local/bin /no-such-path \ + --replace /opt/local/bin /no-such-path + ''; + + # Quick hack to work around a faulty dependency in + # konqueror/keditbookmarks/Makefile.am (${includedir} should be + # ${kdelibs} or so). + preBuild = '' + ensureDir $out/include + ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/ + ''; + + postInstall = "rm $out/include/kbookmarknotifier.h"; + + # Work around some inexplicable build failure starting in kdebase 3.5.9. + LDFLAGS = "-L${kdelibs}/lib"; +} diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix new file mode 100644 index 00000000000..86a85ab042b --- /dev/null +++ b/pkgs/desktops/kde/kdelibs/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre +, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat +, freetype, bzip2, cups, attr, acl +}: + +let version = "3.5.10"; in + +stdenv.mkDerivation { + name = "kdelibs-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; + sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; + }; + + passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;}; + + buildInputs = [ + zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 + libxslt expat libtool freetype bzip2 cups + xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft + ]; + + propagatedBuildInputs = [attr acl]; + + # Prevent configure from looking for pkg-config and freetype-config + # in the wrong location (it looks in /usr/bin etc. *before* looking + # in $PATH). + preConfigure = '' + substituteInPlace configure \ + --replace /usr/bin /no-such-path \ + --replace /usr/local/bin /no-such-path \ + --replace /opt/local/bin /no-such-path + ''; + + configureFlags = '' + --without-arts + --with-ssl-dir=${openssl} + --with-extra-includes=${libjpeg}/include + --x-includes=${xlibs.libX11}/include + --x-libraries=${xlibs.libX11}/lib + ''; +} diff --git a/pkgs/desktops/superkaramba/builder.sh b/pkgs/desktops/superkaramba/builder.sh index ef9d4f348d8..83332db6fd2 100755 --- a/pkgs/desktops/superkaramba/builder.sh +++ b/pkgs/desktops/superkaramba/builder.sh @@ -3,7 +3,6 @@ source $stdenv/setup echo $xlibs2 echo $x_libraries_env -postConfigure=postConfigure postConfigure() { pwd; ls -l super*/src/Makefile; diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc-2.95/builder.sh index cf12872f1c3..5244d986da0 100644 --- a/pkgs/development/compilers/gcc-2.95/builder.sh +++ b/pkgs/development/compilers/gcc-2.95/builder.sh @@ -47,7 +47,6 @@ else fi -preConfigure=preConfigure preConfigure() { # Determine the frontends to build. diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh index e72849cdcce..5b80215cffb 100644 --- a/pkgs/development/compilers/gcc-3.3/builder.sh +++ b/pkgs/development/compilers/gcc-3.3/builder.sh @@ -26,7 +26,7 @@ EOF if test -n "$langCC"; then langs="$langs,c++" fi - if test -n "$langF77"; then + if test -n "$langFortran"; then langs="$langs,f77" fi @@ -38,8 +38,6 @@ EOF configureFlags="--enable-languages=$langs" } -preConfigure=preConfigure - postConfigure() { if test "$noSysDirs" = "1"; then @@ -82,8 +80,6 @@ postConfigure() { fi } -postConfigure=postConfigure - buildFlags="bootstrap" diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix index fc5d7a9bb97..9aa9e27ac6f 100644 --- a/pkgs/development/compilers/gcc-3.3/default.nix +++ b/pkgs/development/compilers/gcc-3.3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langFortran ? false }: assert langC; @@ -8,10 +8,19 @@ assert langC; stdenv.mkDerivation { name = "gcc-3.3.6"; + builder = ./builder.sh; + src = fetchurl { url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; md5 = "6936616a967da5a0b46f1e7424a06414"; }; - inherit noSysDirs langC langCC langF77; + + inherit noSysDirs langC langCC langFortran; + + meta = { + homepage = "http://gcc.gnu.org/"; + license = "GPL/LGPL"; + description = "GNU Compiler Collection, 3.3.x"; + }; } diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh index eb1f211dce8..5a43d600a50 100644 --- a/pkgs/development/compilers/gcc-3.4/builder.sh +++ b/pkgs/development/compilers/gcc-3.4/builder.sh @@ -35,7 +35,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -44,7 +43,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh index 5df3168027f..08622c1899e 100644 --- a/pkgs/development/compilers/gcc-4.0/builder.sh +++ b/pkgs/development/compilers/gcc-4.0/builder.sh @@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -63,7 +62,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix index e25145cb623..45c5bedd99b 100644 --- a/pkgs/development/compilers/gcc-4.0/default.nix +++ b/pkgs/development/compilers/gcc-4.0/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langFortran ? false , profiledCompiler ? false , gmp ? null , mpfr ? null , texinfo ? null +, name ? "gcc" }: assert langC; @@ -10,8 +11,10 @@ assert langC; with import ../../../lib; stdenv.mkDerivation { - name = "gcc-4.0.4"; + name = "${name}-4.0.4"; + builder = ./builder.sh; + src = fetchurl { url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.0.4/gcc-4.0.4.tar.bz2; sha256 = "0izwr8d69ld3a1yr8z94s7y7k861wi613mplys2c0bvdr58y1zgk"; @@ -20,7 +23,7 @@ stdenv.mkDerivation { patches = optional noSysDirs [./no-sys-dirs.patch]; - inherit noSysDirs langC langCC langF77 profiledCompiler; + inherit noSysDirs langC langCC langFortran profiledCompiler; buildInputs = [gmp mpfr texinfo]; @@ -31,9 +34,9 @@ stdenv.mkDerivation { --with-system-zlib --enable-languages=${ concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langF77 "f95" + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "f95" ) ) } diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh index c17d0403702..f8abca12257 100644 --- a/pkgs/development/compilers/gcc-4.1/builder.sh +++ b/pkgs/development/compilers/gcc-4.1/builder.sh @@ -50,7 +50,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -59,7 +58,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index 3034bd5da8f..c11c76acc89 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langFortran ? false , profiledCompiler ? false , staticCompiler ? false , gmp ? null , mpfr ? null , texinfo ? null +, name ? "gcc" }: -assert langC || langF77; +assert langC || langFortran; with import ../../../lib; stdenv.mkDerivation { - name = "gcc-4.1.2"; - builder = if langF77 then ./fortran.sh else ./builder.sh; + name = "${name}-4.1.2"; + + builder = ./builder.sh; src = optional /*langC*/ true (fetchurl { @@ -24,7 +26,7 @@ stdenv.mkDerivation { url = mirror://gnu/gcc/gcc-4.1.2/gcc-g++-4.1.2.tar.bz2; sha256 = "1qm2izcxna10jai0v4s41myki0xkw9174qpl6k1rnrqhbx0sl1hc"; }) ++ - optional langF77 (fetchurl { + optional langFortran (fetchurl { url = mirror://gnu/gcc/gcc-4.1.2/gcc-fortran-4.1.2.tar.bz2; sha256 = "0772dhmm4gc10420h0d0mfkk2sirvjmjxz8j0ywm8wp5qf8vdi9z"; }); @@ -42,9 +44,9 @@ stdenv.mkDerivation { --with-system-zlib --enable-languages=${ concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langF77 "fortran" + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" ) ) } @@ -53,7 +55,7 @@ stdenv.mkDerivation { makeFlags = if staticCompiler then "LDFLAGS=-static" else ""; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langFortran; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc-4.1/fortran.sh b/pkgs/development/compilers/gcc-4.1/fortran.sh deleted file mode 100644 index 962e8d37238..00000000000 --- a/pkgs/development/compilers/gcc-4.1/fortran.sh +++ /dev/null @@ -1,86 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - -export X_CFLAGS="-I${gmp}/include -I${mpfr}/include -L${gmp}/lib -L${mpfr}/lib"; - -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraCFlags="-g0 $extraCFlags" - extraLDFlags="--strip-debug $extraLDFlags" - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - - makeFlagsArray=( \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - LIMITS_H_TEST=true \ - X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - ) -fi - - -preConfigure=preConfigure -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall=postInstall -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root -} - - -if test -z "$staticCompiler"; then - if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" - else - buildFlags="profiledbootstrap $buildFlags" - fi -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc-4.2/builder.sh b/pkgs/development/compilers/gcc-4.2/builder.sh index ee11e974a40..d749fc08d2a 100644 --- a/pkgs/development/compilers/gcc-4.2/builder.sh +++ b/pkgs/development/compilers/gcc-4.2/builder.sh @@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -60,7 +59,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc-4.2/default.nix index 1ed4dd5058a..68a174cc579 100644 --- a/pkgs/development/compilers/gcc-4.2/default.nix +++ b/pkgs/development/compilers/gcc-4.2/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langFortran ? false , profiledCompiler ? false , staticCompiler ? false +, gmp ? null +, mpfr ? null , texinfo ? null +, name ? "gcc" }: -assert langC; - -with import ../../../lib; +with stdenv.lib; let version = "4.2.4"; in stdenv.mkDerivation { - name = "gcc-${version}"; + name = "${name}-${version}"; + builder = ./builder.sh; src = @@ -24,7 +26,7 @@ stdenv.mkDerivation { url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; sha256 = "0gq8ikci0qqgck71qqlhfld6zkwn9179x6z15vdd9blkdig55nxg"; }) ++ - optional langF77 (fetchurl { + optional langFortran (fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg"; }); @@ -35,7 +37,7 @@ stdenv.mkDerivation { inherit noSysDirs profiledCompiler staticCompiler; - buildInputs = [texinfo]; + buildInputs = [gmp mpfr texinfo]; configureFlags = " --disable-multilib @@ -43,9 +45,9 @@ stdenv.mkDerivation { --with-system-zlib --enable-languages=${ concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langF77 "f77" + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" ) ) } @@ -54,7 +56,7 @@ stdenv.mkDerivation { NIX_EXTRA_LDFLAGS = if staticCompiler then "-static" else ""; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langFortran; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc-4.2/fortran.nix b/pkgs/development/compilers/gcc-4.2/fortran.nix deleted file mode 100644 index c4b3d8e445d..00000000000 --- a/pkgs/development/compilers/gcc-4.2/fortran.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false -, profiledCompiler ? false -, staticCompiler ? false -, gmp ? null -, mpfr ? null -, texinfo ? null -}: - -assert langC || langF77; - -with import ../../../lib; - -let version = "4.2.4"; in - -stdenv.mkDerivation { - name = "gcc-${version}"; - builder = if langF77 then ./fortran.sh else ./builder.sh; - - src = - optional /*langC*/ true (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "cfc9e7e14966097d24d510cfd905515e8f7464ab5379a50698ae3d88e1f7a532"; - }) ++ - optional langCC (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0spzz549fifwv02ym33azzwizl0zkq5m1fgy88ccmcyzmwpgyzfq"; - }) ++ - optional langF77 (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "6fc2056cd62921b2859381749710af765a46877bd46f9fe5ef6fab0671c47e04"; - }); - - patches = - optional noSysDirs [./no-sys-dirs.patch]; - - inherit noSysDirs profiledCompiler staticCompiler; - - buildInputs = [gmp mpfr texinfo]; - - configureFlags = " - --disable-multilib - --disable-libstdcxx-pch - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langF77 "fortran" - ) - ) - } - ${if stdenv.isi686 then "--with-arch=i686" else ""} - ${if gmp != null then "--with-gmp=${gmp}" else ""} - ${if mpfr != null then "--with-mpfr=${mpfr}" else ""} - "; - - makeFlags = if staticCompiler then "LDFLAGS=-static" else ""; - - passthru = { inherit langC langCC langF77; }; - - postInstall = "if test -f $out/bin/gfrotran; then ln -s $out/bin/gfortran $out/bin/g77; fi"; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 4.2.x"; - - # Give the real GCC a lower priority than the GCC wrapper so that - # both can be installed at the same time. - priority = "7"; - }; -} diff --git a/pkgs/development/compilers/gcc-4.2/fortran.sh b/pkgs/development/compilers/gcc-4.2/fortran.sh deleted file mode 100644 index 962e8d37238..00000000000 --- a/pkgs/development/compilers/gcc-4.2/fortran.sh +++ /dev/null @@ -1,86 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - -export X_CFLAGS="-I${gmp}/include -I${mpfr}/include -L${gmp}/lib -L${mpfr}/lib"; - -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraCFlags="-g0 $extraCFlags" - extraLDFlags="--strip-debug $extraLDFlags" - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - - makeFlagsArray=( \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - LIMITS_H_TEST=true \ - X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - ) -fi - - -preConfigure=preConfigure -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall=postInstall -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root -} - - -if test -z "$staticCompiler"; then - if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" - else - buildFlags="profiledbootstrap $buildFlags" - fi -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc-4.3/builder.sh b/pkgs/development/compilers/gcc-4.3/builder.sh index a6bbbd7a052..2bc011e3e6e 100644 --- a/pkgs/development/compilers/gcc-4.3/builder.sh +++ b/pkgs/development/compilers/gcc-4.3/builder.sh @@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -60,7 +59,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix index 09d7ff7a807..df4aca0bf55 100644 --- a/pkgs/development/compilers/gcc-4.3/default.nix +++ b/pkgs/development/compilers/gcc-4.3/default.nix @@ -6,31 +6,32 @@ , gmp, mpfr , bison ? null, flex ? null , enableMultilib ? false +, name ? "gcc" }: -assert langC; assert langTreelang -> bison != null && flex != null; -with import ../../../lib; +with stdenv.lib; -let version = "4.3.1"; in +let version = "4.3.3"; in stdenv.mkDerivation { - name = "gcc-${version}"; + name = "${name}-${version}"; + builder = ./builder.sh; src = optional /*langC*/ true (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "18spk152j1vqa9bzhi93i7cgrmf7gncv0h1lm1mxxgn1ahrnnw67"; + url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; + sha256 = "08yksvipnqmqbmif30rwjkg3y0m6ray5r84wa2argv8q0bpz9426"; }) ++ optional langCC (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0r74s60hylr8xrnb2j3x0dmf3cnxxg609g4h07r6ida8vk33bd25"; + url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; + sha256 = "12z2zh03yq214qs2cqzh8c64jjfz544nk1lzi9rygjwm8yjsvzm9"; }) ++ optional langFortran (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "1fl76sajlz1ihnsmqsbs3i8g0h77w9hm35pwb1s2w6p4h5xy5dnb"; + url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; + sha256 = "1b2wbysviyh7l9fqbd6zy5y6y89xgysy99gr8wx8xkc1hy2nwdsq"; }); patches = diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh index 8485b6efec0..a10813e5e33 100644 --- a/pkgs/development/compilers/gcc-apple/builder.sh +++ b/pkgs/development/compilers/gcc-apple/builder.sh @@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Determine the frontends to build. @@ -72,7 +71,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc-upc-4.0/builder.sh b/pkgs/development/compilers/gcc-upc-4.0/builder.sh index 5df3168027f..08622c1899e 100644 --- a/pkgs/development/compilers/gcc-upc-4.0/builder.sh +++ b/pkgs/development/compilers/gcc-upc-4.0/builder.sh @@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -63,7 +62,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/ghc/setup-hook.sh b/pkgs/development/compilers/ghc/setup-hook.sh new file mode 100644 index 00000000000..11ad50a0c79 --- /dev/null +++ b/pkgs/development/compilers/ghc/setup-hook.sh @@ -0,0 +1,17 @@ +# Create isolated package config +packages_db=$TMPDIR/.package.conf +cp @ghc@/lib/ghc-*/package.conf $packages_db +chmod u+w $packages_db + +export GHC_PACKAGE_PATH=$packages_db + +# Env hook to add packages to the package config +addLibToPackageConf () { + local fn + shopt -s nullglob + for fn in $1/lib/ghc-pkgs/ghc-@ghcVersion@/*.conf; do + @ghc@/bin/ghc-pkg register --force $fn + done +} + +envHooks=(${envHooks[@]} addLibToPackageConf) diff --git a/pkgs/development/compilers/llvm/builder.sh b/pkgs/development/compilers/llvm/builder.sh index 962e8d37238..fd44f6bf6a3 100644 --- a/pkgs/development/compilers/llvm/builder.sh +++ b/pkgs/development/compilers/llvm/builder.sh @@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then fi -preConfigure=preConfigure preConfigure() { # Perform the build in a different directory. mkdir ../build @@ -60,7 +59,6 @@ preConfigure() { } -postInstall=postInstall postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/strategoxt/0.16.nix b/pkgs/development/compilers/strategoxt/0.16.nix index 5795787c06a..4cfa2c79892 100644 --- a/pkgs/development/compilers/strategoxt/0.16.nix +++ b/pkgs/development/compilers/strategoxt/0.16.nix @@ -20,8 +20,6 @@ rec { --replace getopt ${getopt}/bin/getopt ''; - configureFlags = "--disable-static"; - meta = { homepage = http://www.program-transformation.org/Sdf/SdfBundle; meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; @@ -39,8 +37,6 @@ rec { buildInputs = [pkgconfig aterm sdf getopt]; - configureFlags = "--disable-static"; - meta = { homepage = http://strategoxt.org/; meta = "A language and toolset for program transformation"; diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix index 7f6b18484f4..b10b1aca225 100644 --- a/pkgs/development/compilers/strategoxt/0.17.nix +++ b/pkgs/development/compilers/strategoxt/0.17.nix @@ -20,8 +20,6 @@ rec { --replace getopt ${getopt}/bin/getopt ''; - configureFlags = "--disable-static"; - meta = { homepage = http://www.program-transformation.org/Sdf/SdfBundle; meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser"; @@ -39,8 +37,6 @@ rec { buildInputs = [pkgconfig aterm sdf getopt]; - configureFlags = "--disable-static"; - meta = { homepage = http://strategoxt.org/; meta = "A language and toolset for program transformation"; @@ -60,7 +56,7 @@ rec { # !!! The explicit `--with-strategoxt' is necessary; otherwise we # get an XTC registration that refers to "/share/strategoxt/XTC". - configureFlags = "--disable-static --enable-xtc --with-strategoxt=${strategoxt}"; + configureFlags = "--enable-xtc --with-strategoxt=${strategoxt}"; meta = { homepage = http://strategoxt.org/Stratego/JavaFront; @@ -79,8 +75,6 @@ rec { buildInputs = [jdk pkgconfig aterm sdf strategoxt javafront]; - configureFlags = "--disable-static"; - meta = { homepage = http://strategoxt.org/Stratego/TheDryad; meta = "A collection of tools for developing transformation systems for Java source and bytecode"; diff --git a/pkgs/development/interpreters/maude/unstable.nix b/pkgs/development/interpreters/maude/unstable.nix new file mode 100644 index 00000000000..8e351a7954b --- /dev/null +++ b/pkgs/development/interpreters/maude/unstable.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp }: + +stdenv.mkDerivation rec { + name = "maude-2.4-alpha-91c"; + meta = { + homepage = "http://maude.cs.uiuc.edu/"; + description = "Maude -- a high-level specification language"; + license = "GPLv2"; + }; + src = fetchurl { + url = "http://www.csl.sri.com/users/eker/Maude/Alpha91c/Maude-2.4.tar.gz"; + sha256 = "0z25rrmg1b317xba2aqir5719js2ig3k20n1pvq3qvlzg51b6wp1"; + }; + fullMaude = fetchurl { + url = "http://www.lcc.uma.es/~duran/FullMaude/FM23j/full-maude.maude"; + sha256 = "1x25ckfh1dzn8pg5spzj7f23bkz0favybnaxww8qs29r3lsrl1ib"; + }; + docs = fetchurl { + url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2"; + sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d"; + }; + buildInputs = [flex bison ncurses buddy tecla gmp libsigsegv]; + configurePhase = ''./configure --disable-dependency-tracking --prefix=$out TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; + doCheck = true; + postInstall = + '' + ensureDir $out/share/maude + cp src/Main/*.maude $out/share/maude/ + cp ${fullMaude} $out/share/maude/full-maude.maude + + ensureDir $out/share/doc/maude + tar xf ${docs} + rm -f maude-2.3.0-extras/full-maude.maude + mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf + mv maude-2.3.0-extras/* $out/share/doc/maude/ + ''; +} diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ae75e222c09..6747ef9565b 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,7 +1,4 @@ -{stdenv, fetchurl, g77, readline, ncurses, perl, flex, texinfo, qhull}: - -assert readline != null && ncurses != null && flex != null; -assert g77.langF77; +{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull}: stdenv.mkDerivation { name = "octave-3.0.4"; @@ -9,6 +6,6 @@ stdenv.mkDerivation { url = ftp://ftp.octave.org/pub/octave/octave-3.0.4.tar.bz2; sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj"; }; - buildInputs = [g77 readline ncurses perl flex texinfo qhull]; - configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; + buildInputs = [gfortran readline ncurses perl flex texinfo qhull]; + configureFlags = "--enable-readline --enable-dl"; } diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f4ecde662aa..a1c6af84e2b 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -1,14 +1,11 @@ -{stdenv, fetchurl, g77, readline, ncurses, perl, flex, +{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: -assert readline != null && ncurses != null && flex != null; -assert g77.langF77; - -let commonBuildInputs = [g77 readline ncurses perl glibc qhull libX11 texinfo]; in +let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in stdenv.mkDerivation ({ NIX_LDFLAGS = "-lpthread"; - configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; + configureFlags = "--enable-readline --enable-dl"; meta = { description = "High-level interactive language for numerical computations"; homepage = http://www.octave.org; diff --git a/pkgs/development/interpreters/perl-5.10/builder.sh b/pkgs/development/interpreters/perl-5.10/builder.sh deleted file mode 100644 index 8e008cb4c63..00000000000 --- a/pkgs/development/interpreters/perl-5.10/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -source $stdenv/setup - -if test "$NIX_ENFORCE_PURITY" = "1"; then - GLIBC=$(cat $NIX_GCC/nix-support/orig-libc) - extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" -fi - -configureScript=./Configure -configureFlags="-de -Dcc=gcc -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3 -Uinstallusrbinperl $extraflags" -dontAddPrefix=1 - -preBuild=preBuild -preBuild() { - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" -} - -postInstall=postInstall -postInstall() { - ensureDir "$out/nix-support" - cp $setupHook $out/nix-support/setup-hook -} - -genericBuild diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix index cb479c97be2..2acae30889e 100644 --- a/pkgs/development/interpreters/perl-5.10/default.nix +++ b/pkgs/development/interpreters/perl-5.10/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation { name = "perl-5.10.0"; - builder = ./builder.sh; src = fetchurl { url = mirror://cpan/src/perl-5.10.0.tar.gz; sha256 = "0bivbz15x02m02gqs6hs77cgjr2msfrhnvp5xqk359jg6w6llill"; @@ -19,5 +18,34 @@ stdenv.mkDerivation { ./no-sys-dirs.patch ]; + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + configureFlags = '' + -de -Dcc=gcc -Uinstallusrbinperl -Dinstallstyle=lib/perl5 -Duseshrplib + ${if stdenv ? glibc then "-Dusethreads" else ""} + ''; + + configureScript = "./Configure"; + + dontAddPrefix = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + if test "$NIX_ENFORCE_PURITY" = "1"; then + GLIBC=$(cat $NIX_GCC/nix-support/orig-libc) + configureFlags="$configureFlags -Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" + fi + ''; + + preBuild = + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/interpreters/perl-5.10/setup-hook.sh b/pkgs/development/interpreters/perl-5.10/setup-hook.sh index 70ce2cf8b46..6a144a7f780 100644 --- a/pkgs/development/interpreters/perl-5.10/setup-hook.sh +++ b/pkgs/development/interpreters/perl-5.10/setup-hook.sh @@ -1,5 +1,5 @@ addPerlLibPath () { - addToSearchPath PERL5LIB /lib/site_perl "" $1 + addToSearchPath PERL5LIB $1/lib/perl5/site_perl } envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/development/interpreters/perl-5.8/builder.sh b/pkgs/development/interpreters/perl-5.8/builder.sh index c393cb0560b..79458b3249b 100644 --- a/pkgs/development/interpreters/perl-5.8/builder.sh +++ b/pkgs/development/interpreters/perl-5.8/builder.sh @@ -9,13 +9,11 @@ configureScript=./Configure configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags" dontAddPrefix=1 -preBuild=preBuild preBuild() { # Make Cwd work on NixOS (where we don't have a /bin/pwd). substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" } -postInstall=postInstall postInstall() { ensureDir "$out/nix-support" cp $setupHook $out/nix-support/setup-hook diff --git a/pkgs/development/interpreters/perl-5.8/setup-hook.sh b/pkgs/development/interpreters/perl-5.8/setup-hook.sh index 70ce2cf8b46..d61ec82f4f0 100644 --- a/pkgs/development/interpreters/perl-5.8/setup-hook.sh +++ b/pkgs/development/interpreters/perl-5.8/setup-hook.sh @@ -1,5 +1,5 @@ addPerlLibPath () { - addToSearchPath PERL5LIB /lib/site_perl "" $1 + addToSearchPath PERL5LIB $1/lib/site_perl } envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix index 954cea1a4d4..5270cea8849 100644 --- a/pkgs/development/interpreters/php_configurable/default.nix +++ b/pkgs/development/interpreters/php_configurable/default.nix @@ -112,7 +112,7 @@ composableDerivation {} ( fixed : { apxs2Support = true; bcmathSupport = true; socketsSupport = true; - curlSupport = true; + curlSupport = false; gettextSupport = true; postgresqlSupport = true; zlibSupport = true; diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix index 1287c1e5946..1da3b52b84f 100644 --- a/pkgs/development/interpreters/python-new/2.5/default.nix +++ b/pkgs/development/interpreters/python-new/2.5/default.nix @@ -543,7 +543,6 @@ in sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure mkdir -p $out/bin export DESTDIR="$out" - shopt -s nullglob ''; src = fetchurl { url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2; diff --git a/pkgs/development/interpreters/python/2.4/default.nix b/pkgs/development/interpreters/python/2.4/default.nix index 726d2ac4aa9..e64d0442d3f 100644 --- a/pkgs/development/interpreters/python/2.4/default.nix +++ b/pkgs/development/interpreters/python/2.4/default.nix @@ -32,18 +32,18 @@ stdenv.mkDerivation { configureFlags = "--enable-shared"; - preConfigure = " + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - "; + ''; + + setupHook = ./setup-hook.sh; - postInstall = " - ensureDir $out/nix-support - cp ${./setup-hook.sh} $out/nix-support/setup-hook + postInstall = '' rm -rf $out/lib/python2.4/test - "; + ''; passthru = { inherit zlibSupport; diff --git a/pkgs/development/interpreters/python/2.4/setup-hook.sh b/pkgs/development/interpreters/python/2.4/setup-hook.sh index 58b8d1cab76..8334fbc21a8 100644 --- a/pkgs/development/interpreters/python/2.4/setup-hook.sh +++ b/pkgs/development/interpreters/python/2.4/setup-hook.sh @@ -1,5 +1,5 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.4/site-packages "" $1 + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.4/site-packages } toPythonPath() { diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 7b009bbe0c0..a9e63557524 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -53,20 +53,20 @@ stdenv.mkDerivation { configureFlags = "--enable-shared --with-wctype-functions"; - preConfigure = " + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - " + (if readline != null then '' + '' + (if readline != null then '' export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" '' else ""); + + setupHook = ./setup-hook.sh; - postInstall = " - ensureDir $out/nix-support - cp ${./setup-hook.sh} $out/nix-support/setup-hook + postInstall = '' rm -rf $out/lib/python2.5/test - "; + ''; passthru = { inherit zlibSupport; diff --git a/pkgs/development/interpreters/python/2.5/setup-hook.sh b/pkgs/development/interpreters/python/2.5/setup-hook.sh index a11f8cbb484..ffcb862a3de 100644 --- a/pkgs/development/interpreters/python/2.5/setup-hook.sh +++ b/pkgs/development/interpreters/python/2.5/setup-hook.sh @@ -1,5 +1,5 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.5/site-packages "" $1 + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.5/site-packages } toPythonPath() { diff --git a/pkgs/development/interpreters/tcl/builder.sh b/pkgs/development/interpreters/tcl/builder.sh deleted file mode 100644 index 24d4853de5d..00000000000 --- a/pkgs/development/interpreters/tcl/builder.sh +++ /dev/null @@ -1,16 +0,0 @@ -source $stdenv/setup - -preConfigure() { - cd unix -} - -preConfigure=preConfigure - -postInstall() { - make install-private-headers - ln -s $out/bin/tclsh8.4 $out/bin/tclsh -} - -postInstall=postInstall - -genericBuild diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix index 5f9a4f9f90f..7cc58b92145 100644 --- a/pkgs/development/interpreters/tcl/default.nix +++ b/pkgs/development/interpreters/tcl/default.nix @@ -2,11 +2,19 @@ stdenv.mkDerivation { name = "tcl-8.4.18"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz; sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny"; }; + + preConfigure = "cd unix"; + + postInstall = '' + make install-private-headers + ln -s $out/bin/tclsh8.4 $out/bin/tclsh + ''; + meta = { description = "The Tcl scription language"; homepage = http://www.tcl.tk/; diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index bbe01704175..afd640b625d 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -1,13 +1,11 @@ source $stdenv/setup -configurePhase=configurePhase configurePhase() { cd lib/Xaw3d (mkdir X11 && cd X11 && ln -fs .. Xaw3d) xmkmf } -buildPhase=buildPhase buildPhase() { make depend $makeFlags make $makeFlags @@ -23,4 +21,4 @@ installPhase() { makeFlags="CDEBUGFLAGS=" # !!! awful hack -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 8fb0d4c527d..82fef49cfc1 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; }; - configureFlags = "--enable-shared --disable-static"; - NIX_CFLAGS_COMPILE = "-fpic"; meta = { diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 81e2c77ee96..06dd8cb2fb9 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -13,4 +13,9 @@ stdenv.mkDerivation { configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk"; installTargets = "install install-lib install-dev"; + + meta = { + homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/; + description = "Library and tools for manipulating access control lists"; + }; } diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix index 32b39711944..d895724f691 100644 --- a/pkgs/development/libraries/arts/default.nix +++ b/pkgs/development/libraries/arts/default.nix @@ -3,20 +3,25 @@ stdenv.mkDerivation { name = "arts-1.5.10"; + src = fetchurl { + url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; + sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj"; + }; + KDEDIR = kdelibs; - configureFlags = " + + configureFlags = '' --with-extra-includes=${libjpeg}/include --with-extra-libs=${libjpeg}/lib --x-includes=${libX11}/include - --x-libraries=${libX11}/lib"; - - src = fetchurl { - url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; - md5 = "6da172aab2a4a44929b5fdfc30fa3efc"; - }; + --x-libraries=${libX11}/lib + --disable-dependency-tracking + --enable-final + ''; buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt]; + meta = { + homepage = http://www.arts-project.org/; + }; } - - diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index baa95da785b..5ac6fce7096 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "aspell-0.60.5"; +stdenv.mkDerivation rec { + name = "aspell-0.60.6"; src = fetchurl { - url = ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.5.tar.gz; - md5 = "17fd8acac6293336bcef44391b71e337"; + url = "ftp://ftp.gnu.org/gnu/aspell/${name}.tar.gz"; + sha256 = "0dhfgkp2y16z0agdvhn4iaikr34l4agjz2nannqvpxkcw8h1ansg"; }; buildInputs = [perl]; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index af15829dad9..532f97a9fdf 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, libtool, gettext}: stdenv.mkDerivation { - name = "attr-2.4.41"; + name = "attr-2.4.43"; src = fetchurl { - url = http://nixos.org/tarballs/attr_2.4.41-1.tar.gz; - sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp"; + # The SGI site throws away old versions, so don't use it. + url = mirror://gentoo/distfiles/attr_2.4.43-1.tar.gz; + sha256 = "1gy5zspj8ynxv6q29r24d18cfvq06zirg1pxcdg27bg2ncrv4n6k"; }; buildInputs = [libtool gettext]; @@ -13,4 +14,9 @@ stdenv.mkDerivation { configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; installTargets = "install install-lib install-dev"; + + meta = { + homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/; + description = "Library and tools for manipulating extended attributes"; + }; } diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 89e1104f3d8..cca6095616b 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = '' --disable-qt3 --disable-gdbm --disable-gtk --disable-mono --${if qt4Support then "enable" else "disable"}-qt4 - --with-distro=none --enable-shared --disable-static --disable-python + --with-distro=none --disable-python ''; meta = { diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 52bbb2f4df3..16db4290ec0 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "buddy-2.4"; - meta = - { + + meta = { homepage = "http://sourceforge.net/projects/buddy/"; description = "binary decision diagram package"; license = "as-is"; }; - src = fetchurl - { + + src = fetchurl { url = "mirror://sourceforge/buddy/${name}.tar.gz"; sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; }; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-static"; + + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; + doCheck = true; } diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index aef5ed1d4f5..6ca2ce07670 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , pdfSupport ? true , pngSupport ? true , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype -, zlib, libpng, pixman +, zlib, libpng, pixman, libxcb, xcbutil }: assert postscriptSupport -> zlib != null; @@ -17,16 +17,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig x11 fontconfig pixman + pkgconfig x11 fontconfig pixman libxcb xcbutil ]; - + propagatedBuildInputs = [ freetype ] ++ stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; - configureFlags = - (if pdfSupport then ["--enable-pdf"] else []); + configureFlags = ["--enable-xcb"] ++ + stdenv.lib.optional pdfSupport "--enable-pdf"; preConfigure = '' # Work around broken `Requires.private' that prevents Freetype diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 712a5068a99..c30f64b0a9b 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -9,10 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [pkgconfig]; + propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; - configureFlags = "--enable-shared --disable-static"; - meta = { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 24e133a5de3..4fcb11677da 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -1,15 +1,15 @@ args: with args; + stdenv.mkDerivation rec { - name = "clucene-core-0.9.20"; + name = "clucene-core-0.9.20"; - src = fetchurl { - url = "mirror://sf/clucene/${name}.tar.bz2"; - sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg"; - }; - configureFlags = "--disable-static"; - - meta = { - description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package."; - homepage = http://clucene.sourceforge.net; - }; + src = fetchurl { + url = "mirror://sf/clucene/${name}.tar.bz2"; + sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg"; + }; + + meta = { + description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package."; + homepage = http://clucene.sourceforge.net; + }; } diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 6654aa77c9f..5e55bd51bcd 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,10 +1,10 @@ -args: with args; +{stdenv, fetchurl}: stdenv.mkDerivation { - name = "cppunit-1.12.0"; - src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; - sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; - }; - configureFlags = "--enable-shared --disable-static"; + name = "cppunit-1.12.0"; + + src = fetchurl { + url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; + sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; + }; } diff --git a/pkgs/development/libraries/cracklib/builder.sh b/pkgs/development/libraries/cracklib/builder.sh index 35f682398be..3833cc1e6c1 100644 --- a/pkgs/development/libraries/cracklib/builder.sh +++ b/pkgs/development/libraries/cracklib/builder.sh @@ -5,13 +5,9 @@ preConfigure() { cp $dicts cracklib-dicts/ } -preConfigure=preConfigure - postInstall() { - ./util/cracklib-format cracklib-dicts/* | ./util/cracklib-packer cracklib_dict + $out/sbin/cracklib-format cracklib-dicts/* | $out/sbin/cracklib-packer cracklib_dict cp cracklib_dict.* $out/lib } -postInstall=postInstall - genericBuild diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index ecfa41e2305..33961f760da 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,14 +1,22 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "cracklib-2.8.12"; +stdenv.mkDerivation rec { + name = "cracklib-2.8.13"; + builder = ./builder.sh; + src = fetchurl { - url = mirror://sourceforge/cracklib/cracklib-2.8.12.tar.gz; - sha256 = "0l9kar7h80kkvs394dyzbn02jkd8hzynh9kxyqrlacj1wp35rmah"; + url = "mirror://sourceforge/cracklib/${name}.tar.gz"; + sha256 = "06h4b3hifsh1azpjvfn5qa052agavzz9xhgh4g89ghr66vzwl1ha"; }; + dicts = fetchurl { url = http://nixos.org/tarballs/cracklib-words.gz; md5 = "d18e670e5df560a8745e1b4dede8f84f"; }; + + meta = { + homepage = http://sourceforge.net/projects/cracklib; + description = "A library for checking the strength of passwords"; + }; } diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh index d71bd806743..b9d48b60803 100644 --- a/pkgs/development/libraries/db4/builder.sh +++ b/pkgs/development/libraries/db4/builder.sh @@ -4,11 +4,9 @@ preConfigure() { cd build_unix configureScript=../dist/configure } -preConfigure=preConfigure postInstall() { rm -rf $out/docs } -postInstall=postInstall genericBuild diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix index 4304cd8f9f3..7444439fc73 100644 --- a/pkgs/development/libraries/db4/db4-4.4.nix +++ b/pkgs/development/libraries/db4/db4-4.4.nix @@ -1,8 +1,10 @@ {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "db4-4.4.20"; + builder = ./builder.sh; + src = fetchurl { urls = [ http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz @@ -10,8 +12,11 @@ stdenv.mkDerivation ({ ]; md5 = "afd9243ea353bbaa04421488d3b37900"; }; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ]; -} // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin-4.4.patch];} else {})) + + patches = [ ./cygwin-4.4.patch ]; +} diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix index c67deaeda45..e5cf6f35a01 100644 --- a/pkgs/development/libraries/db4/db4-4.5.nix +++ b/pkgs/development/libraries/db4/db4-4.5.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "db4-4.5.20"; + builder = ./builder.sh; + src = fetchurl { url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz; md5 = "b0f1c777708cb8e9d37fb47e7ed3312d"; }; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ]; + patches = [./cygwin-4.5.patch ./register-race-fix.patch]; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 9a9851521b4..bcc2ba1d314 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -2,18 +2,21 @@ args: with args; stdenv.mkDerivation rec { name = "dbus-glib-0.74"; + src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78"; }; + buildInputs = [pkgconfig expat gettext]; + propagatedBuildInputs = [dbus.libs glib]; - configureFlags = "--enable-shared --disable-static"; + passthru = { inherit dbus glib; }; meta = { - homepage = http://dbus.freedesktop.org; - license = "AFL-2.1 or GPL-2"; - description = "GLib bindings for D-Bus lightweight IPC mechanism"; + homepage = http://dbus.freedesktop.org; + license = "AFL-2.1 or GPL-2"; + description = "GLib bindings for D-Bus lightweight IPC mechanism"; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 154958af6b9..4fe74286807 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -8,7 +8,7 @@ let sha256 = "1f7v79ws34mh6j75fk6w4w9v441vffll0fwf5vk94mwa0bc28g5b"; }; - configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp"; + configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp"; in rec { @@ -20,7 +20,7 @@ in rec { inherit src configureFlags; patchPhase = '' - sed -i /mkinstalldirs.*localstatedir/d bus/Makefile.in + sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in sed -i '/SUBDIRS/s/ tools//' Makefile.in ''; }; diff --git a/pkgs/development/libraries/enchant/1.3.0.nix b/pkgs/development/libraries/enchant/1.3.0.nix index e503366087e..0e3f92881e9 100644 --- a/pkgs/development/libraries/enchant/1.3.0.nix +++ b/pkgs/development/libraries/enchant/1.3.0.nix @@ -1,13 +1,15 @@ args: with args; + stdenv.mkDerivation rec { name = "enchant-" + version; + src = fetchurl { url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz"; sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76"; }; + buildInputs = [aspell pkgconfig glib]; - configureFlags = "--enable-shared --disable-static"; - + meta = { homepage = http://www.abisource.com/enchant; }; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 7b1e6faa560..676f021a720 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,19 @@ -args: with args; +{stdenv, fetchurl, zlib}: -stdenv.mkDerivation { - name = "exiv2-0.15"; - src = fetchurl { - url = http://www.exiv2.org/exiv2-0.15.tar.gz; - sha256 = "0gjak1849rbw5azz4ggckmcw0r40wlr3hgwrf4s0c23k27lq4bdp"; - }; - buildInputs = [zlib]; - configureFlags = "--with-zlib=${zlib} --enable-shared --disable-static"; +stdenv.mkDerivation rec { + name = "exiv2-0.18"; + + src = fetchurl { + url = "http://www.exiv2.org/${name}.tar.gz"; + sha256 = "1kg4bdlcqqhw9gcfs68i55sz4hvlf94xxxmqb255hhvhfj692rz5"; + }; + + buildInputs = [zlib]; + + configureFlags = "--with-zlib=${zlib} --disable-xmp"; + + meta = { + homepage = http://www.exiv2.org/; + description = "A library and command-line utility to manage image metadata"; + }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 733724f2a42..fc489f9eb66 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; - configureFlags = "--disable-static"; - meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = http://www.audiocoding.com/faad2.html; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 33f003095a6..a611a192d81 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -12,14 +12,13 @@ stdenv.mkDerivation { # the resulting library is GPL'ed, so it can only be used in GPL'ed # applications. configureFlags = '' - --enable-shared - --disable-static --enable-gpl --enable-postproc --enable-swscale --disable-ffserver --disable-ffplay --enable-libfaad + --enable-shared ''; buildInputs = [faad2]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 96303b19bc5..526769fd9cf 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, freetype, expat}: -assert freetype != null && expat != null; - stdenv.mkDerivation { name = "fontconfig-2.6.0"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 9cdfe730c46..d4ecebca46c 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "freetype-2.3.6"; +stdenv.mkDerivation rec { + name = "freetype-2.3.9"; src = fetchurl { - url = mirror://sourceforge/freetype/freetype-2.3.6.tar.bz2; - sha256 = "0xqf24d42qj5x8h6cmwpdqg455kpcbaxc3jlwqf4rlbn0g1ri9nm"; + url = "mirror://sourceforge/freetype/${name}.tar.bz2"; + sha256 = "1dia4j01aqdcrkpfkcniswcrccdx4jx2p3hyhbh76kchx6y3782i"; }; + configureFlags = "--disable-static"; + meta = { - description = "A font engine"; + description = "A font rendering engine"; homepage = http://www.freetype.org/; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index ffc1596a72b..79356b31b7e 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,12 +1,16 @@ args: with args; + stdenv.mkDerivation rec { - name = "gamin-0.1.9"; + name = "gamin-0.1.9"; - src = fetchurl { - url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; - sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr"; - }; + src = fetchurl { + url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; + sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr"; + }; - buildInputs = [python pkgconfig glib]; - configureFlags = "--enable-shared --disable-static --disable-debug --with-python=${python}"; + buildInputs = [python pkgconfig glib]; + + # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from + # with Glibc 2.9. + configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; } diff --git a/pkgs/development/libraries/gettext/0.14.6.nix b/pkgs/development/libraries/gettext/0.14.6.nix deleted file mode 100644 index bceacd318ec..00000000000 --- a/pkgs/development/libraries/gettext/0.14.6.nix +++ /dev/null @@ -1,9 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "gettext-0.14.6"; - src = fetchurl { - url = mirror://gnu/gettext/gettext-0.14.6.tar.gz; - md5 = "c26fc7f0a493c5c7c39bbc4e7ed42790"; - }; - configureFlags = "--disable-csharp"; -} diff --git a/pkgs/development/libraries/gettext/0.15.nix b/pkgs/development/libraries/gettext/0.15.nix deleted file mode 100644 index 0c417aafe50..00000000000 --- a/pkgs/development/libraries/gettext/0.15.nix +++ /dev/null @@ -1,9 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "gettext-0.15"; - src = fetchurl { - url = mirror://gnu/gettext/gettext-0.15.tar.gz; - md5 = "16bc6e4d37ac3d07495f737a2349a22b"; - }; - configureFlags = "--disable-csharp"; -} diff --git a/pkgs/development/libraries/gettext/0.16.x.nix b/pkgs/development/libraries/gettext/0.16.x.nix deleted file mode 100644 index d9b8cabef1d..00000000000 --- a/pkgs/development/libraries/gettext/0.16.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "gettext-0.16.1"; - src = fetchurl { - url = mirror://gnu/gettext/gettext-0.16.1.tar.gz; - md5 = "3d9ad24301c6d6b17ec30704a13fe127"; - }; - configureFlags = "--disable-csharp"; -} diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/default.nix similarity index 58% rename from pkgs/development/libraries/gettext/0.17.nix rename to pkgs/development/libraries/gettext/default.nix index 5fc60d9b8a6..2c76e7deb07 100644 --- a/pkgs/development/libraries/gettext/0.17.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,9 +1,12 @@ -args: with args; +{stdenv, fetchurl}: + stdenv.mkDerivation rec { - name = "gettext-" + version; + name = "gettext-0.17"; + src = fetchurl { url = "mirror://gnu/gettext/${name}.tar.gz"; sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0"; }; - configureFlags = "--disable-csharp --enable-shared --disable-static"; + + configureFlags = "--disable-csharp"; } diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc-2.5/builder.sh index 8d5d6908f04..19ed717de3b 100644 --- a/pkgs/development/libraries/glibc-2.5/builder.sh +++ b/pkgs/development/libraries/glibc-2.5/builder.sh @@ -8,7 +8,6 @@ source $stdenv/setup export PWD_P=$(type -tP pwd) -postUnpack=postUnpack postUnpack() { cd $sourceRoot unpackFile $linuxthreadsSrc @@ -16,7 +15,6 @@ postUnpack() { } -preConfigure=preConfigure preConfigure() { # Use Linuxthreads instead of NPTL. @@ -34,7 +32,6 @@ preConfigure() { } -postConfigure=postConfigure postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -44,7 +41,6 @@ postConfigure() { } -postInstall=postInstall postInstall() { if test -n "$installLocales"; then make localedata/install-locales diff --git a/pkgs/development/libraries/glibc-2.7/builder.sh b/pkgs/development/libraries/glibc-2.7/builder.sh index 1bf806c0149..d5a43229bfa 100644 --- a/pkgs/development/libraries/glibc-2.7/builder.sh +++ b/pkgs/development/libraries/glibc-2.7/builder.sh @@ -11,7 +11,6 @@ export PWD_P=$(type -tP pwd) export BASH_SHELL=$SHELL -preConfigure=preConfigure preConfigure() { for i in configure io/ftwtest-sh; do @@ -34,7 +33,6 @@ preConfigure() { } -postConfigure=postConfigure postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -44,7 +42,6 @@ postConfigure() { } -postInstall=postInstall postInstall() { if test -n "$installLocales"; then make localedata/install-locales diff --git a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch deleted file mode 100644 index 4d29082f941..00000000000 --- a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c -*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c 2007-10-17 18:05:12.000000000 +0200 ---- glibc-2.7/sysdeps/posix/getaddrinfo.c 2008-04-08 12:17:09.000000000 +0200 -*************** -*** 498,505 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 498,503 ---- -*************** -*** 689,694 **** ---- 687,694 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname3_r fct = NULL; - if (req->ai_flags & AI_CANONNAME) - /* No need to use this function if we do not look for diff --git a/pkgs/development/libraries/glibc-2.8/builder.sh b/pkgs/development/libraries/glibc-2.9/builder.sh similarity index 88% rename from pkgs/development/libraries/glibc-2.8/builder.sh rename to pkgs/development/libraries/glibc-2.9/builder.sh index 1bf806c0149..34219f12f42 100644 --- a/pkgs/development/libraries/glibc-2.8/builder.sh +++ b/pkgs/development/libraries/glibc-2.9/builder.sh @@ -7,11 +7,12 @@ source $stdenv/setup # Explicitly tell glibc to use our pwd, not /bin/pwd. export PWD_P=$(type -tP pwd) -# Needed to install share/zoneinfo/zone.tab. -export BASH_SHELL=$SHELL +# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to +# prevent a retained dependency on the bootstrap tools in the +# stdenv-linux bootstrap. +export BASH_SHELL=/bin/sh -preConfigure=preConfigure preConfigure() { for i in configure io/ftwtest-sh; do @@ -34,7 +35,6 @@ preConfigure() { } -postConfigure=postConfigure postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -44,7 +44,6 @@ postConfigure() { } -postInstall=postInstall postInstall() { if test -n "$installLocales"; then make localedata/install-locales diff --git a/pkgs/development/libraries/glibc-2.8/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix similarity index 77% rename from pkgs/development/libraries/glibc-2.8/default.nix rename to pkgs/development/libraries/glibc-2.9/default.nix index ca86a9527d7..84c138a197b 100644 --- a/pkgs/development/libraries/glibc-2.8/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -3,14 +3,14 @@ , profilingLibraries ? false }: -stdenv.mkDerivation rec -{ - name = "glibc-2.8-20080707"; +stdenv.mkDerivation rec { + name = "glibc-2.9"; + builder = ./builder.sh; - src = fetchurl - { - url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2"; - sha256 = "e317b854807f52cd539ed9b6bf8b1c2977e650e27e90baa787444bd3b74f5e72"; + + src = fetchurl { + url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2; + sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h"; }; inherit kernelHeaders installLocales; @@ -40,14 +40,22 @@ stdenv.mkDerivation rec does work because "status" will contain UNAVAIL after the failure to find mdns4_minimal. */ ./nss-skip-unavail.patch + + /* Make it possible to override the locale-archive in NixOS. */ + ./locale-override.patch + + /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch ]; # `--with-tls --without-__thread' enables support for TLS but causes # it not to be used. Required if we don't want to barf on 2.4 # kernels. Or something. - configureFlags="--enable-add-ons + configureFlags = '' + --enable-add-ons --with-headers=${kernelHeaders}/include - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; + ${if profilingLibraries then "--enable-profile" else "--disable-profile"} + ''; # Workaround for this bug: # http://sourceware.org/bugzilla/show_bug.cgi?id=411 @@ -55,4 +63,9 @@ stdenv.mkDerivation rec # preprocessor symbol `__i686' will be defined to `1'. This causes # the symbol __i686.get_pc_thunk.dx to be mangled. NIX_CFLAGS_COMPILE = "-U__i686"; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library"; + }; } diff --git a/pkgs/development/libraries/glibc-2.9/locale-override.patch b/pkgs/development/libraries/glibc-2.9/locale-override.patch new file mode 100644 index 00000000000..108d0e35dac --- /dev/null +++ b/pkgs/development/libraries/glibc-2.9/locale-override.patch @@ -0,0 +1,72 @@ +diff -rc glibc-2.9-20081208-orig/locale/loadarchive.c glibc-2.9-20081208/locale/loadarchive.c +*** glibc-2.9-20081208-orig/locale/loadarchive.c 2005-09-09 18:56:52.000000000 +0200 +--- glibc-2.9-20081208/locale/loadarchive.c 2009-04-19 13:54:26.000000000 +0200 +*************** +*** 124,129 **** +--- 124,142 ---- + } + + ++ static int ++ open_locale_archive () ++ { ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); ++ if (fd < 0) ++ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); ++ return fd; ++ } ++ ++ + /* Find the locale *NAMEP in the locale archive, and return the + internalized data structure for its CATEGORY data. If this locale has + already been loaded from the archive, just returns the existing data +*************** +*** 203,209 **** + archmapped = &headmap; + + /* The archive has never been opened. */ +! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +--- 216,222 ---- + archmapped = &headmap; + + /* The archive has never been opened. */ +! fd = open_locale_archive (); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +*************** +*** 394,400 **** + if (fd == -1) + { + struct stat64 st; +! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +--- 407,413 ---- + if (fd == -1) + { + struct stat64 st; +! fd = open_locale_archive (); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +diff -rc glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h glibc-2.9-20081208/sysdeps/generic/unsecvars.h +*** glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h 2006-10-11 18:24:05.000000000 +0200 +--- glibc-2.9-20081208/sysdeps/generic/unsecvars.h 2009-04-19 13:55:34.000000000 +0200 +*************** +*** 16,21 **** +--- 16,22 ---- + "LD_SHOW_AUXV\0" \ + "LD_USE_LOAD_BIAS\0" \ + "LOCALDOMAIN\0" \ ++ "LOCALE_ARCHIVE\0" \ + "LOCPATH\0" \ + "MALLOC_TRACE\0" \ + "NIS_PATH\0" \ diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc-2.9/locales.nix new file mode 100644 index 00000000000..a5ef4797810 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.9/locales.nix @@ -0,0 +1,47 @@ +/* This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc +*/ + +{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: + +stdenv.mkDerivation rec { + name = "glibc-locales-2.9"; + + src = fetchurl { + url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2; + sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h"; + }; + + configurePhase = "true"; + + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + buildPhase = + '' + touch config.make + touch config.status + mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + make localedata/install-locales \ + LOCALEDEF="localedef --prefix=$TMPDIR" \ + localedir=$out/lib/locale \ + ${if allLocales then "" else "SUPPORTED-LOCALES=\"${toString locales}\""} + ''; + + installPhase = + '' + ensureDir $out/lib/locale + cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ + ''; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "Locale information for the GNU C Library"; + }; +} diff --git a/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch new file mode 100644 index 00000000000..dc09b509870 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch @@ -0,0 +1,25 @@ +diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c +*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30 21:14:22.000000000 +0200 +--- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10 11:39:32.000000000 +0100 +*************** +*** 505,512 **** + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +--- 505,510 ---- +*************** +*** 702,707 **** +--- 700,707 ---- + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); + if (fct4 != NULL) diff --git a/pkgs/development/libraries/glibc-2.9/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.9/rpcgen-path.patch new file mode 100644 index 00000000000..fbb03dd5fad --- /dev/null +++ b/pkgs/development/libraries/glibc-2.9/rpcgen-path.patch @@ -0,0 +1,72 @@ +By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths +(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This +patch makes it run any `cpp' command found in $PATH. + +--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 ++++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 +@@ -79,7 +79,7 @@ static const char *cmdname; + + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -108,7 +108,6 @@ static char *extendfile (const char *fil + static void open_output (const char *infile, const char *outfile); + static void add_warning (void); + static void clear_args (void); +-static void find_cpp (void); + static void open_input (const char *infile, const char *define); + static int check_nettype (const char *name, const char *list_to_check[]); + static void c_output (const char *infile, const char *define, +@@ -327,31 +326,6 @@ clear_args (void) + argcount = FIXEDARGS; + } + +-/* make sure that a CPP exists */ +-static void +-find_cpp (void) +-{ +- struct stat buf; +- +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } +- } +-} +- + /* + * Open input file with given define for C-preprocessor + */ +@@ -370,7 +344,6 @@ open_input (const char *infile, const ch + switch (cpp_pid) + { + case 0: +- find_cpp (); + putarg (0, CPP); + putarg (1, CPPFLAGS); + addarg (define); +@@ -380,7 +353,7 @@ open_input (const char *infile, const ch + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); ++ execvp (arglist[0], (char **) arglist); + perror ("execv"); + exit (1); + case -1: diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix index 967c60a35b3..0b472928d0e 100644 --- a/pkgs/development/libraries/gmp/default.nix +++ b/pkgs/development/libraries/gmp/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, m4, cxx ? true }: +{stdenv, fetchurl, m4, cxx ? true}: stdenv.mkDerivation { - name = "gmp-4.2.3"; + name = "gmp-4.2.4"; src = fetchurl { - url = mirror://gnu/gmp/gmp-4.2.3.tar.bz2; - sha256 = "139b5abc49833832184c0a03ff6fc64c59ef102b420d2a5884ad78af5647414b"; + url = mirror://gnu/gmp/gmp-4.2.4.tar.bz2; + sha256 = "0s73xzhwrfqcr1gmhsink1fhfzjlkyk70b1bdyrm76m6b3jv082l"; }; buildInputs = [m4]; + configureFlags = if cxx then "--enable-cxx" else "--disable-cxx"; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 71c4ddcdad8..195d10a4920 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { doCheck = true; - configureFlags = "--disable-static"; - meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index bedd49e3dc6..2661f8caaa5 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,15 +1,23 @@ args: with args; rec { - gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.21") args; - gstreamer = gstreamerFun null; + gstreamer = import ./gstreamer { + inherit (args) fetchurl stdenv perl bison flex + pkgconfig python which gtkdoc glib libxml2; + }; - gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.21") - args { inherit gstreamer; }; - gstPluginsBase = gstPluginsBaseFun null; + gstPluginsBase = import ./gst-plugins-base { + inherit gstreamer; + inherit (args) fetchurl stdenv pkgconfig python + libX11 libXv libXext alsaLib cdparanoia libogg libtheora + libvorbis freetype pango liboil gtk which gtkdoc; + }; - gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.11") - args { inherit gstPluginsBase; }; - gstPluginsGood = gstPluginsGoodFun null; + gstPluginsGood = import ./gst-plugins-good { + inherit gstPluginsBase; + inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal + libjpeg zlib speex libpng libdv libcaca dbus libiec61883 + libavc1394 ladspaH taglib gdbm pulseaudio; + }; gstFfmpeg = import ./gst-ffmpeg { inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 4dd8db4e18c..b295d2d3198 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -1,21 +1,18 @@ args: with args; -let version = "0.10.10"; in - stdenv.mkDerivation rec { - name = "gnonlin-${version}"; +stdenv.mkDerivation rec { + name = "gnonlin-0.10.10"; - src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-${version}.tar.gz"; - sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y"; - }; + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.gz"; + sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y"; + }; - buildInputs = [ gstPluginsBase gstreamer pkgconfig ]; + buildInputs = [ gstPluginsBase gstreamer pkgconfig ]; - configureFlags = "--enable-shared --disable-static"; - - meta = { - homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - license = "GPLv2+"; - }; - } + meta = { + homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index 6ec9acf0e9b..2ea82bc7bdc 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,24 +1,24 @@ { fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }: -let version = "0.10.5"; in - stdenv.mkDerivation rec { - name = "gst-ffmpeg-${version}"; +stdenv.mkDerivation rec { + name = "gst-ffmpeg-0.10.5"; - src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"; - sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik"; - }; + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"; + sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik"; + }; - propagatedBuildInputs = [ gstPluginsBase ]; - buildInputs = [ pkgconfig bzip2 ]; + propagatedBuildInputs = [ gstPluginsBase ]; + + buildInputs = [ pkgconfig bzip2 ]; - configureFlags = "--enable-shared --disable-static --enable-ladspa"; + configureFlags = "--enable-ladspa"; - meta = { - homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg/${version}.html"; + meta = { + homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; - description = "GStreamer's plug-in using FFmpeg"; + description = "GStreamer's plug-in using FFmpeg"; - license = "GPLv2+"; - }; - } + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix deleted file mode 100644 index 036134c82c1..00000000000 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix +++ /dev/null @@ -1,24 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "gst-plugins-base-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"; - sha256 = "03gpfhdaw7yz83y0wpq966b9dqpvw8v5kpixa1pp4mn7d5bgsb7q"; - }; - - patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; - - configureFlags = "--enable-shared --disable-static"; - -# TODO : v4l, libvisual - propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia - gnomevfs libogg libtheora libvorbis freetype pango liboil gtk]; - - buildInputs = [pkgconfig python]; - - meta = { - homepage = http://gstreamer.freedesktop.org; - }; -} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix similarity index 56% rename from pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix rename to pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 5777a571320..43fd458eed9 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,17 +1,18 @@ -args: with args; +{ fetchurl, stdenv, pkgconfig, python, gstreamer +, libX11, libXv, libXext, alsaLib, cdparanoia , libogg +, libtheora, libvorbis, freetype, pango +, liboil, gtk, which, gtkdoc }: stdenv.mkDerivation rec { - name = "gst-plugins-base-" + version; + name = "gst-plugins-base-0.10.22"; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"; - sha256 = "14vyshhxpdpfd06jyw1fgcfxb6nh0bg7n2aqd9h9kapkl12llgv7"; + sha256 = "1yfmkji12gn8cl2nmgs8bbdadnc5hrywn0zwfsi3izpb0gnmlk0q"; }; patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; - configureFlags = "--enable-shared --disable-static"; - # TODO : v4l, libvisual propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc]; @@ -20,5 +21,9 @@ stdenv.mkDerivation rec { meta = { homepage = http://gstreamer.freedesktop.org; + + description = "Base plug-ins for GStreamer"; + + license = "LGPLv2+"; }; } diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix deleted file mode 100644 index 4653f4277e7..00000000000 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix +++ /dev/null @@ -1,21 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "gst-plugins-good-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"; - sha256 = "1ccnyzn9n2a6xjxz5srydc8bm63mjz5cxbcwbigxzqw0a033ych5"; - }; - - propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg - zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH - taglib ]; - buildInputs = [pkgconfig]; - - configureFlags = "--enable-shared --disable-static --enable-ladspa"; - - meta = { - homepage = http://gstreamer.freedesktop.org; - }; -} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix deleted file mode 100644 index 10485330772..00000000000 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix +++ /dev/null @@ -1,23 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "gst-plugins-good-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"; - sha256 = "0rid0gjj8nsk0r5yn4bz1xfsbp446r92wc6wp4099hilw6jxd74y"; - }; - - propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg - zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH - taglib ]; - buildInputs = [pkgconfig]; - - configureFlags = "--enable-shared --disable-static --enable-ladspa"; - - patches = [ ./tag_defines.patch ]; - - meta = { - homepage = http://gstreamer.freedesktop.org; - }; -} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix new file mode 100644 index 00000000000..b575c2536a1 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo +, flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus +, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio }: + +stdenv.mkDerivation rec { + name = "gst-plugins-good-0.10.14"; + + src = fetchurl { + url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"; + sha256 = "12kq60zdqxkshpjr76iwzykzhjaq3g1rm81nz7b0x44rrc0ms80j"; + }; + + propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg + zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH + taglib gdbm pulseaudio]; + buildInputs = [pkgconfig]; + + configureFlags = "--enable-ladspa"; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "`Good' plug-ins for GStreamer"; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch b/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch deleted file mode 100644 index 0ece094229b..00000000000 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc ---- gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc 2007-06-13 11:21:10.000000000 +0200 -+++ gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc 2007-11-24 21:56:04.000000000 +0100 -@@ -532,6 +532,7 @@ - GST_TAG_TITLE, add_text_tag, "TIT2"}, { - GST_TAG_ALBUM, add_text_tag, "TALB"}, { - GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, { -+ GST_TAG_COMPOSER, add_text_tag, "TCOM"}, { - GST_TAG_GENRE, add_text_tag, "TCON"}, { - GST_TAG_COMMENT, add_comment_tag, ""}, { - GST_TAG_EXTENDED_COMMENT, add_comment_tag, ""}, { -@@ -544,7 +545,9 @@ - GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, { - GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, { - GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, { -- GST_TAG_MUSICBRAINZ_SORTNAME, add_text_tag, "TSOP"}, { -+ GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, { -+ GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, { -+ GST_TAG_TITLE_SORTNAME, add_text_tag, "TSOT"}, { - GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, { - GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, { - GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, { diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix deleted file mode 100644 index 02244e77371..00000000000 --- a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix +++ /dev/null @@ -1,22 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "gstreamer-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2"; - sha256 = "172nqf6l6mq4r1923bph53xd6h3svha3kkrvy5cald77jgf64a24"; - }; - - buildInputs = [perl bison flex pkgconfig python]; - propagatedBuildInputs = [glib libxml2]; - - configureFlags = "--enable-shared --disable-static --enable-failing-tests - --localstatedir=/var"; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = http://gstreamer.freedesktop.org; - }; -} diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix deleted file mode 100644 index 30b5b40ffe0..00000000000 --- a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix +++ /dev/null @@ -1,20 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "gstreamer-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2"; - sha256 = "1ly3b6ja51vwwkdqzi20hg5azdsrz5pnhswgagdwsprb8nh8bhcl"; - }; - - buildInputs = [perl bison flex pkgconfig python which gtkdoc ]; - propagatedBuildInputs = [glib libxml2]; - - configureFlags = "--enable-shared --disable-static --enable-failing-tests - --localstatedir=/var --disable-gtk-doc --disable-docbook"; - - meta = { - homepage = http://gstreamer.freedesktop.org; - }; -} diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix new file mode 100644 index 00000000000..213c3d9f922 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, perl, bison, flex, pkgconfig, python +, which, gtkdoc, glib, libxml2 }: + +stdenv.mkDerivation rec { + name = "gstreamer-0.10.22"; + + src = fetchurl { + url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2"; + sha256 = "17iqgsnh1v43ai9m9iyqv6dds7iwqw2445b0qxnjwdmij80rwj31"; + }; + + buildInputs = [perl bison flex pkgconfig python which gtkdoc ]; + propagatedBuildInputs = [glib libxml2]; + + configureFlags = '' + --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook + ''; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "GStreamer, a library for constructing graphs of media-handling components"; + + longDescription = '' + GStreamer is a library for constructing graphs of media-handling + components. The applications it supports range from simple + Ogg/Vorbis playback, audio/video streaming to complex audio + (mixing) and video (non-linear editing) processing. + + Applications can take advantage of advances in codec and filter + technology transparently. Developers can add new codecs and + filters by writing a simple plugin with a clean, generic + interface. + ''; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix index 13b6092a2d8..4cdef0c3b65 100644 --- a/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation { propagatedBuildInputs = [x11 glib cairo libpng]; - # The configure script doesn't seem to pick up the Cairo cflags. - preConfigure = '' - CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug) - ''; - meta = { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; homepage = http://www.pango.org/; diff --git a/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix index 790b006f90a..95259101157 100644 --- a/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "glibmm-2.18.1"; src = fetchurl { - url = "mirror://gnome/GNOME/sources/glibmm/2.18/${name}.tar.bz2"; + url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2"; sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r"; }; diff --git a/pkgs/development/libraries/gtk-libs/2.16/atk/default.nix b/pkgs/development/libraries/gtk-libs/2.16/atk/default.nix new file mode 100644 index 00000000000..320033bad00 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/atk/default.nix @@ -0,0 +1,30 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "atk-1.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/atk/1.24/${name}.tar.bz2"; + sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803"; + }; + + buildInputs = [pkgconfig perl]; + propagatedBuildInputs = [glib]; + + meta = { + description = "ATK, the accessibility toolkit"; + + longDescription = '' + ATK is the Accessibility Toolkit. It provides a set of generic + interfaces allowing accessibility technologies such as screen + readers to interact with a graphical user interface. Using the + ATK interfaces, accessibility tools have full access to view and + control running applications. + ''; + + homepage = http://library.gnome.org/devel/atk/; + + license = "LGPLv2+"; + }; + +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/default.nix b/pkgs/development/libraries/gtk-libs/2.16/default.nix new file mode 100644 index 00000000000..89abc0e6208 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/default.nix @@ -0,0 +1,20 @@ +args: with args; + +rec { + + glib = (import ./glib) args; + + atk = (import ./atk) (args // { inherit glib; }); + + pango = (import ./pango) (args // { inherit glib cairo; }); + + gtk = (import ./gtk+) (args // { + inherit glib atk pango; + }); + + glibmm = (import ./glibmm) (args // { inherit glib; }); + + pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; }); + + gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; }); +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.16/glib/default.nix new file mode 100644 index 00000000000..1966c426e2a --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/glib/default.nix @@ -0,0 +1,27 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "glib-2.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glib/2.20/${name}.tar.bz2"; + sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav"; + }; + + buildInputs = [pkgconfig gettext perl]; + + meta = { + description = "GLib, a C library of programming buildings blocks"; + + longDescription = '' + GLib provides the core application building blocks for libraries + and applications written in C. It provides the core object + system used in GNOME, the main loop implementation, and a large + set of utility functions for strings and common data structures. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix new file mode 100644 index 00000000000..95259101157 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/glibmm/default.nix @@ -0,0 +1,21 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "glibmm-2.18.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2"; + sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r"; + }; + + buildInputs = [pkgconfig]; + propagatedBuildInputs = [glib libsigcxx]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix new file mode 100644 index 00000000000..ee2fec4ce0b --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix @@ -0,0 +1,37 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gtk+-2.16.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2"; + sha256 = "0l3dfznv07nmzavqp0shr5qf66alb6xyzmiq728hgygmnayky7rg"; + }; + + buildInputs = [ pkgconfig perl jasper ]; + + propagatedBuildInputs = [ + x11 glib atk pango libtiff libjpeg libpng cairo libXrandr + ] ++ stdenv.lib.optional xineramaSupport libXinerama; + + passthru = { inherit libtiff libjpeg libpng; }; + + meta = { + description = "A multi-platform toolkit for creating graphical user interfaces"; + + longDescription = '' + GTK+ is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK+ it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK+ is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK+ without any license fees or + royalties. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix new file mode 100644 index 00000000000..2379dc04c12 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/gtkmm/default.nix @@ -0,0 +1,31 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gtkmm-2.14.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2"; + sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94"; + }; + + buildInputs = [pkgconfig]; + propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ]; + + meta = { + description = "C++ interface to the GTK+ graphical user interface library"; + + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK+. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix new file mode 100644 index 00000000000..bbf4e63cd13 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix @@ -0,0 +1,29 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "pango-1.24.1"; + + src = fetchurl { + url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2"; + sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370"; + }; + + buildInputs = [pkgconfig]; + + propagatedBuildInputs = [x11 glib cairo libpng]; + + meta = { + description = "A library for laying out and rendering of text, with an emphasis on internationalization"; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK+ widget toolkit. + Pango forms the core of text and font handling for GTK+-2.x. + ''; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix b/pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix new file mode 100644 index 00000000000..ca43437574e --- /dev/null +++ b/pkgs/development/libraries/gtk-libs/2.16/pangomm/default.nix @@ -0,0 +1,28 @@ +args: with args; + +stdenv.mkDerivation rec { + name ="pangomm-2.14.1"; + + src = fetchurl { + url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2"; + sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pango glibmm cairomm libpng ]; + + meta = { + description = "C++ interface to the Pango text rendering library"; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK+ widget toolkit. + Pango forms the core of text and font handling for GTK+-2.x. + ''; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 9d015d13923..edbf23d516e 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation { name = "id3lib-3.8.3"; + src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; md5 = "19f27ddd2dda4b2d26a559a4f0f402a7"; }; - configureFlags = "--disable-static"; } diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 360644cf911..36b74a1980e 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -1,4 +1,5 @@ args: with args; + stdenv.mkDerivation { name = "ilbc-rfc3951"; @@ -12,6 +13,4 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = "cp ilbc-rfc3951.tar.gz \${out}"; }; - - configureFlags = "--enable-shared --disable-static"; } diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 0ab548bef86..2b7952d3b20 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,9 +1,10 @@ -args: with args; +{stdenv, fetchurl}: + stdenv.mkDerivation { - name = "ilmbase-1.0.1"; - src = fetchurl { - url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz; - sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g"; - }; - configureFlags = "--enable-shared --disable-static"; + name = "ilmbase-1.0.1"; + + src = fetchurl { + url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz; + sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g"; + }; } diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 651cb630944..4c7cbb4e691 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [cfitsio libusb zlib]; - configureFlags = "--enable-shared --disable-static"; meta = { homepage = http://indi.sf.net; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index cf91952534c..bca8aedfd4b 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [unzip libjpeg]; - - configureFlags = "--enable-shared --disable-static"; + configureFlags = "--enable-shared"; + meta = { homepage = http://www.ece.uvic.ca/~mdadams/jasper/; description = "JasPer JPEG2000 Library"; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index e4800dfb94b..9f7305f2d3e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,14 +1,18 @@ args: with args; + stdenv.mkDerivation rec { - name = "heimdal-1.0.2"; + name = "heimdal-1.0.2"; - src = fetchurl { - urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" - "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; - sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5"; - }; + src = fetchurl { + urls = [ + "http://www.h5l.org/dist/src/${name}.tar.gz" + "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" + ]; + sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5"; + }; - ## ugly, X should be made an option - configureFlags = "--enable-shared --disable-static --with-openldap=${openldap} --without-x"; - propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ]; + ## ugly, X should be made an option + configureFlags = "--with-openldap=${openldap} --without-x"; + + propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ]; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 6411657c6b6..264c51ef479 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, pulseaudio }: stdenv.mkDerivation { name = "libao-0.8.8"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954"; }; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig pulseaudio ]; meta = { longDescription = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPL"; + license = "GPLv2+"; }; } diff --git a/pkgs/development/libraries/libarchive/2.4.11.nix b/pkgs/development/libraries/libarchive/2.4.11.nix deleted file mode 100644 index e75d59ec18a..00000000000 --- a/pkgs/development/libraries/libarchive/2.4.11.nix +++ /dev/null @@ -1,2 +0,0 @@ -args: -import ./common.nix "1iq5hs4hbqyl6sqiqlaj3j89vpfqx6zv974c965nxjvmwy816dbz" args diff --git a/pkgs/development/libraries/libarchive/2.4.12.nix b/pkgs/development/libraries/libarchive/2.4.12.nix deleted file mode 100644 index 9765ec61cd7..00000000000 --- a/pkgs/development/libraries/libarchive/2.4.12.nix +++ /dev/null @@ -1,2 +0,0 @@ -args: -import ./common.nix "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4" args diff --git a/pkgs/development/libraries/libarchive/common.nix b/pkgs/development/libraries/libarchive/common.nix deleted file mode 100644 index 9f031e4f2c2..00000000000 --- a/pkgs/development/libraries/libarchive/common.nix +++ /dev/null @@ -1,18 +0,0 @@ -sha256: args: with args; -stdenv.mkDerivation rec { - name = "libarchive-" + version; - - src = fetchurl { - url = "${meta.homepage}/src/${name}.tar.gz"; - inherit sha256; - }; - - propagatedBuildInputs = [zlib bzip2 e2fsprogs]; - buildInputs = [sharutils]; - configureFlags = "--enable-shared --disable-static"; - - meta = { - description = "A library for reading and writing streaming archives"; - homepage = http://people.freebsd.org/~kientzle/libarchive; - }; -} diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix new file mode 100644 index 00000000000..744554c338f --- /dev/null +++ b/pkgs/development/libraries/libarchive/default.nix @@ -0,0 +1,19 @@ +{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}: + +stdenv.mkDerivation rec { + name = "libarchive-2.4.12"; + + src = fetchurl { + url = "${meta.homepage}/src/${name}.tar.gz"; + sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4"; + }; + + propagatedBuildInputs = [zlib bzip2 e2fsprogs]; + + buildInputs = [sharutils]; + + meta = { + description = "A library for reading and writing streaming archives"; + homepage = http://people.freebsd.org/~kientzle/libarchive; + }; +} diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index b7b13f54cc8..4c11a3a1fe3 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "libcaca-0.99-beta13b"; + name = "libcaca-0.99.beta16"; + src = fetchurl { - name = "${name}.tar.gz"; - url = http://libcaca.zoy.org/attachment/wiki/libcaca/libcaca-0.99.beta13b.tar.gz?format=raw; - sha256 = "0xy8pcnljnj5la97bzbwwyzyqa7dr3v9cyw8gdjzdfgqywvac1vg"; + url = "http://caca.zoy.org/raw-attachment/wiki/libcaca/${name}.tar.gz"; + sha256 = "1k2anqc9jxvlyar6ximf9l55xzzhgwdbjbclpj64vg6lpqf96k6a"; }; + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; + propagatedBuildInputs = [ncurses]; - meta = { - homepage = http://libcaca.zoy.org/; - description = "A graphics library that outputs text instead of pixels."; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ - }; + meta = { + homepage = http://libcaca.zoy.org/; + description = "A graphics library that outputs text instead of pixels"; + license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index f36bfa0d144..a3584a989a8 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wl2hd8zqwzbbp4icng6siim85jb6hvczy9c6m92lh85wrcwpqxh"; }; - buildInputs = [ pkgconfig libtool gtk alsaLib pulseaudio gstreamer libvorbis ]; + buildInputs = [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis ]; + propagatedBuildInputs = [ gtk ]; configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 2622a9b3128..8432c5675f4 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,9 +1,17 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, pkgconfig, pthread_stubs}: -stdenv.mkDerivation { - name = "libdrm-2.3.0"; +stdenv.mkDerivation rec { + name = "libdrm-2.4.9"; + src = fetchurl { - url = http://dri.freedesktop.org/libdrm/libdrm-2.3.0.tar.bz2; - sha256 = "13l4ysid1raasmq18x1kjp5xmwqg6pv9431n25c88l7agx113izq"; + url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; + sha256 = "18i1c4pcy2db2alali1yxg1s72vdpikivahmbrp7wf204kn236zd"; + }; + + buildInputs = [ pkgconfig pthread_stubs ]; + + meta = { + homepage = http://dri.freedesktop.org/libdrm/; + description = "Library for accessing the kernel's Direct Rendering Manager"; }; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 2e483b29a06..d91aa398746 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,16 +1,21 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.2"; + name = "libgphoto2-2.4.5"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "09jjfh9c7s02dxkwwr8j3kaqffsyiiz7ncbkmdvav1i14xdna6gk"; + sha256 = "1pipdwjxbjg7y9n5ldz6qlpiiiqyba6jx315277ams5d8jxg2bfk"; }; - buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext]; + buildInputs = [pkgconfig libtool libjpeg gettext]; + + # These are mentioned in the Requires line of libgphoto's pkg-config file. + propagatedBuildInputs = [libusb libexif]; meta = { + homepage = http://www.gphoto.org/proj/libgphoto2/; + description = "A library for accessing digital cameras"; license = "LGPL-2"; }; } diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 11e49acad14..10bb8966222 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "07p7cnmfnq7ds8a56iqmxps46bzznn92xxpdlnnp3n6pwcnidmn7"; }; - configureFlags = "--disable-static"; - doCheck = true; meta = { diff --git a/pkgs/development/libraries/libjpeg-static/builder.sh b/pkgs/development/libraries/libjpeg-static/builder.sh deleted file mode 100644 index b5662f7eb67..00000000000 --- a/pkgs/development/libraries/libjpeg-static/builder.sh +++ /dev/null @@ -1,28 +0,0 @@ -source $stdenv/setup - -preConfigure=preConfigure -preConfigure() { - # Workarounds for the ancient libtool shipped by libjpeg. - ln -s $libtool/bin/libtool . - cp $libtool/share/libtool/config.guess . - cp $libtool/share/libtool/config.sub . -} - -preInstall=preInstall -preInstall() { - mkdir $out - mkdir $out/bin - mkdir $out/lib - mkdir $out/include - mkdir $out/man - mkdir $out/man/man1 -} - -patchPhase=patchPhase -patchPhase() { - for i in $patches; do - patch < $i - done -} - -genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/libjpeg-static/default.nix b/pkgs/development/libraries/libjpeg-static/default.nix deleted file mode 100644 index e0722eba415..00000000000 --- a/pkgs/development/libraries/libjpeg-static/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, libtool, static ? false}: - -stdenv.mkDerivation { - name = "libjpeg-6b"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/jpegsrc.v6b.tar.gz; - md5 = "dbd5f3b47ed13132f04c685d608a7547"; - }; - inherit libtool; - - configureFlags = "--enable-shared" + - (if static then " --enable-static" else ""); - - # Required for building of dynamic libraries on Darwin. - patches = [ - (fetchurl { - url = http://nixos.org/tarballs/patch-ltconfig; - md5 = "e6725fa4a09aa1de4ca75343fd0f61d5"; - }) - (fetchurl { - url = http://nixos.org/tarballs/patch-ltmain.sh; - #md5 = "489986ad8e7a93aef036766b25f321d5"; - md5 = "092a12aeb0c386dd7dae059109d950ba"; - }) - ]; -} diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh index 1b006f4e0c0..923f4f83974 100644 --- a/pkgs/development/libraries/libjpeg/builder.sh +++ b/pkgs/development/libraries/libjpeg/builder.sh @@ -1,8 +1,5 @@ source $stdenv/setup -configureFlags="--enable-shared" - -preConfigure=preConfigure preConfigure() { # Workarounds for the ancient libtool shipped by libjpeg. ln -s $libtool/bin/libtool . @@ -10,7 +7,6 @@ preConfigure() { cp $libtool/share/libtool/config.sub . } -preInstall=preInstall preInstall() { mkdir $out mkdir $out/bin @@ -20,7 +16,6 @@ preInstall() { mkdir $out/man/man1 } -patchPhase=patchPhase patchPhase() { for i in $patches; do patch < $i diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 446c451ab68..b23c6fabf7b 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,14 +1,19 @@ -{stdenv, fetchurl, libtool}: +{stdenv, fetchurl, libtool, static ? false}: stdenv.mkDerivation { name = "libjpeg-6b"; + builder = ./builder.sh; + src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; md5 = "dbd5f3b47ed13132f04c685d608a7547"; }; + inherit libtool; + configureFlags = "--enable-shared ${if static then " --enable-static" else ""}"; + # Required for building of dynamic libraries on Darwin. patches = [ (fetchurl { diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5ff99341da1..513afc474ea 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [libgpgerror]; - configureFlags = "--enable-shared --disable-static"; - meta = { homepage = http://www.gnupg.org; description = "Libksba is a CMS and X.509 access library under development"; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 41408297527..aa5c3526e85 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -2,12 +2,19 @@ stdenv.mkDerivation { name = "libmad-0.15.1b"; + src = fetchurl { url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz; sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; + # The -fforce-mem flag has been removed in GCC 4.3. + preConfigure = '' + substituteInPlace configure --replace "-fforce-mem" "" + ''; + meta = { + homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 805a1f44452..e2d1c25d013 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,15 +1,15 @@ args: with args; -stdenv.mkDerivation rec { - name = "libnova-0.12.1"; - - src = fetchurl { - url = "mirror://sf/libnova/${name}.tar.gz"; - sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; - }; - configureFlags = "--enable-shared --disable-static"; - meta = { - description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; - homepage = http://libnova.sf.net; - }; +stdenv.mkDerivation rec { + name = "libnova-0.12.1"; + + src = fetchurl { + url = "mirror://sf/libnova/${name}.tar.gz"; + sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; + }; + + meta = { + description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; + homepage = http://libnova.sf.net; + }; } diff --git a/pkgs/development/libraries/liboil/0.3.13.nix b/pkgs/development/libraries/liboil/0.3.13.nix deleted file mode 100644 index b1425e454fb..00000000000 --- a/pkgs/development/libraries/liboil/0.3.13.nix +++ /dev/null @@ -1,19 +0,0 @@ -args: with args; - -stdenv.mkDerivation rec { - name = "liboil-" + version; - - src = fetchurl { - url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0cndfz98zca40qc1d2waq1dkfx32yscbllbvlnlhjp4cjlkyh9qg"; - }; - - configureFlags = "--enable-shared --disable-static"; - - buildInputs = [pkgconfig glib]; - - meta = { - homepage = http://liboil.freedesktop.org; - description = "A library of simple functions that are optimized for various CPUs"; - }; -} diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/default.nix similarity index 77% rename from pkgs/development/libraries/liboil/0.3.15.nix rename to pkgs/development/libraries/liboil/default.nix index b777a1195f9..1bfbb6bbff2 100644 --- a/pkgs/development/libraries/liboil/0.3.15.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,15 +1,13 @@ -args: with args; +{stdenv, fetchurl, pkgconfig, glib}: stdenv.mkDerivation rec { - name = "liboil-" + version; + name = "liboil-0.3.15"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; }; - configureFlags = "--enable-shared --disable-static"; - buildInputs = [pkgconfig glib]; meta = { diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index ea194272fff..256993b9968 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -2,12 +2,12 @@ assert zlib != null; -stdenv.mkDerivation { - name = "libpng-1.2.29"; +stdenv.mkDerivation rec { + name = "libpng-1.2.35"; src = fetchurl { - url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2; - md5 = "f588cb4ee39e3a333604096f937ea157"; + url = mirror://sourceforge/libpng/libpng-1.2.35.tar.bz2; + md5 = "b8b8d09adf6bee2c5902c8e54c4f2e68"; }; propagatedBuildInputs = [zlib]; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index ba24763ea18..6d19ce55d3d 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,12 +1,17 @@ -{ stdenv, fetchurl, pkgconfig}: +{stdenv, fetchurl, pkgconfig}: -stdenv.mkDerivation { - name = "libsigc++-2.0.16"; +stdenv.mkDerivation rec { + name = "libsigc++-2.2.3"; + src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.16.tar.gz; - md5 = "49b8c091b1be84d9f9801c4c81cd98b8"; + url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.bz2"; + sha256 = "0hjh7834mbp2n5qnc7n1r3l70j9g06ibv7kbmhix9b101w6ypnak"; }; buildInputs = [pkgconfig]; -} + meta = { + homepage = http://libsigc.sourceforge.net/; + description = "A typesafe callback system for standard C++"; + }; +} diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index af8bd225820..9dd50c37c61 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -1,7 +1,8 @@ args: with args; stdenv.mkDerivation rec { - name = "libsigsegv-" + version; + name = "libsigsegv-2.5"; + src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg"; @@ -12,6 +13,5 @@ stdenv.mkDerivation rec { description = "A library for handling page faults in user mode"; }; - configureFlags = "--enable-shared --disable-static"; doCheck = true; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index a7dad9d5589..ea657e8e43d 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx"; }; - configureFlags = "--enable-shared --disable-static"; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; meta = { diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 37a032fdefa..7124fc72eee 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libxcrypt-2.4"; + name = "libxcrypt-3.0.2"; src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-2.4.tar.bz2; - md5 = "b5ae266550af2d04423da7d3af08a82a"; + url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2; + sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii"; }; } diff --git a/pkgs/development/libraries/libxklavier/3.4.nix b/pkgs/development/libraries/libxklavier/default.nix similarity index 80% rename from pkgs/development/libraries/libxklavier/3.4.nix rename to pkgs/development/libraries/libxklavier/default.nix index 38fa91cfeb0..973d6246714 100644 --- a/pkgs/development/libraries/libxklavier/3.4.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,7 +1,7 @@ args: with args; stdenv.mkDerivation rec { - name = "libxklavier-" + version; + name = "libxklavier-3.4"; src = fetchurl { url = "mirror://sf/gswitchit/${name}.tar.gz"; @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile]; + buildInputs = [pkgconfig]; - configureFlags = "--enable-shared --disable-static + + configureFlags = '' --with-xkb-base=${xkeyboard_config}/etc/X11/xkb - --disable-xmodmap-support"; + --disable-xmodmap-support + ''; meta = { homepage = http://freedesktop.org/wiki/Software/LibXklavier; diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh deleted file mode 100755 index 24ad62eeb81..00000000000 --- a/pkgs/development/libraries/libxml2/builder.sh +++ /dev/null @@ -1,16 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-zlib=$zlib" -if test "$pythonSupport"; then - configureFlags="--with-python=$python $configureFlags" -fi - -patchPhase() { - echo "Patching" - mv configure configure.old - sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" < configure.old > configure - chmod u+x configure -} -patchPhase=patchPhase - -genericBuild diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 1a0b0557b14..287088f616e 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,26 +1,27 @@ {stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}: -assert zlib != null; assert pythonSupport -> python != null; -stdenv.mkDerivation ({ - name = "libxml2-2.6.32"; - builder = ./builder.sh; +stdenv.mkDerivation { + name = "libxml2-2.7.3"; src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz; - sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v"; + url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz; + sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5"; }; - python = if pythonSupport then python else null; - inherit pythonSupport zlib; - - buildInputs = if pythonSupport then [python] else []; + configureFlags = '' + ${if pythonSupport then "--with-python=${python}" else ""} + ''; + propagatedBuildInputs = [zlib]; - postInstall = "ensureDir $out/nix-support; cp ${./setup-hook.sh} $out/nix-support/setup-hook"; -} // (if pythonSupport then { - preConfigure = '' - sed -e "s^pythondir=.*$^pythondir=$(toPythonPath $out)^" < configure.old > configure - ''; -} else {})) + setupHook = ./setup-hook.sh; + + passthru = {inherit pythonSupport;}; + + meta = { + homepage = http://xmlsoft.org/; + description = "A XML parsing library for C"; + }; +} diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 7426ef1de24..5f8ec9dde1b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,13 +1,22 @@ {stdenv, fetchurl, libxml2}: -assert libxml2 != null; - stdenv.mkDerivation { name = "libxslt-1.1.24"; + src = fetchurl { url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz; sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e"; }; + buildInputs = [libxml2]; - postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/"; + + postInstall = '' + ensureDir $out/nix-support + ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ + ''; + + meta = { + homepage = http://xmlsoft.org/XSLT/; + description = "A C library and tools to do XSL transformations"; + }; } diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 2a5507ef006..0c2e13c5615 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,16 +1,17 @@ -args: with args; +{stdenv, fetchurl, zlib}: stdenv.mkDerivation { - name = "libzip-0.8"; - src = fetchurl { - url = http://www.nih.at/libzip/libzip-0.8.tar.gz; - sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss"; - }; - configureFlags = "--enable-shared --disable-static"; - buildInputs = [zlib]; + name = "libzip-0.8"; + + src = fetchurl { + url = http://www.nih.at/libzip/libzip-0.8.tar.gz; + sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss"; + }; + + buildInputs = [zlib]; - meta = { - homepage = http://www.nih.at/libzip; - description = "A C library for reading, creating and modifying zip archives"; - }; + meta = { + homepage = http://www.nih.at/libzip; + description = "A C library for reading, creating and modifying zip archives"; + }; } diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index c7a66b22c51..0e6c24bf61e 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,11 +1,19 @@ -{stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost, - apr, aprutil, db45, expat}: +{ stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost +, apr, aprutil, db45, expat +}: stdenv.mkDerivation { name = "log4cxx-0.10.0"; + src = fetchurl { url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; - buildInputs = [ autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat]; + + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat]; + + meta = { + homepage = http://logging.apache.org/log4cxx/index.html; + description = "A logging framework for C++ patterned after Apache log4j"; + }; } diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index c711e8a0ddf..40b66c44d58 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [gnutls libidn glib zlib]; + buildInputs = [pkgconfig]; - - configureFlags = "--enable-shared --disable-static"; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 6ce1e786dbe..6f5f43af562 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591"; }; - configureFlags = "--enable-shared --disable-static"; - meta = { description = "A data compresion library suitable for real-time data de-/compression"; homepage = http://www.oberhumer.com/opensource/lzo; diff --git a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix index 6391ce4dd6c..0d2cefee200 100644 --- a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix +++ b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix @@ -18,5 +18,5 @@ stdenv.mkDerivation rec { patches = [ ./h264.patch ./plugins.patch ]; - configureFlags = "--enable-external-ortp --enable-shared --disable-static"; + configureFlags = "--enable-external-ortp"; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2e4013f16ec..1b2bb06ac2c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,46 +1,20 @@ -{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm}: +{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}: -let - - target = - if stdenv.system == "i686-linux" then "linux-dri-x86" else - if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else - abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix - - # Missing file in 7.0.2. Can be removed for >= 7.0.3. - missingPC = fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/mesa/files/7.0.2-glw.pc.in?rev=1.1"; - sha256 = "1z4d50pllwi8g6n567dk3zxq4qmam79n72wr55mdqx0jrdj4fj0v"; - }; - -in +if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" then + throw "unsupported platform for Mesa" +else stdenv.mkDerivation { - name = "mesa-7.0.2"; + name = "mesa-7.4.1"; src = fetchurl { - url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2; - md5 = "93e6ed7924ff069a4f883b4fce5349dc"; + url = mirror://sourceforge/mesa3d/MesaLib-7.4.1.tar.bz2; + md5 = "423260578b653818ba66c2fcbde6d7ad"; }; -/* (fetchurl { - url = http://nixos.org/tarballs/MesaGLUT-6.4.tar.bz2; - md5 = "1a8c4d4fc699233f5fdb902b8753099e"; - }) - (fetchurl { - url = http://nixos.org/tarballs/MesaDemos-6.4.tar.bz2; - md5 = "1a8c4d4fc699233f5fdb902b8753099e"; - }) */ - - buildFlags = "${target}"; - - preBuild = " - makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL) - cp ${missingPC} src/glw/glw.pc.in - "; buildInputs = [ - pkgconfig x11 xlibs.makedepend libdrm xlibs.glproto xlibs.libXmu - xlibs.libXi xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage + pkgconfig expat x11 libdrm xlibs.glproto + xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto ]; passthru = {inherit libdrm;}; diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix index 8b29deba56f..684301b939d 100644 --- a/pkgs/development/libraries/mpeg2dec/default.nix +++ b/pkgs/development/libraries/mpeg2dec/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7"; }; - configureFlags = "--enable-shared --disable-static"; - meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index b74b8af02e1..b428578c562 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,17 +1,31 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation { - name = "mpfr-2.3.1"; + name = "mpfr-2.4.1"; src = fetchurl { - url = http://www.mpfr.org/mpfr-current/mpfr-2.3.1.tar.bz2; - sha256 = "0c44va4plxfd9zm7aa24173im38svnb15lbxql5hvxbc9bgzjmyq"; + url = http://www.mpfr.org/mpfr-2.4.1/mpfr-2.4.1.tar.bz2; + sha256 = "0pj879vbwbik8xkgnxy2ll32ljq3bgqjsqapqasq9rkfbkl90a34"; }; buildInputs = [gmp]; meta = { homepage = http://www.mpfr.org/; - description = "Library for multiple-precision floating-point arithmetic"; + description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; + + longDescription = '' + The GNU MPFR library is a C library for multiple-precision + floating-point computations with correct rounding. MPFR is + based on the GMP multiple-precision library. + + The main goal of MPFR is to provide a library for + multiple-precision floating-point computation which is both + efficient and has a well-defined semantics. It copies the good + ideas from the ANSI/IEEE-754 standard for double-precision + floating-point arithmetic (53-bit mantissa). + ''; + + license = "LGPLv2+"; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 1fb6c251e3c..d82c9de81f2 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,32 +1,54 @@ {stdenv, fetchurl, unicode ? true}: -stdenv.mkDerivation { - name = "ncurses-5.6"; +stdenv.mkDerivation rec { + name = "ncurses-5.7"; src = fetchurl { - url = mirror://gnu/ncurses/ncurses-5.6.tar.gz; - md5 = "b6593abe1089d6aab1551c105c9300e3"; + url = "mirror://gnu/ncurses/${name}.tar.gz"; + sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa"; }; - configureFlags = - "--with-shared --includedir=\${out}/include" + - (if unicode then " --enable-widec " else " ") + - " --without-debug"; + configureFlags = '' + --with-shared --includedir=''${out}/include --without-debug + ${if unicode then "--enable-widec" else ""} + ''; preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the # wide-character libraries (e.g. libncurses.so to libncursesw.so). - postInstall = if unicode then " + postInstall = if unicode then '' chmod -v 644 $out/lib/libncurses++w.a for lib in curses ncurses form panel menu; do - if test -e $out/lib/lib\${lib}w.a; then - rm -vf $out/lib/lib\${lib}.so - echo \"INPUT(-l\${lib}w)\" > $out/lib/lib\${lib}.so - ln -svf lib\${lib}w.a $out/lib/lib\${lib}.a - ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5 + if test -e $out/lib/lib''${lib}w.a; then + rm -vf $out/lib/lib$lib.so + echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so + ln -svf lib''${lib}w.a $out/lib/lib$lib.a + ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5 fi done; - " else ""; + '' else ""; + + meta = { + description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; + + longDescription = '' + The Ncurses (new curses) library is a free software emulation of + curses in System V Release 4.0, and more. It uses Terminfo + format, supports pads and color and multiple highlights and + forms characters and function-key mapping, and has all the other + SYSV-curses enhancements over BSD Curses. + + The ncurses code was developed under GNU/Linux. It has been in + use for some time with OpenBSD as the system curses library, and + on FreeBSD and NetBSD as an external package. It should port + easily to any ANSI/POSIX-conforming UNIX. It has even been + ported to OS/2 Warp! + ''; + + homepage = http://www.gnu.org/software/ncurses/; + + license = "X11"; + }; } diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix index 6c00fc9794a..c6dde2253bc 100644 --- a/pkgs/development/libraries/neon/0.26.nix +++ b/pkgs/development/libraries/neon/0.26.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' - --enable-shared --disable-static ${if compressionSupport then "--with-zlib" else "--without-zlib"} ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} + --enable-shared ''; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix index ff777688565..8373ed25d24 100644 --- a/pkgs/development/libraries/neon/0.28.nix +++ b/pkgs/development/libraries/neon/0.28.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { ${if static then "--enable-static" else "--disable-static"} ${if compressionSupport then "--with-zlib" else "--without-zlib"} ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} + --enable-shared ''; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 2b994edd74c..ca753867b5e 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation { name = "openbabel-2.2.1"; + src = fetchurl { url = mirror://sf/openbabel/openbabel-2.2.1.tar.gz; sha256 = "822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80"; }; -# TODO : perl & python bindings; -# TODO : wxGTK: I have no time to compile -# TODO : separate lib and apps + + # TODO : perl & python bindings; + # TODO : wxGTK: I have no time to compile + # TODO : separate lib and apps buildInputs = [ zlib libxml2 ]; - configureFlags = "--enable-shared --disable-static"; } diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 4d4aefc9581..bfb2c6b998a 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -11,5 +11,5 @@ stdenv.mkDerivation { }; buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl)); propagatedBuildInputs = [pkgconfig zlib ilmbase]; - configureFlags = "--enable-shared --disable-static --enable-imfexamples"; + configureFlags = "--enable-imfexamples"; } diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a5f5849284c..22f98535803 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,12 +1,23 @@ -args: with args; +{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: stdenv.mkDerivation { - name = "openldap-2.3.32"; + name = "openldap-2.4.13"; + src = fetchurl { - url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.3.32.tgz; - sha256 = "1pw6j8ag8nm91mccwb3p9wk7ccsfdb8jz5v6a5alfrq3npyck0j8"; + url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.4.13.tgz; + sha256 = "18l06v8z5wnr92m28bwxd27l6kw3i0gi00yivv603da6m76cm0ic"; }; - buildInputs = [openssl cyrus_sasl db4]; - configureFlags = "--disable-static"; + + buildInputs = [openssl cyrus_sasl db4 groff]; + dontPatchELF = 1; # !!! + + # Build on Glibc 2.9. + # http://www.openldap.org/lists/openldap-bugs/200808/msg00130.html + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + + meta = { + homepage = http://www.openldap.org/; + description = "An open source implementation of the Lightweight Directory Access Protocol"; + }; } diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh deleted file mode 100644 index 0ec9de37d76..00000000000 --- a/pkgs/development/libraries/openssl/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -configureScript=./config -configureFlags=shared - -postInstall=postInstall -postInstall() { - # Bug fix: openssl does a `chmod 644' on the pkgconfig directory. - chmod 755 $out/lib/pkgconfig -} - -genericBuild diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 709c78db1c7..3e593f5c049 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,11 +1,21 @@ {stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "openssl-0.9.8h"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "openssl-0.9.8k"; + src = fetchurl { - url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8h.tar.gz; - sha1 = "ced4f2da24a202e01ea22bef30ebc8aee274de86"; + url = http://www.openssl.org/source/openssl-0.9.8k.tar.gz; + sha1 = "3ba079f91d3c1ec90a36dcd1d43857165035703f"; }; + buildInputs = [perl]; + + configureScript = "./config"; + + configureFlags = "shared"; + + meta = { + homepage = http://www.openssl.org/; + description = "A cryptographic library that implements the SSL and TLS protocols"; + }; } diff --git a/pkgs/development/libraries/ortp/0.7.1.nix b/pkgs/development/libraries/ortp/0.7.1.nix deleted file mode 100644 index 7bedf39f8be..00000000000 --- a/pkgs/development/libraries/ortp/0.7.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -args: with args; -stdenv.mkDerivation rec { - name = "ortp-" + version; - - src = fetchurl { - url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "0gyl0yzfg78sjhbwnwc2g8yn4riwd1wcv183qihgan6z2d5cfbrg"; - }; - - configureFlags = "--enable-shared --disable-static"; - - meta = { - description = "a Real-Time Transport Protocol (RFC3550) stack under LGPL"; - homepage = http://www.linphone.org/index.php/eng/code_review/ortp; - }; -} diff --git a/pkgs/development/libraries/ortp/0.13.1.nix b/pkgs/development/libraries/ortp/default.nix similarity index 60% rename from pkgs/development/libraries/ortp/0.13.1.nix rename to pkgs/development/libraries/ortp/default.nix index ea1cd64b3d2..67d93152c2b 100644 --- a/pkgs/development/libraries/ortp/0.13.1.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,16 +1,15 @@ -args: with args; +{stdenv, fetchurl}: + stdenv.mkDerivation rec { - name = "ortp-" + version; + name = "ortp-0.13.1"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; sha256 = "0k2963v4b15xnf4cpkpgjhsb8ckxpf6vdr8dnw7z3mzilji7391b"; }; - configureFlags = "--enable-shared --disable-static"; - meta = { - description = "a Real-Time Transport Protocol (RFC3550) stack under LGPL"; + description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = http://www.linphone.org/index.php/eng/code_review/ortp; }; } diff --git a/pkgs/development/libraries/pcre/7.8.nix b/pkgs/development/libraries/pcre/7.8.nix deleted file mode 100644 index a9afb0c7cef..00000000000 --- a/pkgs/development/libraries/pcre/7.8.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: - -stdenv.mkDerivation { - name = "pcre-7.8"; - src = fetchurl { - url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2; - sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; - }; - configureFlags = - (if unicodeSupport then - "--enable-unicode-properties --enable-shared --disable-static" - else "") + - (if !cplusplusSupport then "--disable-cpp" else ""); -} diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 6baea4b6ff5..3d3385c83f8 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,14 +1,20 @@ {stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: stdenv.mkDerivation { - name = "pcre-7.4"; + name = "pcre-7.8"; + src = fetchurl { - url = mirror://sourceforge/pcre/pcre-7.4.tar.bz2; - sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5"; + url = mirror://sourceforge/pcre/pcre-7.8.tar.bz2; + sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; + }; + + configureFlags = '' + ${if unicodeSupport then "--enable-unicode-properties" else ""} + ${if !cplusplusSupport then "--disable-cpp" else ""} + ''; + + meta = { + homepage = http://www.pcre.org/; + description = "A library for Perl Compatible Regular Expressions"; }; - configureFlags = - (if unicodeSupport then - "--enable-unicode-properties --enable-shared --disable-static" - else "") + - (if !cplusplusSupport then "--disable-cpp" else ""); } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 6e3d649fc20..f0e4ef83d95 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk] ++ (if qt4Support then [qt4] else []); - configureFlags = "--enable-shared --disable-static --enable-exceptions - --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib - --enable-xpdf-headers " + configureFlags = + '' + --enable-exceptions --enable-cairo --enable-splash + --enable-poppler-glib --enable-zlib --enable-xpdf-headers + '' + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler"); patches = [ ./GDir-const.patch ./use_exceptions.patch ]; diff --git a/pkgs/development/libraries/popt/builder-1.10.6.sh b/pkgs/development/libraries/popt/builder-1.10.6.sh deleted file mode 100644 index a62cf96e643..00000000000 --- a/pkgs/development/libraries/popt/builder-1.10.6.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -preConfigure() { - autoreconf -i -} - -preConfigure=preConfigure - -genericBuild diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 3ce48f5b200..82fa564fa01 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1 +1,10 @@ -import ./popt-1.7.nix +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "popt-1.15"; + + src = fetchurl { + url = http://rpm5.org/files/popt/popt-1.15.tar.gz; + sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6"; + }; +} diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix deleted file mode 100644 index d82fa2b9fc7..00000000000 --- a/pkgs/development/libraries/popt/popt-1.7.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, gettext}: - -assert gettext != null; - -stdenv.mkDerivation { - name = "popt-1.7"; - src = fetchurl { - urls = [ - ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz - http://nixos.org/tarballs/popt-1.7.tar.gz - ]; - md5 = "5988e7aeb0ae4dac8d83561265984cc9"; - }; - buildInputs = [gettext]; -} diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index b403f036b0e..460ae17766a 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -1,10 +1,6 @@ source $stdenv/setup -ensureDir $out/nix-support -substitute "$hook" "$out/nix-support/setup-hook" --subst-var out - -preConfigure=preConfigure preConfigure() { # Patch some of the configure files a bit to get of global paths. @@ -30,7 +26,6 @@ configureScript() { } -postInstall=postInstall postInstall() { # Qt's `make install' is broken; it copies ./bin/qmake, which # is a symlink to ./qmake/qmake. So we end up with a dangling diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e26c9072076..e1bc3f89741 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation { name = "qt-3.3.8"; builder = ./builder.sh; - hook = ./setup-hook.sh; + + setupHook = ./setup-hook.sh; + src = fetchurl { url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index 60ac0f1432b..8224bd910a0 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -1,11 +1,11 @@ args: with args; stdenv.mkDerivation { - name = "qt-4.5.0"; + name = "qt-4.5.1"; src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.0.tar.bz2; - sha256 = "e1b356a54e65781ed94f19d785356a88daa8d38b9dbbca35439b80ca8c4a5be9"; + url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2; + sha256 = "b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/readline/6.0.nix b/pkgs/development/libraries/readline/6.0.nix deleted file mode 100644 index 667a46881fc..00000000000 --- a/pkgs/development/libraries/readline/6.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "readline-6.0"; - src = fetchurl { - url = mirror://gnu/readline/readline-6.0.tar.gz; - sha256 = "1pn13j6f9376kwki69050x3zh62yb1w31l37rws5nwr5q02xk68i"; - }; - propagatedBuildInputs = [ncurses]; - configureFlags = "--enable-shared --disable-static"; - patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; -} diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix index 96ec1ffea79..a36d7870cc2 100644 --- a/pkgs/development/libraries/readline/readline5.nix +++ b/pkgs/development/libraries/readline/readline5.nix @@ -7,6 +7,5 @@ stdenv.mkDerivation { sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; }; propagatedBuildInputs = [ncurses]; - configureFlags = "--enable-shared --disable-static"; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; } diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix new file mode 100644 index 00000000000..fcf89207da3 --- /dev/null +++ b/pkgs/development/libraries/readline/readline6.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv, ncurses }: + +stdenv.mkDerivation rec { + name = "readline-6.0"; + + src = fetchurl { + url = "mirror://gnu/readline/${name}.tar.gz"; + sha256 = "1pn13j6f9376kwki69050x3zh62yb1w31l37rws5nwr5q02xk68i"; + }; + + propagatedBuildInputs = [ncurses]; + + meta = { + description = "GNU Readline, a library for interactive line editing"; + + longDescription = '' + The GNU Readline library provides a set of functions for use by + applications that allow users to edit command lines as they are + typed in. Both Emacs and vi editing modes are available. The + Readline library includes additional functions to maintain a + list of previously-entered command lines, to recall and perhaps + reedit those lines, and perform csh-like history expansion on + previous commands. + + The history facilites are also placed into a separate library, + the History library, as part of the build process. The History + library may be used without Readline in applications which + desire its capabilities. + ''; + + homepage = http://savannah.gnu.org/projects/readline/; + + license = "GPLv3+"; + }; +} diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/default.nix index 0a73080a937..94e8a98f7c0 100644 --- a/pkgs/development/libraries/redland/default.nix +++ b/pkgs/development/libraries/redland/default.nix @@ -1,5 +1,5 @@ -args: -with args; +args: with args; + stdenv.mkDerivation rec { name = "redland-1.0.7"; @@ -7,9 +7,14 @@ stdenv.mkDerivation rec { url = "mirror://sf/librdf/${name}.tar.gz"; sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z"; }; + buildInputs = [pkgconfig]; - propagatedBuildInputs = [ bdb openssl libxslt perl mysql postgresql sqlite - curl pcre libxml2]; - configureFlags = "--disable-static --with-threads --with-bdb=${bdb}"; - patchPhase="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl"; + + propagatedBuildInputs = [ + bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2 + ]; + + configureFlags = "--with-threads --with-bdb=${bdb}"; + + patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl"; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 623d38b1852..86d2a627212 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [readline]; configureFlags = '' - ${if static then "--disable-shared --enable-static" else "--disable-static"} + ${if static then "--disable-shared --enable-static" else ""} --with-readline-inc=-I${readline}/include ''; diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix index 44affecefd8..67ffa950c95 100644 --- a/pkgs/development/libraries/telepathy-gabble/default.nix +++ b/pkgs/development/libraries/telepathy-gabble/default.nix @@ -1,17 +1,18 @@ args: with args; + stdenv.mkDerivation rec { - name = "telepathy-gabble-0.7.2"; + name = "telepathy-gabble-0.7.2"; - src = fetchurl { - url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "0r1j475a5s2a4f10hybmavf4kf6nrnjnv091dpic5nl2asdilb7i"; - }; + src = fetchurl { + url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; + sha256 = "0r1j475a5s2a4f10hybmavf4kf6nrnjnv091dpic5nl2asdilb7i"; + }; - propagatedBuildInputs = [telepathy_glib loudmouth]; - buildInputs = [pkgconfig libxslt]; - configureFlags = "--enable-shared --disable-static"; - - meta = { - homepage = http://telepathy.freedesktop.org; - }; + propagatedBuildInputs = [telepathy_glib loudmouth]; + + buildInputs = [pkgconfig libxslt]; + + meta = { + homepage = http://telepathy.freedesktop.org; + }; } diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix index fd4f59bdc8a..76485404568 100644 --- a/pkgs/development/libraries/telepathy-glib/default.nix +++ b/pkgs/development/libraries/telepathy-glib/default.nix @@ -1,17 +1,18 @@ args: with args; + stdenv.mkDerivation rec { - name = "telepathy-glib-0.7.0"; + name = "telepathy-glib-0.7.0"; - src = fetchurl { - url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "0hf1jrgisr7skrji7djh66q0ic351vlsm65xqy982p5d0axzxkz5"; - }; + src = fetchurl { + url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; + sha256 = "0hf1jrgisr7skrji7djh66q0ic351vlsm65xqy982p5d0axzxkz5"; + }; - propagatedBuildInputs = [dbus_glib glib python]; - buildInputs = [pkgconfig libxslt]; - configureFlags = "--enable-shared --disable-static"; - - meta = { - homepage = http://telepathy.freedesktop.org; - }; + propagatedBuildInputs = [dbus_glib glib python]; + + buildInputs = [pkgconfig libxslt]; + + meta = { + homepage = http://telepathy.freedesktop.org; + }; } diff --git a/pkgs/development/perl-modules/Font-TTF/default.nix b/pkgs/development/perl-modules/Font-TTF/default.nix new file mode 100644 index 00000000000..4072079a67f --- /dev/null +++ b/pkgs/development/perl-modules/Font-TTF/default.nix @@ -0,0 +1,10 @@ +{fetchurl, perl}: + +import ../generic perl { + name = "perl-Font-TTF-0.43"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz; + sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89"; + }; + perlPreHook = "makeMakerFlags=\"EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include\""; +} diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index f32a0bee249..4285623d1c8 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl" +PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" perlFlags= for i in $(IFS=:; echo $PERL5LIB); do @@ -8,7 +8,6 @@ for i in $(IFS=:; echo $PERL5LIB); do done oldPreConfigure="$preConfigure" -preConfigure=preConfigure preConfigure() { eval "$oldPreConfigure" @@ -26,10 +25,9 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out $makeMakerFlags + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags } -postFixup=postFixup postFixup() { # If a user installs a Perl package, she probably also wants its # dependencies in the user environment (since Perl modules don't @@ -38,15 +36,6 @@ postFixup() { if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi - - # Some (broken?) packages install in $out/lib/${perlVersion} - # instead of $out/lib/site_perl/${perlVersion}. Try to fix that - # automatically. - if ! test -e $out/lib/site_perl; then - echo "fixing wrong Perl installation path..." - ensureDir $out/lib/site_perl - mv $out/lib/5.* $out/lib/site_perl - fi } if test -n "$perlPreHook"; then diff --git a/pkgs/development/python-modules/pysqlite/builder.sh b/pkgs/development/python-modules/pysqlite/builder.sh index e1ca0e4a8fc..04027c22971 100644 --- a/pkgs/development/python-modules/pysqlite/builder.sh +++ b/pkgs/development/python-modules/pysqlite/builder.sh @@ -6,16 +6,13 @@ configurePhase() { --replace "/usr/local/lib" "$sqlite/lib" cp setup.cfg /tmp } -configurePhase=configurePhase buildPhase() { $python/bin/python setup.py build } -buildPhase=buildPhase installPhase() { $python/bin/python setup.py install --prefix=$out } -installPhase=installPhase genericBuild diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh index e4dce866c67..ed7177081f9 100644 --- a/pkgs/development/python-modules/wxPython/builder.sh +++ b/pkgs/development/python-modules/wxPython/builder.sh @@ -5,16 +5,13 @@ flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1" configurePhase() { cd wxPython } -configurePhase=configurePhase buildPhase() { python setup.py $flags build } -buildPhase=buildPhase installPhase() { python setup.py $flags install --prefix=$out } -installPhase=installPhase -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index fe92e74db0c..835b9000c68 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -1,8 +1,8 @@ addCMakeParams() { - addToSearchPath CMAKE_INCLUDE_PATH /include "" $1 - addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1 - addToSearchPath CMAKE_MODULE_PATH /share/cmake-@majorVersion@/Modules "" $1 + addToSearchPath CMAKE_INCLUDE_PATH $1/include + addToSearchPath CMAKE_LIBRARY_PATH $1/lib + addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules } fixCmakeFiles() diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index cd4c2a98939..09ac6b9142e 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, log2xmlSupport ? true}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "gnumake-3.81"; @@ -9,13 +9,11 @@ stdenv.mkDerivation { }; patches = - (if log2xmlSupport - # Provide nested log output for subsequent pretty-printing by - # nix-log2xml. - then [ ./log.patch ] - else []) - ++ [ + # Provide nested log output for subsequent pretty-printing by + # nix-log2xml. + ./log.patch + # Purity: don't look for library dependencies (of the form # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. # Likewise, when searching for included Makefiles, don't look in diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/log.patch index 3104e1f2bde..0f3ed6d7299 100644 --- a/pkgs/development/tools/build-managers/gnumake/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/log.patch @@ -1,6 +1,6 @@ diff -rc make-3.81-orig/job.c make-3.81/job.c *** make-3.81-orig/job.c 2006-03-20 04:03:04.000000000 +0100 ---- make-3.81/job.c 2008-02-20 17:41:25.000000000 +0100 +--- make-3.81/job.c 2009-01-19 19:37:28.000000000 +0100 *************** *** 1083,1089 **** appear. */ @@ -14,24 +14,24 @@ diff -rc make-3.81-orig/job.c make-3.81/job.c appear. */ message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "\e[3s\e[a%s\e[b" : (char *) 0, p); +! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p); /* Tell update_goal_chain that a command has been started on behalf of this target. It is important that this happens here and not in diff -rc make-3.81-orig/main.c make-3.81/main.c *** make-3.81-orig/main.c 2006-03-20 03:36:37.000000000 +0100 ---- make-3.81/main.c 2008-02-20 17:41:25.000000000 +0100 +--- make-3.81/main.c 2009-01-19 19:41:41.000000000 +0100 *************** *** 886,891 **** --- 886,900 ---- } -+ static void closeNesting() ++ static void close_nesting() + { -+ while (logNestingStdout--) ++ while (stdout_nesting_level--) + printf("\e[q"); -+ while (logNestingStderr--) ++ while (stderr_nesting_level--) + fprintf(stderr, "\e[q"); + } + @@ -41,25 +41,28 @@ diff -rc make-3.81-orig/main.c make-3.81/main.c main (int argc, char **argv) *************** *** 931,936 **** ---- 940,947 ---- +--- 940,950 ---- atexit (close_stdout); #endif -+ atexit(closeNesting); ++ atexit(close_nesting); ++ ++ if (getenv("NIX_INDENT_MAKE")) ++ enable_nested_output = 1; + /* Needed for OS/2 */ initialize_main(&argc, &argv); *************** *** 3095,3100 **** ---- 3106,3117 ---- +--- 3109,3120 ---- /* Use entire sentences to give the translators a fighting chance. */ -+ if (entering) ++ if (entering && enable_nested_output) + { + printf("\e[p"); -+ logNestingStdout++; ++ stdout_nesting_level++; + } + if (makelevel == 0) @@ -67,48 +70,56 @@ diff -rc make-3.81-orig/main.c make-3.81/main.c if (entering) *************** *** 3124,3129 **** ---- 3141,3155 ---- +--- 3144,3159 ---- printf (_("%s[%u]: Leaving directory `%s'\n"), program, makelevel, starting_directory); -+ if (!entering) ++ if (!entering && enable_nested_output) + { + printf("\e[q"); -+ logNestingStdout--; ++ stdout_nesting_level--; + } + /* Flush stdout to be sure this comes before any stderr output. */ fflush (stdout); } + -+ int logNestingStdout = 0; -+ int logNestingStderr = 0; ++ int enable_nested_output = 0; ++ int stdout_nesting_level = 0; ++ int stderr_nesting_level = 0; diff -rc make-3.81-orig/make.h make-3.81/make.h *** make-3.81-orig/make.h 2006-02-16 00:54:43.000000000 +0100 ---- make-3.81/make.h 2008-02-20 17:41:25.000000000 +0100 +--- make-3.81/make.h 2009-01-19 19:32:03.000000000 +0100 *************** *** 609,611 **** ---- 609,613 ---- +--- 609,614 ---- #define ENULLLOOP(_v,_c) do{ errno = 0; \ while (((_v)=_c)==0 && errno==EINTR); }while(0) -+ extern int logNestingStdout; -+ extern int logNestingStderr; ++ extern int enable_nested_output; ++ extern int stdout_nesting_level; ++ extern int stderr_nesting_level; diff -rc make-3.81-orig/remake.c make-3.81/remake.c *** make-3.81-orig/remake.c 2006-03-20 03:36:37.000000000 +0100 ---- make-3.81/remake.c 2008-02-20 17:44:01.000000000 +0100 +--- make-3.81/remake.c 2009-01-19 19:39:40.000000000 +0100 *************** *** 1120,1126 **** ---- 1120,1131 ---- +--- 1120,1137 ---- /* The normal case: start some commands. */ if (!touch_flag || file->cmds->any_recurse) { -+ log_working_directory (1); -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ logNestingStderr++; ++ if (enable_nested_output) ++ { ++ log_working_directory (1); ++ fprintf(stderr, "\e[pbuilding %s\n", file->name); ++ stderr_nesting_level++; ++ } execute_file_commands (file); -+ fprintf(stderr, "\e[q"); -+ logNestingStderr--; ++ if (enable_nested_output) ++ { ++ fprintf(stderr, "\e[q"); ++ stderr_nesting_level--; ++ } return; } diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix index 10aecf7c678..5296f0cbec3 100644 --- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl, perl, autoconf}: +{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}: stdenv.mkDerivation rec { name = "automake-1.10.2"; builder = ./builder.sh; + setupHook = ./setup-hook.sh; src = fetchurl { @@ -11,12 +12,14 @@ stdenv.mkDerivation rec { sha256 = "03v4gsvi71nhqvnxxbhkrksdg5icrn8yda021852njfragzck2n3"; }; - patches = [ ./test-broken-make.patch ]; + buildInputs = [perl autoconf makeWrapper]; - buildInputs = [perl autoconf]; - - doCheck = true; + inherit doCheck; + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix index fc34ef8e3aa..e0d8e516d3b 100644 --- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.7.x.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, perl, autoconf}: +{stdenv, fetchurl, perl, autoconf, makeWrapper}: stdenv.mkDerivation { name = "automake-1.7.9"; + builder = ./builder.sh; - setupHook = ./setup-hook.sh; + src = fetchurl { url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2; md5 = "571fd0b0598eb2a27dcf68adcfddfacb"; }; - buildInputs = [perl autoconf]; + + buildInputs = [perl autoconf makeWrapper]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix index ccc2c6baac6..5ca279d23ad 100644 --- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix @@ -1,16 +1,33 @@ -{stdenv, fetchurl, perl, autoconf}: +{stdenv, fetchurl, perl, autoconf, makeWrapper}: stdenv.mkDerivation { name = "automake-1.9.6"; + builder = ./builder.sh; + setupHook = ./setup-hook.sh; + src = fetchurl { url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz; md5 = "c60f77a42f103606981d456f1615f5b4"; }; - buildInputs = [perl autoconf]; + + buildInputs = [perl autoconf makeWrapper]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + + meta = { + homepage = http://www.gnu.org/software/automake/; + description = "GNU Automake, a GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = "GPLv2+"; + }; } diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 0f5e955f880..6b0cd7e4fa2 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -2,46 +2,25 @@ source $stdenv/setup postInstall() { - # Create a wrapper around `aclocal' that converts every element in # `ACLOCAL_PATH' into a `-I dir' option. This way `aclocal' # becomes modular; M4 macros do not need to be stored in a single # global directory, while callers of `aclocal' do not need to pass # `-I' options explicitly. - mv $out/bin/aclocal $out/bin/_tmp - - for i in $out/bin/aclocal*; do - rm $i - ln -s aclocal $i - done - - cat > $out/bin/aclocal <str, path, ignore_requires, ignore_private_libs); + + g_string_truncate (str, 0); + } +--- 1105,1112 ---- + { + one_line = TRUE; + +! parse_line (pkg, str->str, path, ignore_requires, +! ignore_requires_private, ignore_private_libs); + + g_string_truncate (str, 0); + } +diff -rc pkg-config-0.23-orig/parse.h pkg-config-0.23/parse.h +*** pkg-config-0.23-orig/parse.h 2008-01-16 21:42:49.000000000 +0100 +--- pkg-config-0.23/parse.h 2008-10-13 14:41:42.000000000 +0200 +*************** +*** 23,28 **** +--- 23,29 ---- + #include "pkg.h" + + Package *parse_package_file (const char *path, gboolean ignore_requires, ++ gboolean ignore_requires_private, + gboolean ignore_private_libs); + + Package *get_compat_package (const char *name); +diff -rc pkg-config-0.23-orig/pkg.c pkg-config-0.23/pkg.c +*** pkg-config-0.23-orig/pkg.c 2008-01-16 22:59:49.000000000 +0100 +--- pkg-config-0.23/pkg.c 2008-10-13 14:41:42.000000000 +0200 +*************** +*** 55,60 **** +--- 55,61 ---- + + gboolean disable_uninstalled = FALSE; + gboolean ignore_requires = FALSE; ++ gboolean ignore_requires_private = FALSE; + gboolean ignore_private_libs = TRUE; + + void +*************** +*** 337,343 **** + } + + debug_spew ("Reading '%s' from file '%s'\n", name, location); +! pkg = parse_package_file (location, ignore_requires, ignore_private_libs); + + if (pkg == NULL) + { +--- 338,345 ---- + } + + debug_spew ("Reading '%s' from file '%s'\n", name, location); +! pkg = parse_package_file (location, ignore_requires, ignore_requires_private, +! ignore_private_libs); + + if (pkg == NULL) + { +*************** +*** 1506,1511 **** +--- 1508,1514 ---- + int mlen = 0; + + ignore_requires = TRUE; ++ ignore_requires_private = TRUE; + + g_hash_table_foreach (locations, max_len_foreach, &mlen); + g_hash_table_foreach (locations, packages_foreach, GINT_TO_POINTER (mlen + 1)); +*************** +*** 1522,1524 **** +--- 1525,1551 ---- + { + ignore_private_libs = TRUE; + } ++ ++ void ++ enable_requires(void) ++ { ++ ignore_requires = FALSE; ++ } ++ ++ void ++ disable_requires(void) ++ { ++ ignore_requires = TRUE; ++ } ++ ++ void ++ enable_requires_private(void) ++ { ++ ignore_requires_private = FALSE; ++ } ++ ++ void ++ disable_requires_private(void) ++ { ++ ignore_requires_private = TRUE; ++ } +diff -rc pkg-config-0.23-orig/pkg.h pkg-config-0.23/pkg.h +*** pkg-config-0.23-orig/pkg.h 2008-01-16 22:27:19.000000000 +0100 +--- pkg-config-0.23/pkg.h 2008-10-13 14:41:42.000000000 +0200 +*************** +*** 120,125 **** +--- 120,131 ---- + void enable_private_libs(void); + void disable_private_libs(void); + ++ void enable_requires(void); ++ void disable_requires(void); ++ ++ void enable_requires_private(void); ++ void disable_requires_private(void); ++ + /* If TRUE, do not automatically prefer uninstalled versions */ + extern gboolean disable_uninstalled; + diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index ccb48c129e7..ea592b36d11 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -1,6 +1,6 @@ addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 - addToSearchPath PKG_CONFIG_PATH /share/pkgconfig "" $1 + addToSearchPath PKG_CONFIG_PATH $1/lib/pkgconfig + addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig } envHooks=(${envHooks[@]} addPkgConfigPath) diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix index ba1abdf9445..9f154684f2c 100644 --- a/pkgs/development/tools/misc/texinfo/default.nix +++ b/pkgs/development/tools/misc/texinfo/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { unpackCmd = "lzma -d < $src | tar xv"; - doCheck = true; + # Disabled because we don't have zdiff in the stdenv bootstrap. + #doCheck = true; meta = { description = "GNU Texinfo, the GNU documentation system"; diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh index 42fe7fdd624..090def7c464 100644 --- a/pkgs/development/tools/parsing/jikespg/builder.sh +++ b/pkgs/development/tools/parsing/jikespg/builder.sh @@ -2,16 +2,14 @@ source $stdenv/setup set -e -configurePhase=configurePhase configurePhase() { tar zxvf $src cd jikespg/src } -installPhase=installPhase installPhase() { ensureDir $out/bin cp jikespg $out/bin } -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/games/exult/builder.sh b/pkgs/games/exult/builder.sh index 33ed6ffd3fe..b13e8c6d234 100644 --- a/pkgs/games/exult/builder.sh +++ b/pkgs/games/exult/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -postInstall=postInstall postInstall() { ensureDir $out/share/exult/music for i in $musicFiles; do diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 3be143d6a21..1348a15bdba 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -123,5 +123,9 @@ rec { else f (path ++ [name]) value; in mapAttrs g set; in recurse [] set; - + + + /* Check whether the argument is a derivation. */ + isDerivation = x: isAttrs x && x ? type && x.type == "derivation"; + } diff --git a/pkgs/misc/busybox/builder.sh b/pkgs/misc/busybox/builder.sh deleted file mode 100644 index bee57504f93..00000000000 --- a/pkgs/misc/busybox/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -export installFlags="PREFIX=$out" - -preBuild() { - cp $config .config - make include/bb_config.h -} - -preBuild=preBuild - -genericBuild diff --git a/pkgs/misc/busybox/busybox-1.2.nix b/pkgs/misc/busybox/busybox-1.2.nix index 7806088a164..ce88e194d9f 100644 --- a/pkgs/misc/busybox/busybox-1.2.nix +++ b/pkgs/misc/busybox/busybox-1.2.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "busybox-1.2.2.1"; - builder = ./builder.sh; src = fetchurl { url = http://busybox.net/downloads/busybox-1.2.2.1.tar.bz2; @@ -10,7 +9,13 @@ stdenv.mkDerivation { }; # inherit gccCross; + # buildinputs = [binutilsCross]; + # fixme, need a decent config for MIPS or so - config = ./x86-config-1.2; + preBuild = '' + installFlags="PREFIX=$out" + cp ${./x86-config-1.2} .config + make include/bb_config.h + ''; } diff --git a/pkgs/misc/emulators/atari800/builder.sh b/pkgs/misc/emulators/atari800/builder.sh index 04351a9bca1..f0fcb5150c8 100644 --- a/pkgs/misc/emulators/atari800/builder.sh +++ b/pkgs/misc/emulators/atari800/builder.sh @@ -1,11 +1,9 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { cd src } -postInstall=postInstall postInstall() { romsDir=$out/share/atari800/roms ensureDir $romsDir diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 84f59075d73..2a4c66c43b9 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { }; buildInputs = [SDL]; + + # Add missing includes in order to fix compilation with glibc 2.9 + patchPhase = '' + echo "#include " > tmp.cpp + for i in src/hardware/gameblaster.cpp src/hardware/tandy_sound.cpp + do + cat tmp.cpp $i > $i.new + mv $i.new $i + done + echo "#include " > tmp.cpp + cat tmp.cpp src/shell/shell_cmds.cpp > src/shell/shell_cmds.cpp.new + mv src/shell/shell_cmds.cpp.new src/shell/shell_cmds.cpp + ''; meta = { homepage = http://www.dosbox.com/; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 7208b01a18c..3266a912ca8 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -4,6 +4,7 @@ }: assert stdenv.isLinux; +assert stdenv.gcc.gcc != null; let lib = import ../../../lib/default.nix; in diff --git a/pkgs/misc/ghostscript/builder.sh b/pkgs/misc/ghostscript/builder.sh index d2e33f26bfc..361b7f77f0c 100644 --- a/pkgs/misc/ghostscript/builder.sh +++ b/pkgs/misc/ghostscript/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { # "ijs" is impure: it contains symlinks to /usr/share/automake etc.! rm -rf ijs/ltmain.sh @@ -11,7 +10,6 @@ preConfigure() { installTargets="install install-so install-data install-doc install-man" -postInstall=postInstall postInstall() { for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 6f9aa8530b6..0e2f22b9a29 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -34,10 +34,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x11Support x11 ++ stdenv.lib.optional cupsSupport cups; - configureFlags = " - --disable-static + configureFlags = '' ${if x11Support then "--with-x" else "--without-x"} - "; + ''; NIX_CFLAGS_COMPILE = "-fpic"; diff --git a/pkgs/misc/linuxwacom/builder.sh b/pkgs/misc/linuxwacom/builder.sh deleted file mode 100644 index d38726c7efb..00000000000 --- a/pkgs/misc/linuxwacom/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -postInstall() { - if test -n "$udevSupport"; then - ensureDir $out/etc/udev/rules.d - cp $udevRules $out/etc/udev/rules.d/10-wacom.rules - fi -} - -postInstall=postInstall - -genericBuild diff --git a/pkgs/misc/linuxwacom/default.nix b/pkgs/misc/linuxwacom/default.nix index 7fbf62b0589..8b1c2ced55b 100644 --- a/pkgs/misc/linuxwacom/default.nix +++ b/pkgs/misc/linuxwacom/default.nix @@ -2,12 +2,18 @@ stdenv.mkDerivation { name = "linuxwacom-0.7.2"; - builder = ./builder.sh; + src = fetchurl { url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2; md5 = "3f6290101d5712a24097243ca9f092ed"; }; + buildInputs = [libX11 libXi]; - udevRules = ./10-wacom.rules; - inherit udevSupport; + + postInstall = '' + if test -n "${toString udevSupport}"; then + ensureDir $out/etc/udev/rules.d + cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules + fi + ''; } diff --git a/pkgs/misc/my_env/default.nix b/pkgs/misc/my_env/default.nix new file mode 100644 index 00000000000..9853041832d --- /dev/null +++ b/pkgs/misc/my_env/default.nix @@ -0,0 +1,58 @@ +# idea: provide nix environment for your developement actions +# experimental + +/* + # example: + # add postgresql to environment and create ctags (tagfiles can be extracted from TAG_FILES) + # add this to your ~/.nixpkgs/config.nix + + devEnvs = pkgs : with pkgs; with sourceAndTags; + let simple = { name, buildInputs ? [], cTags ? [] }: + pkgs.myEnvFun { + inherit name stdenv; + buildInputs = buildInputs + ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags; + extraCmds = ". ~/.bashrc; cd $PWD + # configure should find them + export LDFLAGS=$NIX_LDFLAGS + export CFLAGS=$NIX_CFLAGS_COMPILE + "; + preBuild = "export TAG_FILES"; + }; + in { + postgresql = simple { + name = "postgresql"; + buildInputs = [postgresql]; + cTags = [postgresql ]; + }; + }; + + Put this into your .bashrc + loadEnv(){ . "${HOME}/.nix-profile/dev-envs/${1}" } + then install and + $ loadEnv postgresql + +*/ + +args: args.stdenv.mkDerivation ( + { extraCmds =""; } // { + phases = "buildPhase"; + buildPhase = '' + eval "$preBuild" + name=${args.name} + o=$out/dev-envs/$name + ensureDir `dirname $o` + echo " + OLDPATH=\$PATH " >> $o + export | grep -v HOME= | grep -v PATH= | grep -v PWD= | grep -v TEMP= | grep -v TMP= >> $o + echo " + PATH=$PATH:$OLDPATH + for i in \$buildInputs; do + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$i/lib + done + export PATH=\$PATH:\$OLDPATH + $extraCmds + echo env $name loaded + " >> $o + ''; +} // args // { name = "${args.name}-env"; } ) diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/misc/ntfs-3g/default.nix index 5fedd9a7386..511a4e1eadf 100644 --- a/pkgs/misc/ntfs-3g/default.nix +++ b/pkgs/misc/ntfs-3g/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace /bin/umount ${utillinux}/bin/umount ''; - configureFlags = "--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; + configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; meta = { homepage = http://www.ntfs-3g.org; diff --git a/pkgs/misc/sane-backends/builder.sh b/pkgs/misc/sane-backends/builder.sh deleted file mode 100644 index 5c40eaaa9b9..00000000000 --- a/pkgs/misc/sane-backends/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -postInstall() { - if test "$udevSupport" = "1" ; then - ensureDir $out/etc/udev/rules.d/ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules - fi -} - -postInstall=postInstall - -genericBuild diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 561e053416e..a24e72d70e6 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -5,17 +5,27 @@ assert hotplugSupport -> stdenv.system == "i686-linux"; stdenv.mkDerivation { name = "sane-backends-1.0.18"; - builder = ./builder.sh; + src = fetchurl { url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz; md5 = "7ca7e2908e24721471de92cf40c75e60"; }; + udevSupport = hotplugSupport; - buildInputs = (if libusb != null then [libusb] else []); + buildInputs = if libusb != null then [libusb] else []; - preInstall = (if gt68xxFirmware != null then - "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + - (gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb " - else ""); + postInstall = '' + if test "$udevSupport" = "1"; then + ensureDir $out/etc/udev/rules.d/ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules + fi + ''; + + preInstall = + if gt68xxFirmware != null then + "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + + (gt68xxFirmware {inherit fetchurl;}) + + " \${out}/share/sane/gt68xx/PS1fw.usb " + else ""; } diff --git a/pkgs/misc/tex/tetex/builder.sh b/pkgs/misc/tex/tetex/builder.sh index b43b7ed93ec..0611f676347 100644 --- a/pkgs/misc/tex/tetex/builder.sh +++ b/pkgs/misc/tex/tetex/builder.sh @@ -19,10 +19,4 @@ configureFlags="\ --with-system-ncurses \ " -postInstall() { - ensureDir "$out/nix-support" - cp $setupHook $out/nix-support/setup-hook -} -postInstall=postInstall - genericBuild diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix new file mode 100644 index 00000000000..4918638b2a1 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "alsa-lib-1.0.19"; + src = fetchurl { + url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2; + sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij"; + }; + configureFlags = "--disable-xmlto"; + # Fix pcm.h file in order to prevent some compilation bugs + patchPhase = '' + sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h + ''; + meta = { + description = "ALSA, the Advanced Linux Sound Architecture libraries"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + homepage = http://www.alsa-project.org/; + }; +} diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix new file mode 100644 index 00000000000..cca6a75ce0a --- /dev/null +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, alsaLib, gettext, ncurses}: + +stdenv.mkDerivation { + name = "alsa-utils-1.0.19"; + src = fetchurl { + url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2; + sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z"; + }; + buildInputs = [ alsaLib gettext ncurses ]; + configureFlags = "--disable-xmlto"; + + meta = { + description = "ALSA, the Advanced Linux Sound Architecture utils"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + homepage = http://www.alsa-project.org/; + }; +} diff --git a/pkgs/os-specific/linux/alsa/1.0.14.nix b/pkgs/os-specific/linux/alsa/1.0.14.nix deleted file mode 100644 index c7799af559a..00000000000 --- a/pkgs/os-specific/linux/alsa/1.0.14.nix +++ /dev/null @@ -1,14 +0,0 @@ -args: with args; - -rec { - alsaLib = (import ./common.nix) { - aName = "lib"; - sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1"; - } args; - - alsaUtils = (import ./common.nix) { - aName = "utils"; - sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h"; - buildInputs = [alsaLib ncurses gettext]; - } args; -} diff --git a/pkgs/os-specific/linux/alsa/1.0.16.nix b/pkgs/os-specific/linux/alsa/1.0.16.nix deleted file mode 100644 index 5cac6f268aa..00000000000 --- a/pkgs/os-specific/linux/alsa/1.0.16.nix +++ /dev/null @@ -1,14 +0,0 @@ -args: with args; - -rec { - alsaLib = (import ./common.nix) { - aName = "lib"; - sha256 = "1k96razf5h7blidh5ib54plcrfnbysvwm7vhvz28b4cy20zv66df"; - } args; - - alsaUtils = (import ./common.nix) { - aName = "utils"; - sha256 = "10bj4pw2hp3f6qzkxsrlnvsxjlpqha696fn10gzdnnzym072skzb"; - buildInputs = [alsaLib ncurses gettext]; - } args; -} diff --git a/pkgs/os-specific/linux/alsa/1.0.19.nix b/pkgs/os-specific/linux/alsa/1.0.19.nix deleted file mode 100644 index 60c848fcacc..00000000000 --- a/pkgs/os-specific/linux/alsa/1.0.19.nix +++ /dev/null @@ -1,14 +0,0 @@ -args: with args; - -rec { - alsaLib = (import ./common.nix) { - aName = "lib"; - sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij"; - } args; - - alsaUtils = (import ./common.nix) { - aName = "utils"; - sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z"; - buildInputs = [alsaLib ncurses gettext]; - } args; -} diff --git a/pkgs/os-specific/linux/alsa/common.nix b/pkgs/os-specific/linux/alsa/common.nix deleted file mode 100644 index b14d458d737..00000000000 --- a/pkgs/os-specific/linux/alsa/common.nix +++ /dev/null @@ -1,22 +0,0 @@ -{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } : -args: with args; stdenv.mkDerivation rec { - name = "alsa-" + aName + "-" + version; - - src = fetchurl { - url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2"; - inherit sha256; - }; - - inherit buildInputs propagatedBuildInputs; - - meta = { - description = "ALSA, the Advanced Linux Sound Architecture (${aName})"; - - longDescription = '' - The Advanced Linux Sound Architecture (ALSA) provides audio and - MIDI functionality to the Linux-based operating system. - ''; - - homepage = http://www.alsa-project.org/; - }; -} diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index f2ee49ef75b..cdf06103f68 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,16 +1,17 @@ {stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}: -assert stdenv.isLinux; +assert stdenv.isLinux && stdenv.system != "powerpc-linux"; stdenv.mkDerivation { name = "cpufrequtils-005"; + src = fetchurl { url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz; md5 = "100a8220a546ce61ce943d4107e67db9"; }; patchPhase = '' - sed -e "s@= /usr/bin/@= @g" \ + sed -e "s@= /usr/bin/@= @g" \ -e "s@/usr/@$out/@" \ -i Makefile ''; diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh index 50779de8f99..ee0cb2b7522 100644 --- a/pkgs/os-specific/linux/dietlibc/builder.sh +++ b/pkgs/os-specific/linux/dietlibc/builder.sh @@ -3,7 +3,6 @@ source $stdenv/setup makeFlags="prefix=$out" installFlags="prefix=$out" -postInstall=postInstall postInstall() { (cd $out && ln -s lib-* lib) (cd $out/lib && ln -s start.o crt1.o) diff --git a/pkgs/os-specific/linux/initscripts/builder.sh b/pkgs/os-specific/linux/initscripts/builder.sh deleted file mode 100644 index 37bc538d692..00000000000 --- a/pkgs/os-specific/linux/initscripts/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source $stdenv/setup - -export ROOT=$out - -buildPhase() { - cd src - make -} - -buildPhase=buildPhase - -installPhase() { - make install - cd ..; cp -af rc.d sysconfig ppp $ROOT/etc - -} - -installPhase=installPhase - -genericBuild diff --git a/pkgs/os-specific/linux/initscripts/default.nix b/pkgs/os-specific/linux/initscripts/default.nix deleted file mode 100644 index acb13826515..00000000000 --- a/pkgs/os-specific/linux/initscripts/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, popt, pkgconfig, glib}: - -stdenv.mkDerivation { - name = "initscripts-8.18"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/initscripts-8.18.tar.bz2; - md5 = "1b89ac4d344f1f20fe5022a198b69915"; - }; - buildInputs = [popt pkgconfig glib]; - patches = [./initscripts-8.18.patch]; -} diff --git a/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch b/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch deleted file mode 100644 index c548b99b4f1..00000000000 --- a/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ruN initscripts-8.18/src/Makefile initscripts-8.18.new/src/Makefile ---- initscripts-8.18/src/Makefile 2005-03-31 22:52:04.000000000 +0200 -+++ initscripts-8.18.new/src/Makefile 2005-12-12 17:54:14.000000000 +0100 -@@ -1,12 +1,13 @@ - CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE - - PROGS=usernetctl doexec netreport testd usleep ipcalc initlog \ -- getkey ppp-watch consoletype genhostid kmodule -+ getkey consoletype genhostid -+ #getkey ppp-watch consoletype genhostid kmodule - PPPWATCH_OBJS=ppp-watch.o shvar.o - INITLOG_OBJS=initlog.o process.o - USLEEP_OBJS=usleep.o - --mandir=/usr/share/man -+mandir= - - all: $(PROGS) - -@@ -14,9 +15,9 @@ - rm -f $(PROGS) *.o - - install: -- mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc -+ mkdir -p $(ROOT)/bin $(ROOT)/sbin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc - install -m 755 doexec $(ROOT)/bin/doexec -- install -m 755 kmodule $(ROOT)/sbin/kmodule -+ #install -m 755 kmodule $(ROOT)/sbin/kmodule - install -m 755 usleep $(ROOT)/bin/usleep - install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl - install -m 2755 netreport $(ROOT)/sbin/netreport -@@ -24,7 +25,7 @@ - install -m 755 genhostid $(ROOT)/sbin/genhostid - install -m 755 initlog $(ROOT)/sbin/initlog - install -m 755 getkey $(ROOT)/sbin/getkey -- install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch -+ #install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch - install -m 755 consoletype $(ROOT)/sbin/consoletype - install -m 644 initlog.1 $(ROOT)$(mandir)/man1 - install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 -@@ -32,7 +33,7 @@ - install -m 644 netreport.1 $(ROOT)$(mandir)/man1 - install -m 644 usleep.1 $(ROOT)$(mandir)/man1 - install -m 644 usernetctl.8 $(ROOT)$(mandir)/man8 -- install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8 -+ #install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8 - install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1 - install -m 644 consoletype.1 $(ROOT)$(mandir)/man1 - install -m 644 initlog.conf $(ROOT)/etc diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 354419a4109..14bd1b2b323 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, kernelHeaders, glibc}: -assert stdenv.isLinux; +assert stdenv.isLinux && stdenv.system != "powerpc-linux"; stdenv.mkDerivation { name = "iputils-20020927"; diff --git a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh index 277246a27d0..3bc4abc9233 100644 --- a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh +++ b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh @@ -5,8 +5,6 @@ buildPhase() { make include/linux/version.h } -buildPhase=buildPhase - installPhase() { mkdir $out @@ -29,7 +27,5 @@ installPhase() { echo -n > $out/include/linux/autoconf.h } -installPhase=installPhase - genericBuild diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix b/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix deleted file mode 100644 index 2f0b00fcd5f..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl}: - -assert stdenv.isLinux; - -stdenv.mkDerivation { - name = "linux-headers-2.6.21.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.21.3.tar.bz2"; - sha256 = "17rxvw42z4amijb8nya54c2h6bb8gnxnr628arv8shmsccf8qsp5"; - }; - - platform = - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - abort "don't know what the kernel include directory is called for this platform"; - - extraIncludeDirs = - if stdenv.system == "powerpc-linux" then ["ppc"] else []; -} diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix similarity index 77% rename from pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix rename to pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix index c6d1cc409fc..b585c462a28 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix @@ -3,13 +3,13 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "linux-headers-2.6.25.4"; + name = "linux-headers-2.6.27.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.25.4.tar.bz2"; - sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3"; + url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2"; + sha256 = "0pgh2zg4md9jvv64s03m3dkwdnliygjl7mxjmg1qki89jc2s62ik"; }; platform = diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index 0439afe102d..3136f52db8e 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -2,14 +2,14 @@ assert stdenv.isLinux; -let version = "2.6.28"; in +let version = "2.6.28.5"; in stdenv.mkDerivation { name = "linux-headers-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1023nl992s4qmnwzbfz385azzpph58azi5rw4w0wwzzybv2rf3df"; + sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9"; }; platform = diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 84064134d01..823e2139c55 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup -configurePhase=configurePhase configurePhase() { if test -n "$preConfigure"; then eval "$preConfigure"; @@ -56,7 +55,6 @@ configurePhase() { } -installPhase=installPhase installPhase() { ensureDir $out diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh index 7bb77608cf9..4ae5a9d080b 100644 --- a/pkgs/os-specific/linux/klibc/builder.sh +++ b/pkgs/os-specific/linux/klibc/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preBuild=preBuild preBuild() { mkdir -p linux/include cp -prd $kernel/lib/modules/*/build/include/* linux/include/ diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh index 7493b6f6df4..744d1d516a3 100644 --- a/pkgs/os-specific/linux/kudzu/builder.sh +++ b/pkgs/os-specific/linux/kudzu/builder.sh @@ -10,6 +10,4 @@ preInstall() { make install-program } -preInstall=preInstall - genericBuild diff --git a/pkgs/os-specific/linux/kvm/74.nix b/pkgs/os-specific/linux/kvm/74.nix new file mode 100644 index 00000000000..6d1a15baef8 --- /dev/null +++ b/pkgs/os-specific/linux/kvm/74.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}: + +assert stdenv.isLinux; + +stdenv.mkDerivation { + name = "kvm-74"; + + src = fetchurl { + url = mirror://sourceforge/kvm/kvm-74.tar.gz; + sha256 = "0gnd5r9wb8mar3jh8gv46vdm3qkbgiwzkim5ki67kx3ca71g0m24"; + }; + + patches = [ + # Allow setting the path to Samba through $QEMU_SMBD_COMMAND. + ./smbd-path.patch + # The makefile copies stuff from the kernel directory and then + # tries to modify the copy, but it must be made writable first. + ./readonly-kernel-r2.patch + ]; + + configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}"; + + # e2fsprogs is needed for libuuid. + # rsync is a weird dependency used for copying kernel header files. + buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync]; + + preConfigure = '' + for i in configure user/configure; do + substituteInPlace $i --replace /bin/bash $shell + done + substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack + ''; + + meta = { + homepage = http://kvm.qumranet.com/; + description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; + }; +} diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 87737bd28cc..567463cf3fb 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchurl, libxml2}: -stdenv.mkDerivation { - name = "libsmbios-0.13.6"; +stdenv.mkDerivation rec { + name = "libsmbios-2.0.3"; + src = fetchurl { - url = http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-0.13.6/libsmbios-0.13.6.tar.gz; - sha256 = "0zjch3xzyr289x64wzaj67l4jj0x645krxmx4yqn18hp2innfffs"; + url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz"; + sha256 = "1mgabn7r8pzi9f7zb4pvlmfm8jmrz1dcijz6nckvcnzxxi02pv4c"; }; + buildInputs = [libxml2]; - configureFlags = "--disable-static"; # bloated enough as it is... - - # `make install' forgets to install the header files. - postInstall = " - ensureDir $out/include - cp -prvd include/smbios $out/include/ - "; + + meta = { + homepage = http://linux.dell.com/libsmbios/main/index.html; + description = "A library to obtain BIOS information"; + }; } diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/module-init-tools/aggregator.nix index f11642b9a68..cc4e6ab3552 100644 --- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix +++ b/pkgs/os-specific/linux/module-init-tools/aggregator.nix @@ -1,28 +1,27 @@ -{stdenv, module_init_tools, modules}: +{stdenv, module_init_tools, modules, buildEnv}: -stdenv.mkDerivation { +buildEnv { name = "kernel-modules"; - buildCommand = '' - ensureDir $out/lib/modules - cd $out/ - modules="${toString modules}" - for i in $modules; do - cp -rfs $i/* . - chmod -R u+w . - v=$(cd $i/lib/modules && ls -d *) - if test -n "$version" -a "$v" != "$version"; then - echo "kernel version mismatch: $version versus $v (in the module paths $modules)"; - exit 1 - fi - version=$v - done - echo "kernel version is $version" - rm -rf nix-support - cd lib/modules/ - rm */modules.* - # linux-* will pass the new kernel version to depmod to take rather than `uname -r` (see man page) - MODULE_DIR=$PWD/ ${module_init_tools}/sbin/depmod -a $(basename lib/modules/2.*) - cd $out/ - ''; + paths = modules; + + postBuild = + '' + source ${stdenv}/setup + + kernelVersion=$(cd $out/lib/modules && ls -d *) + if test "$(echo $kernelVersion | wc -w)" != 1; then + echo "inconsistent kernel versions: $kernelVersion" + exit 1 + fi + + echo "kernel version is $kernelVersion" + + # Regenerate the depmod map files. Be sure to pass an explicit + # kernel version number, otherwise depmod will use `uname -r'. + if test -w $out/lib/modules/$kernelVersion; then + rm -f $out/lib/modules/$kernelVersion/modules.* + MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion + fi + ''; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 77d6d306c01..77c0dc3770e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib xlibs.libXv + gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib + xlibs.libXv xlibs.libXrandr ]; meta = { diff --git a/pkgs/os-specific/linux/pam/builder.sh b/pkgs/os-specific/linux/pam/builder.sh deleted file mode 100644 index 531ae2c0b90..00000000000 --- a/pkgs/os-specific/linux/pam/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -export CRACKLIB_DICTPATH=$cracklib/lib - -configureFlags="--enable-includedir=$out/include" - -genericBuild diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 9120a121732..345211f5226 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,12 +1,18 @@ {stdenv, fetchurl, cracklib, flex}: stdenv.mkDerivation { - name = "linux-pam-0.99.6.3"; - builder = ./builder.sh; + name = "linux-pam-1.0.3"; + src = fetchurl { - url = mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-0.99.6.3.tar.bz2; - md5 = "4c2830ed55a41e795af6a482009a036c"; + url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.0.3.tar.bz2; + sha256 = "1xqj4ibnid5w3pi629vj7jiddf192kzm8rbm3vy90diqpl1k5h6n"; }; - buildInputs = [flex]; - preConfigure = "configureFlags=\"--includedir=$out/include/security\""; + + buildInputs = [flex cracklib]; + + CRACKLIB_DICTPATH = "${cracklib}/lib"; + + preConfigure = '' + configureFlags="$configureFlags --includedir=$out/include/security" + ''; } diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix index 56c881b3340..fbdcce2d1b1 100644 --- a/pkgs/os-specific/linux/pam_console/default.nix +++ b/pkgs/os-specific/linux/pam_console/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation { makeFlags = "LEX=flex"; - configureFlags = "--disable-static"; - preConfigure = " cd pam_console cp ${configure} configure.ac diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix index 026bbed0571..954606eef6c 100644 --- a/pkgs/os-specific/linux/pam_login/default.nix +++ b/pkgs/os-specific/linux/pam_login/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pam}: stdenv.mkDerivation { - name = "pam_login-3.31"; + name = "pam_login-3.35"; src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.31.tar.bz2; - md5 = "15e34a48b0bc2ded5000e8d8780fc274"; + url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.35.tar.bz2; + sha256 = "1w2hpwjhmwjhf8rg789xpl0hibahqlr3ccivfy3m4kgrm5gf04kv"; }; buildInputs = [pam]; diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix index b89f6ba4f3f..f215d69ea8a 100644 --- a/pkgs/os-specific/linux/pam_unix2/default.nix +++ b/pkgs/os-specific/linux/pam_unix2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pam, libxcrypt}: stdenv.mkDerivation { - name = "pam_unix2-2.1"; + name = "pam_unix2-2.6"; src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.1.tar.bz2; - md5 = "08d3bc1940897b5dfcbe2f51dd979ad0"; + url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2; + sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml"; }; buildInputs = [pam libxcrypt]; diff --git a/pkgs/os-specific/linux/splashutils/1.5.nix b/pkgs/os-specific/linux/splashutils/1.5.nix index 48c1b0ff78c..35cbe28bf5d 100644 --- a/pkgs/os-specific/linux/splashutils/1.5.nix +++ b/pkgs/os-specific/linux/splashutils/1.5.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash"; + dontDisableStatic = true; + preConfigure = '' configureFlags="$configureFlags --with-essential-prefix=$out" substituteInPlace src/common.h \ diff --git a/pkgs/os-specific/linux/squashfs/builder.sh b/pkgs/os-specific/linux/squashfs/builder.sh deleted file mode 100644 index ca514515c45..00000000000 --- a/pkgs/os-specific/linux/squashfs/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -preBuild() { - cd squashfs-tools -} - -preBuild=preBuild - -installPhase() { - ensureDir $out/sbin - cp mksquashfs $out/sbin - cp unsquashfs $out/sbin -} - -installPhase=installPhase - -genericBuild diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/os-specific/linux/squashfs/default.nix index 00ce8fba56e..8fdf288d7dd 100644 --- a/pkgs/os-specific/linux/squashfs/default.nix +++ b/pkgs/os-specific/linux/squashfs/default.nix @@ -2,10 +2,21 @@ stdenv.mkDerivation { name = "squashfs-3.3"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/squashfs/squashfs3.3.tgz; sha256 = "1j55m26nyvlbld4yxad0r6s1f4rdw9yg89y2gv93ihkx3rx048w4"; }; + buildInputs = [zlib]; + + preBuild = '' + cd squashfs-tools + ''; + + installPhase = '' + ensureDir $out/sbin + cp mksquashfs $out/sbin + cp unsquashfs $out/sbin + ''; } diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh index 48574d6ec3e..198fa9ba416 100644 --- a/pkgs/os-specific/linux/sysvinit/builder.sh +++ b/pkgs/os-specific/linux/sysvinit/builder.sh @@ -4,7 +4,6 @@ makeFlagsArray=(LCRYPT=-lcrypt BIN_OWNER=$(id -u) BIN_GROUP=$(id -g) ROOT=$out) preBuild="cd src" -preInstall=preInstall preInstall() { substituteInPlace Makefile --replace /usr / mkdir $out @@ -18,7 +17,6 @@ preInstall() { mkdir $out/share/man/man8 } -postInstall=postInstall postInstall() { if test -n "$withoutInitTools"; then mv $out/sbin/killall5 $out/bin diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 9f3a631bab3..07bc3e6fe75 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { url = http://nixos.org/tarballs/upstart-0.3.0.tar.bz2; md5 = "269046f41c6418225306280044a799eb"; }; + + dontDisableStatic = true; configureFlags = "--enable-compat"; @@ -21,7 +23,7 @@ stdenv.mkDerivation { # Upstart builds is the same, then we can switch between them at # runtime; otherwise we can't and we need to reboot. passthru = { - interfaceVersion = 0; + interfaceVersion = 1; }; meta = { diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 03fd33150e3..2d149949230 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,22 +1,23 @@ -{stdenv, fetchurl, db4, glibc - , openssl - , cyrus_sasl -}: +{stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl}: -assert stdenv.isLinux; +assert stdenv.isLinux && stdenv ? coreutils; stdenv.mkDerivation { name = "postfix-2.2.11"; + src = fetchurl { url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz; sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7"; }; installTargets = ["non-interactive-package"]; + installFlags = [" install_root=$out "]; - preInstall = " + + preInstall = '' sed -e '/^PATH=/d' -i postfix-install - "; + ''; + postInstall = '' ensureDir $out mv ut/$out/* $out/ @@ -44,6 +45,8 @@ stdenv.mkDerivation { ''; buildinputs = [db4 openssl cyrus_sasl]; + patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch]; + inherit glibc; } diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix index 4666530929e..812412f3796 100644 --- a/pkgs/servers/sql/mysql5/default.nix +++ b/pkgs/servers/sql/mysql5/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation { buildInputs = [ps ncurses zlib perl openssl]; - configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server"; + configureFlags = "--enable-thread-safe-client --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" + + (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); + + NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + + NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; postInstall = '' diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 8bde2867e10..7da1da77340 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,11 +1,10 @@ -# This is the builder for all X11R7 components. +# This is the builder for all X.org components. source $stdenv/setup # After installation, automatically add all "Requires" fields in the # pkgconfig files (*.pc) to the propagated build inputs. origPostInstall=$postInstall -postInstall=postInstall postInstall() { if test -n "$origPostInstall"; then eval "$origPostInstall"; fi @@ -17,7 +16,6 @@ postInstall() { for r in $requires; do for p in $pkgs; do -# echo $r $p if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs="$propagatedBuildInputs $p" @@ -30,9 +28,6 @@ postInstall() { } -configureFlags="--disable-static $configureFlags" - - installFlags="appdefaultdir=$out/share/X11/app-defaults" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 45036b7966a..f175b86e137 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -7,7 +7,7 @@ rec { name = "applewmproto-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/applewmproto-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/applewmproto-1.0.3.tar.bz2; sha256 = "0l2d3wmgprs5gl479ba2yw9vj1q3m8rhri82k0vryd9ildzc0f59"; }; buildInputs = [pkgconfig ]; @@ -17,7 +17,7 @@ rec { name = "appres-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/appres-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/appres-1.0.1.tar.bz2; sha256 = "0qmr5sdbj4alzf3p8lxb8348y7zdmsjdp20c8biwx39b40xgizhm"; }; buildInputs = [pkgconfig libX11 libXt ]; @@ -27,38 +27,28 @@ rec { name = "bdftopcf-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bdftopcf-1.0.1.tar.bz2; + url = mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2; sha256 = "1lq5x0kvgwlzdgfhi8sbbchzd1y1nmzdqgq9laysx08p6smlbama"; }; buildInputs = [pkgconfig libXfont ]; }) // {inherit libXfont ;}; - beforelight = (stdenv.mkDerivation { - name = "beforelight-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/beforelight-1.0.2.tar.bz2; - sha256 = "19s7n2rpq44mrqd3gd6nh4wql4dg41w02j6r9zh9yxwkkiaigqh0"; - }; - buildInputs = [pkgconfig libX11 libXaw libXScrnSaver libXt ]; - }) // {inherit libX11 libXaw libXScrnSaver libXt ;}; - bigreqsproto = (stdenv.mkDerivation { name = "bigreqsproto-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bigreqsproto-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/bigreqsproto-1.0.2.tar.bz2; sha256 = "1vmda2412s5yvawx2xplrbzcghnmqin54r1l352ycy25lac01nih"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; bitmap = (stdenv.mkDerivation { - name = "bitmap-1.0.2"; + name = "bitmap-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bitmap-1.0.2.tar.bz2; - sha256 = "1g0l9ip2yabz056aq58ijnf2xfnga9d15pmd7hpg82a3mhkrjwc3"; + url = mirror://xorg/X11R7.4/src/everything/bitmap-1.0.3.tar.bz2; + sha256 = "0hawhldsa0647a5x2hy5frf6k2wcpwq1n8pf6npgj6dg30snfgw6"; }; buildInputs = [pkgconfig libXaw libX11 xbitmaps libXmu libXt ]; }) // {inherit libXaw libX11 xbitmaps libXmu libXt ;}; @@ -67,7 +57,7 @@ rec { name = "compositeproto-0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/compositeproto-0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/compositeproto-0.4.tar.bz2; sha256 = "00q0wc8skfjy7c9dzngvmi99i29bh68715wrdw7m9dxjcg5d24v0"; }; buildInputs = [pkgconfig ]; @@ -77,7 +67,7 @@ rec { name = "damageproto-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/damageproto-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/damageproto-1.1.0.tar.bz2; sha256 = "07b41ninycfm5sgzpjsa168dnm1g55c2mzzgigvwvs9mr3x889lx"; }; buildInputs = [pkgconfig ]; @@ -87,27 +77,27 @@ rec { name = "dmxproto-2.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/dmxproto-2.2.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/dmxproto-2.2.2.tar.bz2; sha256 = "1qpw6lp4925zwmkp48b6wsy84d21872i6x2dr8rzfn7csp4xk9ma"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - editres = (stdenv.mkDerivation { - name = "editres-1.0.2"; + dri2proto = (stdenv.mkDerivation { + name = "dri2proto-2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/editres-1.0.2.tar.bz2; - sha256 = "1pv7q44kzipjn735lhrbiyg3kmx3jhsfkjb3yfjshggg9q9vr3wp"; + url = mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2; + sha256 = "1r59dpxinlssq0iangbdxng0cjp88g8nx0w3qh8hdrvzdplsfm0r"; }; - buildInputs = [pkgconfig libXaw libX11 libXmu libXt ]; - }) // {inherit libXaw libX11 libXmu libXt ;}; + buildInputs = [pkgconfig ]; + }) // {inherit ;}; encodings = (stdenv.mkDerivation { name = "encodings-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/encodings-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/encodings-1.0.2.tar.bz2; sha256 = "1b2fdxfvqb0gbg4pz8anp9rwnbg2xj3d4b8cbc46rjdvcrxi06bd"; }; buildInputs = [pkgconfig mkfontscale ]; @@ -117,7 +107,7 @@ rec { name = "evieext-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/evieext-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/evieext-1.0.2.tar.bz2; sha256 = "09fijha8ac0iw7lbc75912jwhm5k19ypm73zj8akf23hjwx1318b"; }; buildInputs = [pkgconfig ]; @@ -127,7 +117,7 @@ rec { name = "fixesproto-4.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fixesproto-4.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/fixesproto-4.0.tar.bz2; sha256 = "13xhrva17vcg1zdz6kba5g5jzkf43z1ifwfsg1ndnll1rhf9gzmk"; }; buildInputs = [pkgconfig ]; @@ -137,7 +127,7 @@ rec { name = "font-adobe-100dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-100dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-adobe-100dpi-1.0.0.tar.bz2; sha256 = "06cs5q4hy255i5b64q0cgcapv46kgc315b7jmwjs5j952qx1nv7i"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -147,7 +137,7 @@ rec { name = "font-adobe-75dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-75dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-adobe-75dpi-1.0.0.tar.bz2; sha256 = "0fb32yyqf4mf93bn9a0qbzm9zbl3sxkhc0ipy9az7r7mw2z4a9yn"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -157,7 +147,7 @@ rec { name = "font-adobe-utopia-100dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2; sha256 = "1zmmm430rwgv0cr80ybl6bk9qzr697lwh253qwxv2sf1f2mf2hqr"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -167,7 +157,7 @@ rec { name = "font-adobe-utopia-75dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2; sha256 = "12bhr82dsd9iz50kszppghf22fpyjcadrxd0plxpwwmw9ccy5m7b"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -177,7 +167,7 @@ rec { name = "font-adobe-utopia-type1-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2; sha256 = "1p604j44vqfp7iv4a7p38vi6d1qk26grmnkdsz1dapr7zz475ip9"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -187,7 +177,7 @@ rec { name = "font-alias-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-alias-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-alias-1.0.1.tar.bz2; sha256 = "1dl99xmdbgwssd4zgnipc4b4l5g9s2qc08wx29bdif946bb61nvp"; }; buildInputs = [pkgconfig ]; @@ -197,7 +187,7 @@ rec { name = "font-arabic-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-arabic-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-arabic-misc-1.0.0.tar.bz2; sha256 = "155wyy6vsxha3lx9cvw22pscsdc3iljsgyh6zqpyl19qyfixzsch"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -207,7 +197,7 @@ rec { name = "font-bh-100dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-100dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-100dpi-1.0.0.tar.bz2; sha256 = "0jpfrxwdx24ib784j6k6qbi6zvy6svyva6gda8pj98krfmvi32mf"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -217,7 +207,7 @@ rec { name = "font-bh-75dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-75dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-75dpi-1.0.0.tar.bz2; sha256 = "1gq55j00g7fqnypxy6f0wvhz5l16056sdysmbp3qk4yc82s6g567"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -227,7 +217,7 @@ rec { name = "font-bh-lucidatypewriter-100dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2; sha256 = "04vh9mccnh517q42w65k89pz3jd6szim3hazydm7n0wilp5pvm1n"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -237,7 +227,7 @@ rec { name = "font-bh-lucidatypewriter-75dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2; sha256 = "0im03ms6bx1947fkdarrdzzm8lq69pz5502n89cccj9sadpz7wjh"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -247,7 +237,7 @@ rec { name = "font-bh-ttf-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-ttf-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-ttf-1.0.0.tar.bz2; sha256 = "0i6nsw1i43ydljws2xzadvbmxs1p50jn9akhinwrh8z4yxr5w6ks"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -257,7 +247,7 @@ rec { name = "font-bh-type1-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-type1-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bh-type1-1.0.0.tar.bz2; sha256 = "0nv4qdr8z68iczqic4gj492ln6y1xy04kxx08dhdaaf8y89mb2js"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -267,7 +257,7 @@ rec { name = "font-bitstream-100dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2; sha256 = "1lp260dwrrr4ll9rbdq38cnvlxq843q34rxay6hl2bmmsxs5lw0c"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -277,7 +267,7 @@ rec { name = "font-bitstream-75dpi-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2; sha256 = "1yqv42gf4ksr5fr0b2szwfc8cczis0pppcsg1wdlwllprb6fmprd"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -287,7 +277,7 @@ rec { name = "font-bitstream-speedo-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-speedo-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bitstream-speedo-1.0.0.tar.bz2; sha256 = "1rpn2j99cg5dnw3mjzff65darwaz5jwjgi7i0xscq064d9w03b4r"; }; buildInputs = [pkgconfig mkfontdir ]; @@ -297,7 +287,7 @@ rec { name = "font-bitstream-type1-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-type1-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-bitstream-type1-1.0.0.tar.bz2; sha256 = "00yrahjc884mghhbm713c41x7r2kbg1ply515qs3g20nrwnlkkjg"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -307,7 +297,7 @@ rec { name = "fontcacheproto-0.1.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontcacheproto-0.1.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/fontcacheproto-0.1.2.tar.bz2; sha256 = "1yfrldprqbxv587zd9lvsn2ayfdabzkgzya5cqvjf290kga3w1j8"; }; buildInputs = [pkgconfig ]; @@ -317,7 +307,7 @@ rec { name = "font-cronyx-cyrillic-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2; sha256 = "1vl4yk3sdvcqpym4d4r3lxrpyghxgjpq8yx2kdxygjpm6dq4xj86"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -327,7 +317,7 @@ rec { name = "font-cursor-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cursor-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-cursor-misc-1.0.0.tar.bz2; sha256 = "1igklmxc0bgbp5a2nbmbwii5d9mh71zsxay2sw0sa6sq2xqy4pcm"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -337,7 +327,7 @@ rec { name = "font-daewoo-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-daewoo-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-daewoo-misc-1.0.0.tar.bz2; sha256 = "09l98sd8wwdhgjdafq8cr6ykki4imh5qi21jwaqkhfil5v4ym67i"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -347,7 +337,7 @@ rec { name = "font-dec-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-dec-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-dec-misc-1.0.0.tar.bz2; sha256 = "1fcbnv0zlbzsn68z5as0k3id83ii9k67l6bxiv2ypcfs4l96sf43"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -357,7 +347,7 @@ rec { name = "font-ibm-type1-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-ibm-type1-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-ibm-type1-1.0.0.tar.bz2; sha256 = "07j6kk7wd0lbnjxn9a4kjahjniiwjyzc8lp1lvw46sahwg193l1h"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -367,7 +357,7 @@ rec { name = "font-isas-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-isas-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-isas-misc-1.0.0.tar.bz2; sha256 = "18jfp92s6wmjs107rhdcz4acmzb2anhcb7s8bpd2kwhbrq9i7rlp"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -377,7 +367,7 @@ rec { name = "font-jis-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-jis-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-jis-misc-1.0.0.tar.bz2; sha256 = "1fn75mqx6xjqffbd01a1wplc8cf7spwsrxv5h2accizw9zyyw89p"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -387,7 +377,7 @@ rec { name = "font-micro-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-micro-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-micro-misc-1.0.0.tar.bz2; sha256 = "0wm52zgbly62vsbr5c4wz9rh1vk4y1viyv09r20r6bp175cppc8n"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -397,7 +387,7 @@ rec { name = "font-misc-cyrillic-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-cyrillic-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-misc-cyrillic-1.0.0.tar.bz2; sha256 = "1zwh69k7id17jabwia6x43f520lbf8787nf71vs3p78j089sq2vw"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -407,7 +397,7 @@ rec { name = "font-misc-ethiopic-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-ethiopic-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-misc-ethiopic-1.0.0.tar.bz2; sha256 = "0hficywkkzl4dpws9sg47d3m1igpb7m4myw8zabkf1na0648dljq"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -417,7 +407,7 @@ rec { name = "font-misc-meltho-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-meltho-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-misc-meltho-1.0.0.tar.bz2; sha256 = "091ripcw30cs6032p12gwcy2hg8b1y24irgacwsky1dn4scjpqf7"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; @@ -427,7 +417,7 @@ rec { name = "font-misc-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-misc-misc-1.0.0.tar.bz2; sha256 = "1nqp7zhwmrh6ng8j4i4pscqj2xhh57sdmrkbqgklh5hzmmh2b816"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; postInstall = "ln -s ${fontalias}/lib/X11/fonts/misc/fonts.alias $out/lib/X11/fonts/misc/fonts.alias"; @@ -437,7 +427,7 @@ rec { name = "font-mutt-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-mutt-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-mutt-misc-1.0.0.tar.bz2; sha256 = "1zzd3ba1i2ffqh8yyvyqyhcyxa7j474lb8x88b5cxf7js0xih6gj"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -447,7 +437,7 @@ rec { name = "font-schumacher-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-schumacher-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-schumacher-misc-1.0.0.tar.bz2; sha256 = "0ypgas5hjwaad53hfpx2w5s1scybh953vb94rrlmaix4hpw6qkj5"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; @@ -457,7 +447,7 @@ rec { name = "font-screen-cyrillic-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-screen-cyrillic-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-screen-cyrillic-1.0.1.tar.bz2; sha256 = "07y52rm2m17ig6piynk9jgyhdv8a4s7jmn5ssa83a61a607mymyr"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -467,7 +457,7 @@ rec { name = "font-sony-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sony-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-sony-misc-1.0.0.tar.bz2; sha256 = "08rf8m9mqg9h0w67b5k55hs73v2s9lxz7aab0nq7rd90c3kkms8s"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; @@ -477,7 +467,7 @@ rec { name = "fontsproto-2.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontsproto-2.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/fontsproto-2.0.2.tar.bz2; sha256 = "0ywb783l7gwypq5nchfmysra0n6dqv9hc3vsf4ra44da65qm9gc3"; }; buildInputs = [pkgconfig ]; @@ -487,27 +477,17 @@ rec { name = "font-sun-misc-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sun-misc-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-sun-misc-1.0.0.tar.bz2; sha256 = "1r99ayxfc1qqcg6zwfkkvbga3qwyf3h3xsh1ymw02zwf9n7jvh83"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; }) // {inherit bdftopcf mkfontdir mkfontscale ;}; - fonttosfnt = (stdenv.mkDerivation { - name = "fonttosfnt-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fonttosfnt-1.0.3.tar.bz2; - sha256 = "0hsjzpj3hcmcm3qqlk7sz6c5x5zrdb002f2ndjmrg829x94h2awx"; - }; - buildInputs = [pkgconfig libfontenc freetype xproto ]; - }) // {inherit libfontenc freetype xproto ;}; - fontutil = (stdenv.mkDerivation { name = "font-util-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-util-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-util-1.0.1.tar.bz2; sha256 = "04h6c24q08d8ljajxzlfwyr1fxfhb88b3w21nfmy6bm3gsqj7304"; }; buildInputs = [pkgconfig ]; @@ -517,58 +497,38 @@ rec { name = "font-winitzki-cyrillic-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2; sha256 = "1qzf9f1irn4difbz2s6j8yhn4hdg95j35q89nhss7rpwh5l7z2j7"; }; buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; }) // {inherit bdftopcf mkfontdir mkfontscale ;}; fontxfree86type1 = (stdenv.mkDerivation { - name = "font-xfree86-type1-1.0.0"; + name = "font-xfree86-type1-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-xfree86-type1-1.0.0.tar.bz2; - sha256 = "0kaaz2vyff4x679d0mv1y0lc1gabml2mj7ncfgzsknhv3nwx6xpg"; + url = mirror://xorg/X11R7.4/src/everything/font-xfree86-type1-1.0.1.tar.bz2; + sha256 = "0hgksnwch59bxxxpmzlwrm2qqhnpj651m458bv1azn1026wgkncg"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; }) // {inherit mkfontdir mkfontscale ;}; - fslsfonts = (stdenv.mkDerivation { - name = "fslsfonts-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fslsfonts-1.0.1.tar.bz2; - sha256 = "0bm6cgif31ghc04phxbiz5w2c5179gl9y9169s95cs7k4mm01srz"; - }; - buildInputs = [pkgconfig libFS libX11 ]; - }) // {inherit libFS libX11 ;}; - - fstobdf = (stdenv.mkDerivation { - name = "fstobdf-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fstobdf-1.0.2.tar.bz2; - sha256 = "08mcwxn8fgsa4ryv0qnn9dny28xl9rigi6mqv5nh75ndaar4a3k9"; - }; - buildInputs = [pkgconfig libFS libX11 ]; - }) // {inherit libFS libX11 ;}; - gccmakedep = (stdenv.mkDerivation { name = "gccmakedep-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/gccmakedep-1.0.2.tar.bz2; + url = mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2; sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; glproto = (stdenv.mkDerivation { - name = "glproto-1.4.8"; + name = "glproto-1.4.9"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/glproto-1.4.8.tar.bz2; - sha256 = "0g05ixvi0nbpzgzhm0gpw6892jca23p6zij6pfvqidjk710q8p9g"; + url = mirror://xorg/X11R7.4/src/everything/glproto-1.4.9.tar.bz2; + sha256 = "18v48zb3jfxlcvhi66zxk7mr4y37vj48qv3vlv9npxghwixzpmv9"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -577,38 +537,28 @@ rec { name = "iceauth-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/iceauth-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/iceauth-1.0.2.tar.bz2; sha256 = "1fxmpa9262b1iklxmy3ca72m34x11qixbqsm4b7w98jpvs8iah06"; }; buildInputs = [pkgconfig libICE xproto ]; }) // {inherit libICE xproto ;}; - ico = (stdenv.mkDerivation { - name = "ico-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/ico-1.0.2.tar.bz2; - sha256 = "19ca471c4yscqi0babvp4zpfnz66lxcbgrwx3fwjkk1bibhrcbnv"; - }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; - imake = (stdenv.mkDerivation { name = "imake-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/imake-1.0.2.tar.bz2; + url = mirror://xorg/individual/util/imake-1.0.2.tar.bz2; sha256 = "0yxca3hbz4hfk0fm385lbm89061p2nksr5klx2y3x1knmvsgzklp"; }; buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; }) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation { - name = "inputproto-1.4.2.1"; + name = "inputproto-1.4.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/inputproto-1.4.2.1.tar.bz2; - sha256 = "1vgkmz6hdcj3r6pgbynkwlh5rg9mqjdvjqkql6wm4z6y6xqbfvcv"; + url = mirror://xorg/X11R7.4/src/everything/inputproto-1.4.4.tar.bz2; + sha256 = "1rfz0x03iw18ji6728qnqmi56blqgak89vzs7sgbpfnnjbs8w9v3"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -617,38 +567,28 @@ rec { name = "kbproto-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/kbproto-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/kbproto-1.0.3.tar.bz2; sha256 = "1pqrrsag6njdrxpx5sm48gh68w64fv5jpmvp2jkjhynhpdg0003h"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - lbxproxy = (stdenv.mkDerivation { - name = "lbxproxy-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lbxproxy-1.0.1.tar.bz2; - sha256 = "1hh1rb2cmfvsdd41n0k3wd2sz1cr7mm639ws57pd5994cyc5grz2"; - }; - buildInputs = [pkgconfig bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ]; - }) // {inherit bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ;}; - libAppleWM = (stdenv.mkDerivation { name = "libAppleWM-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libAppleWM-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libAppleWM-1.0.0.tar.bz2; sha256 = "0zj0n0ykv3zy68d23xyf2c58ddn5m78b8j1zcynb93j1g90gzlpc"; }; buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; }) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation { - name = "libFS-1.0.0"; + name = "libFS-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libFS-1.0.0.tar.bz2; - sha256 = "1ppxrhqa2lx5am054iz1ckinwp2bsq585fjlq6rym8qq1vxgj61g"; + url = mirror://xorg/X11R7.4/src/everything/libFS-1.0.1.tar.bz2; + sha256 = "1x9cbaildzwi2ih5vylvdfqk7a7j040nq6ndh9vf0s8ynpyjzycv"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; }) // {inherit fontsproto xproto xtrans ;}; @@ -657,68 +597,58 @@ rec { name = "libICE-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libICE-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libICE-1.0.4.tar.bz2; sha256 = "012ga4q5rxajnn3fd249xnirnvw6lms7jyp9bh9vsp349hpmw18k"; }; buildInputs = [pkgconfig xproto xtrans ]; }) // {inherit xproto xtrans ;}; libSM = (stdenv.mkDerivation { - name = "libSM-1.0.3"; + name = "libSM-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libSM-1.0.3.tar.bz2; - sha256 = "017cbndj3c4cr8x3phl5k0063ylhzxvjjdj8scn4bzpgawsjvx2p"; + url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2; + sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm"; }; - buildInputs = [pkgconfig libICE xproto xtrans ]; - }) // {inherit libICE xproto xtrans ;}; + buildInputs = [pkgconfig libICE e2fsprogs xproto xtrans ]; + }) // {inherit libICE e2fsprogs xproto xtrans ;}; libWindowsWM = (stdenv.mkDerivation { name = "libWindowsWM-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libWindowsWM-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libWindowsWM-1.0.0.tar.bz2; sha256 = "0shnxkg9ghihgyrl3dzhqdcgssa7146dn1j51rzbl89x2xk75n3a"; }; buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; }) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation { - name = "libX11-1.1.3"; + name = "libX11-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libX11-1.1.3.tar.bz2; - sha256 = "0ylip0df6hilh0yf5x2wzhj56wnx32fgmf2whxf9bpd55rp5cbsa"; + url = mirror://xorg/individual/lib/libX11-1.2.1.tar.bz2; + sha256 = "1wyzvwzywqafh9zmqb5v1fca34y11674xns5y57pyq5206jfawni"; }; buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ]; }) // {inherit bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ;}; libXScrnSaver = (stdenv.mkDerivation { - name = "libXScrnSaver-1.1.2"; + name = "libXScrnSaver-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXScrnSaver-1.1.2.tar.bz2; - sha256 = "0ryckgkyx2zz4r5vvpja0p8h5bhkjq8wm9h84h60w1j6lyydwxbc"; + url = mirror://xorg/X11R7.4/src/everything/libXScrnSaver-1.1.3.tar.bz2; + sha256 = "1269nbcrfyark3h4687pjkcsldsi0ygy1iigmym28nn1jd82942b"; }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; - libXTrap = (stdenv.mkDerivation { - name = "libXTrap-1.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXTrap-1.0.0.tar.bz2; - sha256 = "1filzv6z59rlrd0d8xglpr1r7ac1zr0jfn106yndwp5xfpk2rlfg"; - }; - buildInputs = [pkgconfig trapproto libX11 libXext xextproto libXt ]; - }) // {inherit trapproto libX11 libXext xextproto libXt ;}; - libXau = (stdenv.mkDerivation { - name = "libXau-1.0.3"; + name = "libXau-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXau-1.0.3.tar.bz2; - sha256 = "0fwyq42q10k4cxar4nj73c7zd7jg6gh16zmxw2b0wwhafy40mhyn"; + url = mirror://xorg/X11R7.4/src/everything/libXau-1.0.4.tar.bz2; + sha256 = "0b5jvqp0n9iz3qag4k7g2bwzs7d0vy5sd6rhhd00l30dy2jzzlqh"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -727,7 +657,7 @@ rec { name = "libXaw-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXaw-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2; sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i"; }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ]; @@ -737,58 +667,48 @@ rec { name = "libXcomposite-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcomposite-0.4.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXcomposite-0.4.0.tar.bz2; sha256 = "043m7jhqzqfb02g29v8k57xxm4vqbw15gln4wja81xni5pl5kdvx"; }; - buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes ]; - }) // {inherit compositeproto fixesproto libX11 libXext libXfixes ;}; + buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes xproto ]; + }) // {inherit compositeproto fixesproto libX11 libXext libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation { name = "libXcursor-1.1.9"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcursor-1.1.9.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXcursor-1.1.9.tar.bz2; sha256 = "1d6j2md25f6g45xjb2sqsqwvdidf9i3n3mb682bcxj3i49ab7zqx"; }; - buildInputs = [pkgconfig fixesproto libX11 libXfixes libXrender ]; - }) // {inherit fixesproto libX11 libXfixes libXrender ;}; + buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; + }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; libXdamage = (stdenv.mkDerivation { - name = "libXdamage-1.0.4"; + name = "libXdamage-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdamage-1.0.4.tar.bz2; - sha256 = "0dn64lv1nlc017nq11ixgafd15n8vw52p2knw7wxdqbpz870zyax"; + url = mirror://xorg/X11R7.4/src/everything/libXdamage-1.1.1.tar.bz2; + sha256 = "0bmf5y9wwas5g40inghq7lzcm48z36zip27pmp1s2lirn96pa0h1"; }; - buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes ]; - }) // {inherit damageproto fixesproto libX11 xextproto libXfixes ;}; + buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; + }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; libXdmcp = (stdenv.mkDerivation { name = "libXdmcp-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdmcp-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXdmcp-1.0.2.tar.bz2; sha256 = "1a4n1z0vfzw10pcj27g95rjn06c231cg38l44z14b4ar8wc0rrgk"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; - libXevie = (stdenv.mkDerivation { - name = "libXevie-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXevie-1.0.2.tar.bz2; - sha256 = "1nkls60q0zmrlrxxy08h4jnsv3b9rgpmqwq6sar2v4s5s4dbhw7z"; - }; - buildInputs = [pkgconfig evieext libX11 libXext xextproto xproto ]; - }) // {inherit evieext libX11 libXext xextproto xproto ;}; - libXext = (stdenv.mkDerivation { - name = "libXext-1.0.2"; + name = "libXext-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXext-1.0.2.tar.bz2; - sha256 = "13lg78mlhvnip54yvifcmmqsa6dgnfbd0h7wwscdksvz27slr3in"; + url = mirror://xorg/individual/lib/libXext-1.0.5.tar.bz2; + sha256 = "15vx6712s53640gv307bpa2pg7ds8wrxx3l5i554id3c8scaz00j"; }; buildInputs = [pkgconfig libX11 libXau xextproto xproto ]; }) // {inherit libX11 libXau xextproto xproto ;}; @@ -797,18 +717,18 @@ rec { name = "libXfixes-4.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfixes-4.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXfixes-4.0.3.tar.bz2; sha256 = "1p99m3hdh9m6a59jyn4vgwbppabhppsjdkjkwrfbii1pa0y0jzjl"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (stdenv.mkDerivation { - name = "libXfont-1.3.1"; + name = "libXfont-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfont-1.3.1.tar.bz2; - sha256 = "1cd9b10s30z4fcvxvlrp8s5ylr482hhq7fc4r65djsm1h34pvyyw"; + url = mirror://xorg/X11R7.4/src/everything/libXfont-1.3.3.tar.bz2; + sha256 = "0nhxynfhljfwvpq9f867fvc15r78r363rinr3dhk6qxxljyfcwb1"; }; buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ]; }) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -817,18 +737,18 @@ rec { name = "libXfontcache-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfontcache-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXfontcache-1.0.4.tar.bz2; sha256 = "0770yg0b9vqqlsq34nxb7ri3pf0smlhx018vmxidikc1pz7lgrzz"; }; buildInputs = [pkgconfig fontcacheproto libX11 libXext xextproto ]; }) // {inherit fontcacheproto libX11 libXext xextproto ;}; libXft = (stdenv.mkDerivation { - name = "libXft-2.1.12"; + name = "libXft-2.1.13"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXft-2.1.12.tar.bz2; - sha256 = "11l98adf5sxpi9ryhckmxrdpa9ac2jz3m65xfv4302xgra2nzd38"; + url = mirror://xorg/X11R7.4/src/everything/libXft-2.1.13.tar.bz2; + sha256 = "136yrzxb5xmpd34plhfj4yvla0iish3b7kqv8api8k7ki8jqhxnf"; }; buildInputs = [pkgconfig fontconfig freetype libXrender ]; }) // {inherit fontconfig freetype libXrender ;}; @@ -837,37 +757,37 @@ rec { name = "libXi-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXi-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXi-1.1.3.tar.bz2; sha256 = "0gqm2a4bplpidhzknqvr6b1ipadcayyz3z6y794sdl6hjyz5nyn7"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; }) // {inherit inputproto libX11 libXext xextproto xproto ;}; libXinerama = (stdenv.mkDerivation { - name = "libXinerama-1.0.2"; + name = "libXinerama-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXinerama-1.0.2.tar.bz2; - sha256 = "0gfhwmz4bcfiqcsnp85sdlwdi641wzi6c9ncwp2cnvkn9jpdfifj"; + url = mirror://xorg/X11R7.4/src/everything/libXinerama-1.0.3.tar.bz2; + sha256 = "068j31apk38dapqfs368h9jzwx2xm6vk0qmmh02w4m31sm65dcq7"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; }) // {inherit libX11 libXext xextproto xineramaproto ;}; libXmu = (stdenv.mkDerivation { - name = "libXmu-1.0.3"; + name = "libXmu-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXmu-1.0.3.tar.bz2; - sha256 = "0rkd8qsqmi3a2346ln4mqvqv89jfs0gvip9khjs9r3fs6s730vmm"; + url = mirror://xorg/X11R7.4/src/everything/libXmu-1.0.4.tar.bz2; + sha256 = "1w0qz8m8qq8nvamipzmry99sgxgn3xzjvk4xzbphhk4gxpb00g7q"; }; - buildInputs = [pkgconfig libX11 libXext xextproto libXt ]; - }) // {inherit libX11 libXext xextproto libXt ;}; + buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + }) // {inherit libX11 libXext xextproto xproto libXt ;}; libXp = (stdenv.mkDerivation { name = "libXp-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXp-1.0.0.tar.bz2; + url = mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2; sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y"; }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; @@ -877,69 +797,49 @@ rec { name = "libXpm-3.5.7"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXpm-3.5.7.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXpm-3.5.7.tar.bz2; sha256 = "1aibr6y6hnlgc7m1a1y5s1qx7863praq4pdp0xrpkc75gkk1lw34"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }) // {inherit libX11 libXext xextproto xproto libXt ;}; - libXprintAppUtil = (stdenv.mkDerivation { - name = "libXprintAppUtil-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintAppUtil-1.0.1.tar.bz2; - sha256 = "198ad7pmkp31vcs0iwd8z3vw08p69hlyjmzgk7sdny9k01368q14"; - }; - buildInputs = [pkgconfig printproto libX11 libXau libXp libXprintUtil ]; - }) // {inherit printproto libX11 libXau libXp libXprintUtil ;}; - - libXprintUtil = (stdenv.mkDerivation { - name = "libXprintUtil-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintUtil-1.0.1.tar.bz2; - sha256 = "0v3fh9fqgravl8xl509swwd9a2v7iw38szhlpraiyq5r402axdkj"; - }; - buildInputs = [pkgconfig printproto libX11 libXau libXp libXt ]; - }) // {inherit printproto libX11 libXau libXp libXt ;}; - libXrandr = (stdenv.mkDerivation { - name = "libXrandr-1.2.2"; + name = "libXrandr-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrandr-1.2.2.tar.bz2; - sha256 = "161aq7gf5h91jz9y9prxikxvh6zsz84yznvkzc9i4azia348svr0"; + url = mirror://xorg/X11R7.4/src/everything/libXrandr-1.2.3.tar.bz2; + sha256 = "0ryj1v6127j0639by810jxiaspwsn2l837wl79x6ghy4p0kgxvgq"; }; - buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto libXrender ]; - }) // {inherit randrproto renderproto libX11 libXext xextproto libXrender ;}; + buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; + }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (stdenv.mkDerivation { name = "libXrender-0.9.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrender-0.9.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXrender-0.9.4.tar.bz2; sha256 = "1v0p63g426x0hii0gynq05ccwihr6dn9azjpls8z4zjfvm1x70jn"; }; - buildInputs = [pkgconfig renderproto libX11 ]; - }) // {inherit renderproto libX11 ;}; + buildInputs = [pkgconfig renderproto libX11 xproto ]; + }) // {inherit renderproto libX11 xproto ;}; libXres = (stdenv.mkDerivation { name = "libXres-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXres-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXres-1.0.3.tar.bz2; sha256 = "0c02i8wnwdnzkiaviddc2h7xswg6s58ipw4m204hzv7mfdsvmmd6"; }; - buildInputs = [pkgconfig resourceproto libX11 libXext xextproto ]; - }) // {inherit resourceproto libX11 libXext xextproto ;}; + buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; + }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation { - name = "libXt-1.0.4"; + name = "libXt-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXt-1.0.4.tar.bz2; - sha256 = "0ifklh82iq81vgjrwp8pdypyr384zc0kca15flbnrxg8zyr8hw7c"; + url = mirror://xorg/X11R7.4/src/everything/libXt-1.0.5.tar.bz2; + sha256 = "1x4w7qdciwgjj0ccr1xn7v21pf1csi6cs99j8s54414slnnp5i23"; }; buildInputs = [pkgconfig kbproto libSM libX11 xproto ]; }) // {inherit kbproto libSM libX11 xproto ;}; @@ -948,37 +848,37 @@ rec { name = "libXtst-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXtst-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXtst-1.0.3.tar.bz2; sha256 = "01f9b3386v3dzlvdg0ccpa2wyv0d6b9fbxy149rws17bkhyxva5l"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto ]; }) // {inherit inputproto recordproto libX11 libXext xextproto ;}; libXv = (stdenv.mkDerivation { - name = "libXv-1.0.3"; + name = "libXv-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXv-1.0.3.tar.bz2; - sha256 = "06r66s92pxxr73y2yzsyihdszwns4s8rs5c77kf2cg4swddycypq"; + url = mirror://xorg/X11R7.4/src/everything/libXv-1.0.4.tar.bz2; + sha256 = "1j18fif5mv1gsb7nswqw010impwi7aifqm3036bd79jddydw8g2d"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto ]; - }) // {inherit videoproto libX11 libXext xextproto ;}; + buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; + }) // {inherit videoproto libX11 libXext xextproto xproto ;}; libXvMC = (stdenv.mkDerivation { name = "libXvMC-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXvMC-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXvMC-1.0.4.tar.bz2; sha256 = "1frshf8nfa81hz4q61qg1pc2sz93dl6nsc78dr39hqfnm1dq45qj"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto libXv ]; - }) // {inherit videoproto libX11 libXext xextproto libXv ;}; + buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; + }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; libXxf86dga = (stdenv.mkDerivation { name = "libXxf86dga-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86dga-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXxf86dga-1.0.2.tar.bz2; sha256 = "09cs62bvnv1wwjqcqyckhj0b0v7wa3dyldlg2icv67qal0q545sr"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; @@ -988,18 +888,18 @@ rec { name = "libXxf86misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86misc-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libXxf86misc-1.0.1.tar.bz2; sha256 = "128jm6nssp5wfic17rb54ssz6j3hibm77c9xxgm6x85a95yxc8i1"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; libXxf86vm = (stdenv.mkDerivation { - name = "libXxf86vm-1.0.1"; + name = "libXxf86vm-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86vm-1.0.1.tar.bz2; - sha256 = "0ni8r5im508i3yhn5mq78am7zgs53d4i0a6h3rsjyhhwc70w53z0"; + url = mirror://xorg/X11R7.4/src/everything/libXxf86vm-1.0.2.tar.bz2; + sha256 = "1pji77kksdjn3n1hi6970dqs58jbdvmxphm6ddlbqkraap3c7crw"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; @@ -1008,7 +908,7 @@ rec { name = "libdmx-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libdmx-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libdmx-1.0.2.tar.bz2; sha256 = "1i5r4spy5s9s5nfxzpxlx06j6xcf865z821cfq2flz1zahdg6gzs"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; @@ -1018,31 +918,21 @@ rec { name = "libfontenc-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libfontenc-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/libfontenc-1.0.4.tar.bz2; sha256 = "1j2qc9xqc2wibc005abvkj8wwn9hk6b5s2qn94ma2ig82wysm4xr"; }; buildInputs = [pkgconfig xproto zlib ]; }) // {inherit xproto zlib ;}; - liblbxutil = (stdenv.mkDerivation { - name = "liblbxutil-1.0.1"; + libpciaccess = (stdenv.mkDerivation { + name = "libpciaccess-0.10.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liblbxutil-1.0.1.tar.bz2; - sha256 = "0n3jgf95svmh788gw601jwdk58gw3sb87h57waaklv8hj1q1rhwl"; + url = mirror://xorg/individual/lib/libpciaccess-0.10.5.tar.bz2; + sha256 = "0pg99b53cp3ypa7w99dsd2l6xdcbhldp8iivrd9r1rcl75d7didn"; }; - buildInputs = [pkgconfig xextproto xproto zlib ]; - }) // {inherit xextproto xproto zlib ;}; - - liboldX = (stdenv.mkDerivation { - name = "liboldX-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liboldX-1.0.1.tar.bz2; - sha256 = "03rl20g5fx0qfli1a1cxg4mvivgpsblwv9amszjq93z2yl0x748h"; - }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; + buildInputs = [pkgconfig zlib ]; + }) // {inherit zlib ;}; libpthreadstubs = (stdenv.mkDerivation { name = "libpthread-stubs-0.1"; @@ -1055,61 +945,41 @@ rec { }) // {inherit ;}; libxcb = (stdenv.mkDerivation { - name = "libxcb-1.1"; + name = "libxcb-1.2"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.1.tar.bz2; - sha256 = "0gyrh8y8hn9k6vs8c66czx3rwi07xyfr5kc191ksajbbi2vrr2rk"; + url = http://xcb.freedesktop.org/dist/libxcb-1.2.tar.bz2; + sha256 = "0gyb6fqhl07mfl1rrhqb5195iy11jmx0dmjsqb7flp0cxmcldqag"; }; - buildInputs = [pkgconfig libxslt libpthreadstubs libXau xcbproto libXdmcp ]; - }) // {inherit libxslt libpthreadstubs libXau xcbproto libXdmcp ;}; + buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; + }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; libxkbfile = (stdenv.mkDerivation { - name = "libxkbfile-1.0.4"; + name = "libxkbfile-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbfile-1.0.4.tar.bz2; - sha256 = "1bmq4l45a5fzy1g4ap3cwd73c78smf8c5qba9g1sfl9rm97dx2j6"; + url = mirror://xorg/X11R7.4/src/everything/libxkbfile-1.0.5.tar.bz2; + sha256 = "0pwnb3jv4105mj3mpadc23aq3388fcsq5nb1z02nvjy93wkjidha"; }; buildInputs = [pkgconfig kbproto libX11 ]; }) // {inherit kbproto libX11 ;}; - libxkbui = (stdenv.mkDerivation { - name = "libxkbui-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbui-1.0.2.tar.bz2; - sha256 = "0552zyrm0nvhsyy37x7g767cbii9kc3glvb9dmgywd1jsq0k3hi0"; - }; - buildInputs = [pkgconfig libX11 libxkbfile libXt ]; - }) // {inherit libX11 libxkbfile libXt ;}; - - listres = (stdenv.mkDerivation { - name = "listres-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/listres-1.0.1.tar.bz2; - sha256 = "18zpmvw4l13h3c4a99af04svp0xj4fwl88mksl0sah724n0famki"; - }; - buildInputs = [pkgconfig libXaw libX11 libXmu libXt ]; - }) // {inherit libXaw libX11 libXmu libXt ;}; - lndir = (stdenv.mkDerivation { name = "lndir-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lndir-1.0.1.tar.bz2; + url = mirror://xorg/individual/util/lndir-1.0.1.tar.bz2; sha256 = "0a84q8m3x8qbyrhx7r2k7wmhdb5588vcb1r21ifkx8yaaw1360fk"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; luit = (stdenv.mkDerivation { - name = "luit-1.0.2"; + name = "luit-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/luit-1.0.2.tar.bz2; - sha256 = "171qhbbmfa12jv7anxkxamcrjpwiywyvyqnfyxnn431my1nxgi60"; + url = mirror://xorg/X11R7.4/src/everything/luit-1.0.3.tar.bz2; + sha256 = "1mx5fw4iz62gz2y6z92w0wnl81zvfhah9hzd09zsd2gf5qaz4410"; }; buildInputs = [pkgconfig libfontenc libX11 zlib ]; }) // {inherit libfontenc libX11 zlib ;}; @@ -1118,77 +988,57 @@ rec { name = "makedepend-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/makedepend-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/makedepend-1.0.1.tar.bz2; sha256 = "1lmi2vagp6svfvkqmhsbafjhchwscii7sfdzr20d90hg46gsslmp"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; mkfontdir = (stdenv.mkDerivation { - name = "mkfontdir-1.0.3"; + name = "mkfontdir-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontdir-1.0.3.tar.bz2; - sha256 = "0x1hclcrqsnccxc0n2wkrx5yjxpgr704dd1x4vvcflqsc41nwy1a"; + url = mirror://xorg/X11R7.4/src/everything/mkfontdir-1.0.4.tar.bz2; + sha256 = "1qzqrb3pg96gd0mifw74syghajwpkkbda0gzwkl4ww171p3kr6kg"; }; buildInputs = [pkgconfig ]; preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${mkfontscale}/bin"; }) // {inherit ;}; mkfontscale = (stdenv.mkDerivation { - name = "mkfontscale-1.0.3"; + name = "mkfontscale-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontscale-1.0.3.tar.bz2; - sha256 = "087h7bapnsl74w7c0r23j0gikz2sazw8wr0ql1cb8jjvaajs6n04"; + url = mirror://xorg/X11R7.4/src/everything/mkfontscale-1.0.5.tar.bz2; + sha256 = "0l1qxlqb57idiafbzbfhsfjd4pn5vdv4fbizxfwvxhrx2magz7gp"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; }) // {inherit libfontenc freetype xproto zlib ;}; - oclock = (stdenv.mkDerivation { - name = "oclock-1.0.1"; + pixman = (stdenv.mkDerivation { + name = "pixman-0.15.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/oclock-1.0.1.tar.bz2; - sha256 = "0z11fj6f2z4q2wcw96m2yf4pg8cxnhwfw4j0f4qbxyq2ci7pvas9"; + url = mirror://xorg/individual/lib/pixman-0.15.2.tar.bz2; + sha256 = "1wf0cmx8jj5l0d0g0d948a8z2k1yram3dvgd08yxl8v8pdjvadzm"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXt ]; - }) // {inherit libX11 libXext libXmu libXt ;}; - - pixman = (stdenv.mkDerivation rec { - name = "pixman-0.13.2"; - builder = ./builder.sh; - src = fetchurl { - url = "http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/${name}.tar.bz2"; - sha256 = "1p3wzgzaivl4f0vm6p628jav8v4hz8kdml50a3agxiq447frysvv"; - }; - buildInputs = [ perl pkgconfig ]; - }) // {inherit ;}; + buildInputs = [pkgconfig perl ]; + }) // {inherit perl ;}; printproto = (stdenv.mkDerivation { - name = "printproto-1.0.3"; + name = "printproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/printproto-1.0.3.tar.bz2; - sha256 = "0dbjxinhbd55vjdx3jws97id116lxlgg8jp49gccgpw3va65ydwb"; + url = mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2; + sha256 = "1gnkpz8iyl27gyjvy8rhm9v6g5qvz3632pn5djxks577i0qsjngh"; }; - buildInputs = [pkgconfig ]; - }) // {inherit ;}; - - proxymngr = (stdenv.mkDerivation { - name = "proxymngr-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/proxymngr-1.0.1.tar.bz2; - sha256 = "1i95jp3xw1z2llw028rpkr4id03jxkqb0pv0l1vj8mhi6iax9xg9"; - }; - buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ]; - }) // {inherit libICE libX11 xproxymanagementprotocol libXt ;}; + buildInputs = [pkgconfig libXau ]; + }) // {inherit libXau ;}; randrproto = (stdenv.mkDerivation { name = "randrproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/randrproto-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/randrproto-1.2.1.tar.bz2; sha256 = "0m7n624h2rsxs7m5x03az87x7hlh0gxqphj59q7laqi5iwpx8bqh"; }; buildInputs = [pkgconfig ]; @@ -1198,7 +1048,7 @@ rec { name = "recordproto-1.13.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/recordproto-1.13.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/recordproto-1.13.2.tar.bz2; sha256 = "1yfg15k5fznjvndvld3vw7gcbcmq1p6ic0dybf1a2wzk2j5pmrq4"; }; buildInputs = [pkgconfig ]; @@ -1208,7 +1058,7 @@ rec { name = "renderproto-0.9.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/renderproto-0.9.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/renderproto-0.9.3.tar.bz2; sha256 = "0nyl5pmgrvw7p6laqgsrk65b633yvrrf8jx0vakqz2p9fyw0i2n9"; }; buildInputs = [pkgconfig ]; @@ -1218,87 +1068,47 @@ rec { name = "resourceproto-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/resourceproto-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/resourceproto-1.0.2.tar.bz2; sha256 = "11rlnn54y15bf39ll7vzn9824l1ib15r7p4v8l0k0j7mxvydccqc"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - rgb = (stdenv.mkDerivation { - name = "rgb-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rgb-1.0.1.tar.bz2; - sha256 = "1bch55h8dm382hnc2n52rihx1wp965lsl6camx4c4qigyw1bqdgn"; - }; - buildInputs = [pkgconfig xproto ]; - }) // {inherit xproto ;}; - - rstart = (stdenv.mkDerivation { - name = "rstart-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rstart-1.0.2.tar.bz2; - sha256 = "15lmirb2x8icvc7qzj87fcb09p6fk9kbnphf5wkf864h0ssliz02"; - }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; - - scripts = (stdenv.mkDerivation { - name = "scripts-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scripts-1.0.1.tar.bz2; - sha256 = "0dm1jhwq1r396xfcxx3g9lvgzydf4mikjicch6cs8b1hb51ln58v"; - }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; - scrnsaverproto = (stdenv.mkDerivation { name = "scrnsaverproto-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scrnsaverproto-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/scrnsaverproto-1.1.0.tar.bz2; sha256 = "13s7rpygj0zm8lk6r9zw1ivs8wj3g4qrfqw80ifc0ff37kvsn2fv"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; sessreg = (stdenv.mkDerivation { - name = "sessreg-1.0.3"; + name = "sessreg-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/sessreg-1.0.3.tar.bz2; - sha256 = "1p40013kg73qkgwhhj06l0yrmvcp90r937vlzh4xyv94adfi833x"; + url = mirror://xorg/X11R7.4/src/everything/sessreg-1.0.4.tar.bz2; + sha256 = "00lqgsdm74kz7csi9is906gr3nfwz3viaax10ipw32i05r867q93"; }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; + buildInputs = [pkgconfig xproto ]; + }) // {inherit xproto ;}; setxkbmap = (stdenv.mkDerivation { name = "setxkbmap-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/setxkbmap-1.0.4.tar.bz2; sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share; ln -sfn ${xkeyboard_config}/etc/X11 $out/share/X11"; }) // {inherit libX11 libxkbfile ;}; - showfont = (stdenv.mkDerivation { - name = "showfont-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/showfont-1.0.1.tar.bz2; - sha256 = "033nc48aaq0j5jg36fwksfsxg3wwyg3kaayifjqcdaql57qkrnw7"; - }; - buildInputs = [pkgconfig libFS ]; - }) // {inherit libFS ;}; - smproxy = (stdenv.mkDerivation { name = "smproxy-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/smproxy-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/smproxy-1.0.2.tar.bz2; sha256 = "1lk79yfdalpn0c7hm57vpr3xg6rib1dr6p2wl634733wy062zlkn"; }; buildInputs = [pkgconfig libXmu libXt ]; @@ -1308,28 +1118,18 @@ rec { name = "trapproto-3.4.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/trapproto-3.4.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/trapproto-3.4.3.tar.bz2; sha256 = "1qd06blxgah1pf49259gm9njpbqqk1gcisbv8p1ssv39pk9s0cpz"; }; - buildInputs = [pkgconfig ]; - }) // {inherit ;}; - - twm = (stdenv.mkDerivation { - name = "twm-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/twm-1.0.3.tar.bz2; - sha256 = "0kiap5xxswx4w6dhbb6ys19blff8nrzzqwxbh8mvz4x8fw25ahav"; - }; - buildInputs = [pkgconfig libX11 libXext libXmu libXt ]; - }) // {inherit libX11 libXext libXmu libXt ;}; + buildInputs = [pkgconfig libXt ]; + }) // {inherit libXt ;}; utilmacros = (stdenv.mkDerivation { - name = "util-macros-1.1.5"; + name = "util-macros-1.1.6"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/util-macros-1.1.5.tar.bz2; - sha256 = "06v5ym133460z9r4jyz9k0dfs07hsrhg1ww35q9cr2vbw689g4vm"; + url = mirror://xorg/X11R7.4/src/everything/util-macros-1.1.6.tar.bz2; + sha256 = "0rjc3vsivrwbwlqnrsi57w5bdi7sb86wc5gzd7d1z0f4ylgcqgxh"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -1338,48 +1138,38 @@ rec { name = "videoproto-2.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/videoproto-2.2.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/videoproto-2.2.2.tar.bz2; sha256 = "033q4jgrwgkdcwj5q8hwf7vpl5sdzm7z9dsgwcphrlqchdw8825b"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - viewres = (stdenv.mkDerivation { - name = "viewres-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/viewres-1.0.1.tar.bz2; - sha256 = "1f1lrvnjnf5c0lwisribdb7zgsk1874rjz1v5fcsd5xizx2wsjdz"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - windowswmproto = (stdenv.mkDerivation { name = "windowswmproto-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/windowswmproto-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/windowswmproto-1.0.3.tar.bz2; sha256 = "0lgih20hvpxzdvzwrw5plfynrkb2b930mnfymfnffbdvjsb283bq"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; x11perf = (stdenv.mkDerivation { - name = "x11perf-1.4.1"; + name = "x11perf-1.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/x11perf-1.4.1.tar.bz2; - sha256 = "0r1h9ndlbnyf87vz36ga97hmqbp05q7zh3lmbfjzv5n5irhij668"; + url = mirror://xorg/X11R7.4/src/everything/x11perf-1.5.tar.bz2; + sha256 = "0cqjrr1l1mcnbcx3lab73qmjxbvskcgpgfxlimsf3dz0vm9xlaa7"; }; buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; }) // {inherit libX11 libXext libXft libXmu libXrender ;}; xauth = (stdenv.mkDerivation { - name = "xauth-1.0.2"; + name = "xauth-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xauth-1.0.2.tar.bz2; - sha256 = "05qzbxjvn947igkyad5bg12y3bbd5ji6v9h43jznmcay3rc5m7jn"; + url = mirror://xorg/X11R7.4/src/everything/xauth-1.0.3.tar.bz2; + sha256 = "136sbgfirl9hxcg2a40z2xfs4f35z0f7nmxrkrja8km7zm9qpl8z"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; }) // {inherit libX11 libXau libXext libXmu ;}; @@ -1388,77 +1178,47 @@ rec { name = "xbacklight-1.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbacklight-1.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xbacklight-1.1.tar.bz2; sha256 = "1934bnxa3hx0mzihv3bgcid6qrn75an03ci5dzhnjicp2lgh15f7"; }; buildInputs = [pkgconfig libX11 libXrandr libXrender ]; }) // {inherit libX11 libXrandr libXrender ;}; - xbiff = (stdenv.mkDerivation { - name = "xbiff-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbiff-1.0.1.tar.bz2; - sha256 = "00v5m4s7kh93fx612pcjviy893h611lbcsgx067l1z8wibxb2icq"; - }; - buildInputs = [pkgconfig libXaw xbitmaps libXext ]; - }) // {inherit libXaw xbitmaps libXext ;}; - xbitmaps = (stdenv.mkDerivation { name = "xbitmaps-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbitmaps-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xbitmaps-1.0.1.tar.bz2; sha256 = "0rxqxrnkivn52kk41a9bl1ppy756c5gw5w1rbnw75xvp9rcvx9as"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xcalc = (stdenv.mkDerivation { - name = "xcalc-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcalc-1.0.2.tar.bz2; - sha256 = "0cjapca3lc67ypcinmygbwmjb2bd38ycgshb9p8ljwif44nmwdwn"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - xcbproto = (stdenv.mkDerivation { - name = "xcb-proto-1.1"; + name = "xcb-proto-1.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.1.tar.bz2; - sha256 = "0knih0f85y7j3q2c8dia8s6nw5b25c2fr3zx0m0znxah7pc9ibq6"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.4.tar.bz2; + sha256 = "1gars8dwbc9ffjs287rpwsvw5isv25r0ij298plfqj59ynvafl1d"; }; - buildInputs = [pkgconfig ]; - }) // {inherit ;}; + buildInputs = [pkgconfig python ]; + }) // {inherit python ;}; xcbutil = (stdenv.mkDerivation { - name = "xcb-util-0.2"; + name = "xcb-util-0.3.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2; - sha256 = "06mhfp6n2nyk1flhnbx9kbv2rc3myny2v6rg5y1ymg6wqida3mm0"; + url = http://xcb.freedesktop.org/dist/xcb-util-0.3.4.tar.bz2; + sha256 = "09ld81zibmhb64nirc97sys8k59sshqkf8ngqpcyd8azpvlj7dzf"; }; - buildInputs = [pkgconfig libxcb ]; - }) // {inherit libxcb ;}; - - xclipboard = (stdenv.mkDerivation { - name = "xclipboard-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclipboard-1.0.1.tar.bz2; - sha256 = "1z3h9myc5asq6jacb8r7sjlaym226z45a64fazm14l9805qs569k"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + }) // {inherit gperf m4 libxcb xproto ;}; xclock = (stdenv.mkDerivation { name = "xclock-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclock-1.0.3.tar.bz2; + url = mirror://xorg/individual/app/xclock-1.0.3.tar.bz2; sha256 = "0zspx5jqp52wgp4c4d9qaxhp0b9p2fzx2ys4rza10apgx5x7gd8h"; }; buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ]; @@ -1468,7 +1228,7 @@ rec { name = "xcmiscproto-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmiscproto-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xcmiscproto-1.1.2.tar.bz2; sha256 = "1awjhz3cc06zsds57qnjwgm3y7z5bl4l6akqy6xvfcnnm6b7x05j"; }; buildInputs = [pkgconfig ]; @@ -1478,27 +1238,17 @@ rec { name = "xcmsdb-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmsdb-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xcmsdb-1.0.1.tar.bz2; sha256 = "0bp9xw2cmj9d0d18h5fdzcmc7jnjzbn5sb3vnx6qbbpz86gs6xg2"; }; buildInputs = [pkgconfig libX11 ]; }) // {inherit libX11 ;}; - xconsole = (stdenv.mkDerivation { - name = "xconsole-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xconsole-1.0.3.tar.bz2; - sha256 = "0idw8rxcpg16922zrph4ihnp1a7mq5c46ivl7k1zad5dxxgw47hv"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - xcursorgen = (stdenv.mkDerivation { name = "xcursorgen-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursorgen-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xcursorgen-1.0.2.tar.bz2; sha256 = "0khp7i7w8b5835q7wfdg385x072fhwbnpjqvv558vvxgs8mk42g0"; }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; @@ -1508,48 +1258,18 @@ rec { name = "xcursor-themes-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursor-themes-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2; sha256 = "184ybhyb6wj082rvr83q4jnnx3g7f1i4kpm3s4dwwifh5i0cszaf"; }; buildInputs = [pkgconfig libXcursor ]; }) // {inherit libXcursor ;}; - xdbedizzy = (stdenv.mkDerivation { - name = "xdbedizzy-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdbedizzy-1.0.2.tar.bz2; - sha256 = "0b81cq8i6shlfq1nad0zljw329grzwd0fhxg9hkypsz7zvlq5s3l"; - }; - buildInputs = [pkgconfig libX11 libXext ]; - }) // {inherit libX11 libXext ;}; - - xditview = (stdenv.mkDerivation { - name = "xditview-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xditview-1.0.1.tar.bz2; - sha256 = "05w1an1x7np1x0z418pi5vgrwddfx1rvb8736kww4c9vz3jr8w8p"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - - xdm = (stdenv.mkDerivation { - name = "xdm-1.1.6"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdm-1.1.6.tar.bz2; - sha256 = "1kcbb85vliy4644q6iiazpqaq5zzcg9p2j4w9r1gbhx5knfwh6n4"; - }; - buildInputs = [pkgconfig libXaw libX11 libXau libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; - }) // {inherit libXaw libX11 libXau libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; - xdpyinfo = (stdenv.mkDerivation { - name = "xdpyinfo-1.0.1"; + name = "xdpyinfo-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdpyinfo-1.0.1.tar.bz2; - sha256 = "0qawlhs5ryg8zpycqcflrrhf525gk5b43vi15rqwkfv05y3bbk8w"; + url = mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2; + sha256 = "0qhr7r3q4hs7cjpxh8fjyjia35czbdxzrb7bwm3znkxxa63pd522"; }; buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; }) // {inherit libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; @@ -1558,38 +1278,28 @@ rec { name = "xdriinfo-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdriinfo-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2; sha256 = "0rbj9s0jc265wzqz79q9dkqy7626dmby6qdd4266hybcbc4sq0vv"; }; buildInputs = [pkgconfig glproto libX11 ]; }) // {inherit glproto libX11 ;}; - xedit = (stdenv.mkDerivation { - name = "xedit-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xedit-1.0.2.tar.bz2; - sha256 = "1pv26chphq74l7g3d5ps2ylgvyrmq0lw5wv1qbxfzjgqpa5xfn16"; - }; - buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ]; - }) // {inherit libXaw libXp libXprintUtil libXt ;}; - xev = (stdenv.mkDerivation { - name = "xev-1.0.1"; + name = "xev-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xev-1.0.1.tar.bz2; - sha256 = "0m6vkbgmq5zbam7cjjjdpli3daia0anp3in9v93m2m3qbh0hff65"; + url = mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2; + sha256 = "0fiim4052r6jgzya9f2zixv2qdmrmf35bxd54yz375zfakhpmb6l"; }; buildInputs = [pkgconfig libX11 ]; }) // {inherit libX11 ;}; xextproto = (stdenv.mkDerivation { - name = "xextproto-7.0.2"; + name = "xextproto-7.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xextproto-7.0.2.tar.bz2; - sha256 = "1ng0247qi8f86p419ig7910g5dp0xdylliyl778qpc39wyd07wsk"; + url = mirror://xorg/individual/proto/xextproto-7.0.5.tar.bz2; + sha256 = "0hmhlmn6jv6ybv6q57s0377bvqrfrshi9z1dgdk7ibfsjqy1ygnk"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -1598,7 +1308,7 @@ rec { name = "xeyes-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xeyes-1.0.1.tar.bz2; + url = mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2; sha256 = "0ac0m9af193lxpyj11k2sp2xpmlhzzn3xrs6kdyy6c11fgl042ak"; }; buildInputs = [pkgconfig libX11 libXext libXmu libXt ]; @@ -1608,7 +1318,7 @@ rec { name = "xf86bigfontproto-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86bigfontproto-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2; sha256 = "097i2l56kwgcd6033ng8j83xpx9pxlnwx53gvcwaf2bpnaspbd01"; }; buildInputs = [pkgconfig ]; @@ -1618,7 +1328,7 @@ rec { name = "xf86dga-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dga-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2; sha256 = "0mqqrifbbfj2bh6hd187kmfzfn1rxgghmhsy9i6s5rcn6yw361k5"; }; buildInputs = [pkgconfig libX11 libXaw libXmu libXt libXxf86dga ]; @@ -1628,301 +1338,111 @@ rec { name = "xf86dgaproto-2.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dgaproto-2.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2; sha256 = "00mhjvbgkgr08d8drjavrvxyvnma5rddnmpxc5y74cmh12ix9i2s"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; xf86driproto = (stdenv.mkDerivation { - name = "xf86driproto-2.0.3"; + name = "xf86driproto-2.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86driproto-2.0.3.tar.bz2; - sha256 = "1mmqaqkingf8k6qi5kfwrqkb4q4767c2biq4h6q06j1p4jd4c70i"; + url = mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2; + sha256 = "1nprqyd72f9hkmf4mdpmc9c9incps9p3y3jwx4pm0qw5ximsczgm"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; xf86inputacecad = (stdenv.mkDerivation { - name = "xf86-input-acecad-1.2.0"; + name = "xf86-input-acecad-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-acecad-1.2.0.tar.bz2; - sha256 = "099h36v79sncqvy4gnnwmgq4bq73vfyrb7s1z5h3kvwhfx7jh349"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2; + sha256 = "0vpj6ll76iw2qmpyqdh318ixhyn30x9s5xnnimjcwyfmgryvnglm"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputaiptek = (stdenv.mkDerivation { - name = "xf86-input-aiptek-1.0.1"; + name = "xf86-input-aiptek-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-aiptek-1.0.1.tar.bz2; - sha256 = "12n2zjxxppggl3pjs6ndi4yx7did88c6gqkszz13in1lj0jy7c1x"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputcalcomp = (stdenv.mkDerivation { - name = "xf86-input-calcomp-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-calcomp-1.1.0.tar.bz2; - sha256 = "01094hfk3x24m64w0khmk38cwsrplnrf672b228x6wpa9vkldi7b"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputcitron = (stdenv.mkDerivation { - name = "xf86-input-citron-2.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-citron-2.2.0.tar.bz2; - sha256 = "1zn3s90xf25vhvrp9imqzr9v7xx59g28dlpw740gi0x3sdasgkr6"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputdigitaledge = (stdenv.mkDerivation { - name = "xf86-input-digitaledge-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-digitaledge-1.1.0.tar.bz2; - sha256 = "0f4ap658852ya9876ydcbwbr1yjf7s308br1z3yc4nvbnhciy014"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputdmc = (stdenv.mkDerivation { - name = "xf86-input-dmc-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dmc-1.1.0.tar.bz2; - sha256 = "0gs7j23w8ki6yvssfwcibdypx9kp29kd02y1n9khf4z0vyr8zjn5"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputdynapro = (stdenv.mkDerivation { - name = "xf86-input-dynapro-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dynapro-1.1.0.tar.bz2; - sha256 = "0shdqpksmh3w5va0vw1jj3gd1fdln0yvgjskv9bzw9x0385xaapw"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputelo2300 = (stdenv.mkDerivation { - name = "xf86-input-elo2300-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elo2300-1.1.0.tar.bz2; - sha256 = "0d11mbd4hxxgnb3d71camg558dmnyqgjs0sdlrkkhmy44izgclcm"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputelographics = (stdenv.mkDerivation { - name = "xf86-input-elographics-1.0.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elographics-1.0.0.5.tar.bz2; - sha256 = "0adai0hs7imn4p7baw2vag5j264gkl42bfjxlqqmqw01g4jgil26"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2; + sha256 = "0xsxm003yxlpzlvrh964jpb1d890fgcr9z3ihhxk74sv4yq1d491"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation { - name = "xf86-input-evdev-1.1.2"; + name = "xf86-input-evdev-2.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2; - sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-evdev-2.0.4.tar.bz2; + sha256 = "1jhmq1fl8dnrdqcbzrzq29gqjfxzcz7ivlhb3p5x942cmynxqnl2"; }; - buildInputs = [pkgconfig inputproto kbproto xorgserver xproto xrandr randrproto]; + buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; preBuild = " sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c "; - }) // {inherit inputproto kbproto xorgserver xproto ;}; - - xf86inputfpit = (stdenv.mkDerivation { - name = "xf86-input-fpit-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-fpit-1.1.0.tar.bz2; - sha256 = "1y4lys3s4qsr4afj7r23ldmjryx778ajb85x1x384qaij3gv5qwf"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputhyperpen = (stdenv.mkDerivation { - name = "xf86-input-hyperpen-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-hyperpen-1.1.0.tar.bz2; - sha256 = "14zl0zk301w8lvmkgxm4fqab9b66xprdqclqfls5cv7080rhmhni"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputjamstudio = (stdenv.mkDerivation { - name = "xf86-input-jamstudio-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-jamstudio-1.1.0.tar.bz2; - sha256 = "06kyclz260x2l5f0yn7449si8m6869dc5kvrdc1k3sh8pmhb6hff"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation { - name = "xf86-input-joystick-1.2.3"; + name = "xf86-input-joystick-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-joystick-1.2.3.tar.bz2; - sha256 = "1xslb7p3c0ihg36y402cphyhcwfar3nihv2n417sj4hf1z5033kh"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputkeyboard = (stdenv.mkDerivation { - name = "xf86-input-keyboard-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-keyboard-1.2.2.tar.bz2; - sha256 = "0wn0gv9mb5ld9mginiikn69jknc9wkwqn3dxjy6r405g9r93any2"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2; + sha256 = "0jqxjka9gsp90js6273gn01jmkjg9dvw1y94a9fcgpjl1a727bbc"; }; buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; }) // {inherit inputproto kbproto randrproto xorgserver xproto ;}; - xf86inputmagellan = (stdenv.mkDerivation { - name = "xf86-input-magellan-1.1.0"; + xf86inputkeyboard = (stdenv.mkDerivation { + name = "xf86-input-keyboard-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magellan-1.1.0.tar.bz2; - sha256 = "0gc3lzq6pb807ffikld4a810asgj6z786wgd62ii71a21jsm9vwf"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2; + sha256 = "0hmyyg4rxlm9y0jma324hiqrv1zb14zvqm9kx8nm38mmvwalflbv"; }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputmagictouch = (stdenv.mkDerivation { - name = "xf86-input-magictouch-1.0.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magictouch-1.0.0.5.tar.bz2; - sha256 = "0k24sy0wcv49xcm4jwfxq3c5xzla8zqviqzvfgs8js6qx4qwivcw"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputmicrotouch = (stdenv.mkDerivation { - name = "xf86-input-microtouch-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-microtouch-1.1.0.tar.bz2; - sha256 = "0f90r8drcpl6bvjibcc8q7svi8ra9gyrhhbl03yzpv4m2i9zb4kz"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; + }) // {inherit inputproto kbproto randrproto xorgserver xproto ;}; xf86inputmouse = (stdenv.mkDerivation { - name = "xf86-input-mouse-1.2.2"; + name = "xf86-input-mouse-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mouse-1.2.2.tar.bz2; - sha256 = "1pvyiv1xl38jacf7cc18sipz8b10mk9vqh11kcl72sq3n99cpsc0"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2; + sha256 = "1v4xzx6ng72vl2jakdz1kjm5k7n78p2qpkhlay3c55b76qzjajq5"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; - xf86inputmutouch = (stdenv.mkDerivation { - name = "xf86-input-mutouch-1.1.0"; + xf86inputsynaptics = (stdenv.mkDerivation { + name = "xf86-input-synaptics-0.15.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mutouch-1.1.0.tar.bz2; - sha256 = "1sk23d6jw63l19c0j26qplwmfb0kfnwl5zhbixwqvk2g9zfy0ryc"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-synaptics-0.15.0.tar.bz2; + sha256 = "12swi6sprhpy3k0wx2f6b0rdmgy2571r08zip1gga7d1fp1q3m77"; }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputpalmax = (stdenv.mkDerivation { - name = "xf86-input-palmax-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-palmax-1.1.0.tar.bz2; - sha256 = "0ia1mhp318bk292iszqyz25fns7sq8hjzvib6rssal19xmgch02w"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputpenmount = (stdenv.mkDerivation { - name = "xf86-input-penmount-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-penmount-1.2.0.tar.bz2; - sha256 = "03hmcvvlkk56aldbpqxyv7vi9pbnyip1zyhwk2yffncgrw3qm8fy"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputspaceorb = (stdenv.mkDerivation { - name = "xf86-input-spaceorb-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-spaceorb-1.1.0.tar.bz2; - sha256 = "0588bwr7m03w61p5h7pixaa9nlsrijld6cr2yzriyh5z36vkrmcw"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputsumma = (stdenv.mkDerivation { - name = "xf86-input-summa-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-summa-1.1.0.tar.bz2; - sha256 = "1whi5azynj1vv1yiqi47szs0ac0fj5zwh040cnrl02qjsjnjq3zi"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputtek4957 = (stdenv.mkDerivation { - name = "xf86-input-tek4957-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-tek4957-1.1.0.tar.bz2; - sha256 = "09spw5gvyj8p2alqazhmp1xrjx8xdv2jnfbjk3vampmi3dnm1f89"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputur98 = (stdenv.mkDerivation { - name = "xf86-input-ur98-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-ur98-1.1.0.tar.bz2; - sha256 = "0aj7qvpbfk3hfwlx9qqp0rkfdlpf75jxc0yf93a35aajznqcwjr1"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - }) // {inherit inputproto randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto randrproto libX11 xorgserver xproto ]; + }) // {inherit inputproto randrproto libX11 xorgserver xproto ;}; xf86inputvmmouse = (stdenv.mkDerivation { - name = "xf86-input-vmmouse-12.4.1"; + name = "xf86-input-vmmouse-12.5.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-vmmouse-12.4.1.tar.bz2; - sha256 = "1vxlf64hxy4sha293axrhgxwdvqwjsql22cr0zpngdn4rxlspln7"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-vmmouse-12.5.1.tar.bz2; + sha256 = "1yzwgc5cac60zmhsw1npgn81sl06qda80bd0p6nixw1qf6h8nq33"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputvoid = (stdenv.mkDerivation { - name = "xf86-input-void-1.1.0"; + name = "xf86-input-void-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-void-1.1.0.tar.bz2; - sha256 = "1r5h92v5f3gis7395c1w9h1byf5q383xscd1l6v0dg911295sg5l"; + url = mirror://xorg/X11R7.4/src/everything/xf86-input-void-1.1.1.tar.bz2; + sha256 = "0kxw5l0r4vp4xhfyb781lr9fmkjgv27yibhd3gaxjgvs4vb65q6x"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; }) // {inherit inputproto randrproto xorgserver xproto ;}; @@ -1931,347 +1451,307 @@ rec { name = "xf86miscproto-0.9.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86miscproto-0.9.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2; sha256 = "1rnnv8vi5z457wl5j184qw1z3ai3mvbwssdshm3ysgf736zlraxa"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xf86rushproto = (stdenv.mkDerivation { - name = "xf86rushproto-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86rushproto-1.1.2.tar.bz2; - sha256 = "1bm3d7ck33y4gkvk7cc7djrnd9w7v4sm73xjnl9n6b8zahvv5n87"; - }; - buildInputs = [pkgconfig ]; - }) // {inherit ;}; - xf86videoapm = (stdenv.mkDerivation { - name = "xf86-video-apm-1.1.1"; + name = "xf86-video-apm-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-apm-1.1.1.tar.bz2; - sha256 = "1v6wcl47b3lhik1fs221wx2zcn5006rn09dyiqgi8kxr637ydmq9"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2; + sha256 = "11b119a07w947hasvpmpzwmnfchv58qqc329d9lklvifi47h5zph"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoark = (stdenv.mkDerivation { - name = "xf86-video-ark-0.6.0"; + name = "xf86-video-ark-0.7.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ark-0.6.0.tar.bz2; - sha256 = "1mw4ph6y4cijb8azsjjy4f35gw4na58m5w3kaxnyag34mvsc9az5"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2; + sha256 = "153mynydgb1sa9xn0dvm5ynbsilkl2x9aj3dbz0kggps8lqffrcf"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation { - name = "xf86-video-ast-0.81.0"; + name = "xf86-video-ast-0.85.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ast-0.81.0.tar.bz2; - sha256 = "1f2r4j85792b81axil3h4fy2s44i5gp4r4c23h2jivwvz2m56mdr"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2; + sha256 = "0a2v91v61zn31ih0fizmsd3mz7f767xk7bbs0df8jvc6wj2gy64h"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation { - name = "xf86-video-ati-6.6.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2; - sha256 = "102p6nz1jvd3pgbl83a4zi99smydqr6il61r33l0lqmi3yg452nh"; - }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto glproto mesaHeaders]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; - - xf86videoati_680 = (stdenv.mkDerivation { - name = "xf86-video-ati-6.8.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.8.0.tar.bz2; - sha256 = "1fjgcrvb5f1awfd52a5h45l80mk6hqzcdvj1i71mrll57hg8aqrq"; - }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;}; - - xf86videoati_68_192 = (stdenv.mkDerivation { - name = "xf86-video-ati-6.8.192"; - builder = ./builder.sh; - src = fetchurl { - url = http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.8.192.tar.bz2; - sha256 = "1pcqp38ds6xq3vngrnacwlxw3ak4m2x0fgpibikxcvvvi8qdhqx5"; - }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;}; - - xf86videoati_690 = (stdenv.mkDerivation { name = "xf86-video-ati-6.9.0"; builder = ./builder.sh; src = fetchurl { - url = http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.9.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2; sha256 = "1hnp2da1asj6ql4a1i2j20mffix255sx08ixv0nijv1qdj8x2b38"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videochips = (stdenv.mkDerivation { - name = "xf86-video-chips-1.1.1"; + name = "xf86-video-chips-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-chips-1.1.1.tar.bz2; - sha256 = "153lpk2jm6amxag4i8zrpjnk0mfpq1wx49ikdj9pc49idgdira0n"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2; + sha256 = "16ag3n052rj275q10sf7j9dz1nxq43szlf5pd3x6mqrvn94qrwq5"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation { - name = "xf86-video-cirrus-1.1.0"; + name = "xf86-video-cirrus-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cirrus-1.1.0.tar.bz2; - sha256 = "06wv2yqr7jalk6znwqdnidjxy1glwhwjk5d6yrs340fmk4hrd22r"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2; + sha256 = "175vg2gi149awz6jfnj1d51yq3s3ka2pbn75ysnmzpr6cgb9xjg7"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; - - xf86videocyrix = (stdenv.mkDerivation { - name = "xf86-video-cyrix-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cyrix-1.1.0.tar.bz2; - sha256 = "1bd65iyacnw76nm9znxmfgvjddbbpn346y55rc3xkpgnw1w6g9nn"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation { - name = "xf86-video-dummy-0.2.0"; + name = "xf86-video-dummy-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-dummy-0.2.0.tar.bz2; - sha256 = "04690qg07v01d8ncz5ws651i8scyqsmh7mf50mg1lg3gd62kh0a6"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2; + sha256 = "0y52605g48wqpp138is2wfckdgk4w7v5x7hm7fv4nczhnzhbsjss"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videofbdev = (stdenv.mkDerivation { - name = "xf86-video-fbdev-0.3.1"; + name = "xf86-video-fbdev-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-fbdev-0.3.1.tar.bz2; - sha256 = "1rznknqy3r0jr1xy3186j120qybpjnq4apf0jjj9wmbpiihiz79h"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-fbdev-0.4.0.tar.bz2; + sha256 = "179mmh0dzsq1y5i9y7sqr162r9wamslmaa5rya1knc9axgd2b9xv"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; + + xf86videogeode = (stdenv.mkDerivation { + name = "xf86-video-geode-2.10.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-geode-2.10.1.tar.bz2; + sha256 = "0l66m0cc2ywwsgbx844gfdywc141gdjzyvpknavw3qh2whcghvlv"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation { - name = "xf86-video-glide-1.0.0"; + name = "xf86-video-glide-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glide-1.0.0.tar.bz2; - sha256 = "1bsynd01sjz3pp9lkphiiln0nwkjy5fyywymfr1x617r1216szb6"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-glide-1.0.1.tar.bz2; + sha256 = "1cv4bwgbv37c0b1nm45pkmfjz07aj01qym2yw1r39z6qxja6hqrb"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation { - name = "xf86-video-glint-1.1.1"; + name = "xf86-video-glint-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glint-1.1.1.tar.bz2; - sha256 = "0vay25kisr8lpmqnl9z3fglw341yr25ad4sij7qvmknfyp9hsgnn"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2; + sha256 = "1nhwpv37h5790j3a08frwpy9m9p77376393w06i4h1bx2b9805qn"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;}; xf86videoi128 = (stdenv.mkDerivation { - name = "xf86-video-i128-1.2.1"; + name = "xf86-video-i128-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i128-1.2.1.tar.bz2; - sha256 = "1cay0pyvbwljaf4x6n9gr4398fann5779mgwiv6l2hhkz2n3q0hd"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2; + sha256 = "0xcspy2r8fy8daq47m1w3jrg92210x5m6gyjs1scvsslari27fs9"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi740 = (stdenv.mkDerivation { - name = "xf86-video-i740-1.1.0"; + name = "xf86-video-i740-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i740-1.1.0.tar.bz2; - sha256 = "1idpw8s8wz69qcw0kr3p1826viy17yj3mvkpnkw192kxk1619wmq"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2; + sha256 = "0vs831gnbfvlyqlxrmanjvdfy653460zzgr03hy07vsv8vpgdj2r"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - xf86videoi810 = (stdenv.mkDerivation { - name = "xf86-video-i810-1.7.4"; + xf86videoimpact = (stdenv.mkDerivation { + name = "xf86-video-impact-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2; - sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2; + sha256 = "08h007qrz4k7pi6gcwfa5h35yfc6c18c6dwfxc32bx0vnhis2a0m"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; - }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; - - xf86videoimstt = (stdenv.mkDerivation { - name = "xf86-video-imstt-1.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-imstt-1.1.0.tar.bz2; - sha256 = "0zgv20zj4gr4sv93ffl3zzsy446041zrs13wndxdsdwlgwjw4f4j"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + buildInputs = [pkgconfig xorgserver xproto ]; + }) // {inherit xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation { - name = "xf86-video-intel-2.1.1"; + name = "xf86-video-intel-2.7.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-intel-2.1.1.tar.bz2; - sha256 = "0765spq3ksw15hn9mia1sbznainnb2w6zlkgwmdv7d4srjr1awjg"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.7.0.tar.bz2; + sha256 = "152dd0y120sv6sh9a889isf71901ykansq7jjj7vc5j9a1dg3l0n"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; - }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto mesa glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; + }) // {inherit fontsproto mesa glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; + + xf86videomach64 = (stdenv.mkDerivation { + name = "xf86-video-mach64-6.8.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2; + sha256 = "18g1hk9nq0zlinhw4vz3i9lhh9nql0w5x5lh1bh5j5rmipw1d9pv"; + }; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation { - name = "xf86-video-mga-1.4.6.1"; + name = "xf86-video-mga-1.4.9"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-mga-1.4.6.1.tar.bz2; - sha256 = "1z7xmyyx2wy69w59cnzir03h4ydhcramzn7rqli428fci30fib57"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2; + sha256 = "1h7xs340q9vzdb6ck2z9c9fnxx3nfpxk58k7444n9w2j60rd4zfm"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation { - name = "xf86-video-neomagic-1.1.1"; + name = "xf86-video-neomagic-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-neomagic-1.1.1.tar.bz2; - sha256 = "11lav16j3ymn2sra0zdx5ql7hxa5sjpprpgycfv8b0kvjs070jfn"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2; + sha256 = "19g08nw8crbhkcm50i4n0vwkdhrazwilfp3kdkvp8qarg19qvqwn"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videonewport = (stdenv.mkDerivation { name = "xf86-video-newport-0.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-newport-0.2.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-newport-0.2.1.tar.bz2; sha256 = "026fn4c760rr03i2r9pq824k31nxq5nq0xq582bgh3k9a9a8bb36"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; - xf86videonsc = (stdenv.mkDerivation { - name = "xf86-video-nsc-2.8.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nsc-2.8.3.tar.bz2; - sha256 = "0f8qicx3b5ibi2y62lmc3r7y093366b61h1rxrdrgf3p301a5ig5"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; - xf86videonv = (stdenv.mkDerivation { - name = "xf86-video-nv-2.1.3"; + name = "xf86-video-nv-2.1.12"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nv-2.1.3.tar.bz2; - sha256 = "0llrjrfm68x7s274m7q5q49qh59ks75kwzqyhbvij6f36yhmx6wd"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-nv-2.1.12.tar.bz2; + sha256 = "07h1aih3gy9vpfqhs2wi1xjjk8jkijc31p3a7kfnjhvc5ys2nvgm"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; - - xf86videoradeonhd = (stdenv.mkDerivation { - name = "xf86-video-radeonhd-1.2.1"; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + + xf86videoopenchrome = (stdenv.mkDerivation { + name = "xf86-video-openchrome-0.2.903"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-radeonhd-1.2.1.tar.bz2; - sha256 = "125ki9wan5zf1vpn0mv5w95f9fp7l1paks34bhb4alsff76yh1if"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2; + sha256 = "043lvcvdkhyb5jp2m0ggd0r0gxndjwh2qnj8wbx2hr2wdf6qbr5p"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto glproto mesaHeaders]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;}; + + xf86videor128 = (stdenv.mkDerivation { + name = "xf86-video-r128-6.8.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-r128-6.8.0.tar.bz2; + sha256 = "0ysnarxh4qz9hjk9zcgzb01w9whfgaq86a71prr9577f9xqwm2an"; + }; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videorendition = (stdenv.mkDerivation { - name = "xf86-video-rendition-4.1.3"; + name = "xf86-video-rendition-4.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-rendition-4.1.3.tar.bz2; - sha256 = "0224vz4v96y5lbxqp1hnvqwp9jwh67ad1brvb9glhrkl5zvsxrrp"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-rendition-4.2.0.tar.bz2; + sha256 = "05dfm9zlqnm89xmnx98rf3yrqi0i6frk23hpk6kk8xfq0zvn4yxm"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videos3 = (stdenv.mkDerivation { - name = "xf86-video-s3-0.5.0"; + name = "xf86-video-s3-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3-0.5.0.tar.bz2; - sha256 = "15swq2wkccraj6xv3wrqh69283ixj7clfr91h64as2i03b5hc4ja"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3-0.6.0.tar.bz2; + sha256 = "0ry0ys83vzwkg9rwg2yc0zflkmkiz54kny33spfmyh0gidjf81zd"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videos3virge = (stdenv.mkDerivation { - name = "xf86-video-s3virge-1.9.1"; + name = "xf86-video-s3virge-1.10.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3virge-1.9.1.tar.bz2; - sha256 = "08n89fl97rpk5mzwfjl4kyj5syhz4k02sixip1zp77plcclp1xff"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3virge-1.10.1.tar.bz2; + sha256 = "12lp988y1gqgs3imj44vjm8wf9y7grqk4ww8rxbwjwzg45b1354h"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation { - name = "xf86-video-savage-2.1.3"; + name = "xf86-video-savage-2.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-savage-2.1.3.tar.bz2; - sha256 = "1i9w3ami0brwim7v9p3nawnr2qsx16vxclqlbn9lbd3w6zgm9wgm"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-savage-2.2.1.tar.bz2; + sha256 = "0zm3v0v2qbwldns6lvvhn4mhdvvf91hrwk0wqlk27xxs1yp5rydd"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (stdenv.mkDerivation { - name = "xf86-video-siliconmotion-1.4.2"; + name = "xf86-video-siliconmotion-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-siliconmotion-1.4.2.tar.bz2; - sha256 = "1pazl8m6gh60sv92p57ldnd8ixwk9k3mw2r62ai44hs51j960ym4"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-siliconmotion-1.6.0.tar.bz2; + sha256 = "0lvy05jhj2csrn36hvffzzll63bk706mgf090mvs1fddqswh2lyc"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosis = (stdenv.mkDerivation { - name = "xf86-video-sis-0.9.3"; + name = "xf86-video-sis-0.10.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2; - sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-sis-0.10.0.tar.bz2; + sha256 = "0h2b1qk65mzahwir12b20rq16ayivhlsvq3n0r8c5726bpgdrh5w"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto mesa glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto mesa glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videosisusb = (stdenv.mkDerivation { - name = "xf86-video-sisusb-0.8.1"; + name = "xf86-video-sisusb-0.9.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sisusb-0.8.1.tar.bz2; - sha256 = "1js5vf5xjxpi0nb0bpjc1glbx2l0fq1wqmnlwayn6cp3nfdbg5hm"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-sisusb-0.9.0.tar.bz2; + sha256 = "02lk6x8xf53p69kdzjwxkb9szi1n16znji9mwpibhd9vgndrrdvn"; }; - buildInputs = [pkgconfig fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ]; - }) // {inherit fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto mesa glproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto mesa glproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videosunbw2 = (stdenv.mkDerivation { name = "xf86-video-sunbw2-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2; sha256 = "0dl16ccbzzy0dchxzv4g7qjc59a2875c4lb68yn733xd87lp846p"; }; buildInputs = [pkgconfig randrproto xorgserver xproto ]; @@ -2281,7 +1761,7 @@ rec { name = "xf86-video-suncg14-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg14-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg14-1.1.0.tar.bz2; sha256 = "09q5wjay9mn9msskawv4i5in3chqwv1a0qp4z54xn9g7f04jpjhy"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -2291,7 +1771,7 @@ rec { name = "xf86-video-suncg3-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg3-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg3-1.1.0.tar.bz2; sha256 = "1ybxqf8z8q3r12s6pm1ygv0wffp9h7c6d4am8qnqgsnzrk4fnr1m"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -2301,28 +1781,28 @@ rec { name = "xf86-video-suncg6-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg6-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg6-1.1.0.tar.bz2; sha256 = "0jqr6xjs6i8lb40qyiqnyrfzmy9ch53jhjr0w20m5vspkjvz7cfn"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosunffb = (stdenv.mkDerivation { - name = "xf86-video-sunffb-1.1.0"; + name = "xf86-video-sunffb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunffb-1.1.0.tar.bz2; - sha256 = "0achhw5gskairc2gjqms64qyni7ai8ly6917v1grdxiwx0ks95zq"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunffb-1.2.0.tar.bz2; + sha256 = "14lj0myf4dbd8c02qwgli6lj7rwlhv2q2d3krsqdd94r4gygiwjr"; }; buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ]; }) // {inherit fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ;}; xf86videosunleo = (stdenv.mkDerivation { - name = "xf86-video-sunleo-1.1.0"; + name = "xf86-video-sunleo-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunleo-1.1.0.tar.bz2; - sha256 = "1a8d4y9v6gpbdmd3pl8qgklxw93v631wkafjvk4rpshv4q7xa15m"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; + sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2331,217 +1811,157 @@ rec { name = "xf86-video-suntcx-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suntcx-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-suntcx-1.1.0.tar.bz2; sha256 = "1kq1gg273x460rin8gh5spl7yhyv23b4795by46zcimph4wnm63j"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videotdfx = (stdenv.mkDerivation { - name = "xf86-video-tdfx-1.3.0"; + name = "xf86-video-tdfx-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tdfx-1.3.0.tar.bz2; - sha256 = "0946f977bc78gcwv8qzbyd20g5bqylc6yz7h11yq2a4nbkgh06kb"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-tdfx-1.4.0.tar.bz2; + sha256 = "1bfy02461j3r48b1xf5vbpkgncha33bi0fr43z79xr7j4k9hdgn3"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videotga = (stdenv.mkDerivation { - name = "xf86-video-tga-1.1.0"; + name = "xf86-video-tga-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tga-1.1.0.tar.bz2; - sha256 = "16vfzahrcaw1fpgm28j2anzhfm4di6j1h5glq96i3zarsbyks52h"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-tga-1.2.0.tar.bz2; + sha256 = "19mfy468brrp75gy3y0bnyq1jmqdllq9z6kicpj8nc911snqqbx9"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (stdenv.mkDerivation { - name = "xf86-video-trident-1.2.3"; + name = "xf86-video-trident-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-trident-1.2.3.tar.bz2; - sha256 = "1594fbbax5gv5i01i2k0c7bir83h1kbdqqysckgqs8sx2vxbhgnj"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-trident-1.3.0.tar.bz2; + sha256 = "1dfxscqv03b65p6jq2lzzyq3ihyx26i85rqh3wn3rsgn8sgnrxm4"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotseng = (stdenv.mkDerivation { - name = "xf86-video-tseng-1.1.1"; + name = "xf86-video-tseng-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tseng-1.1.1.tar.bz2; - sha256 = "0vnmvxngshp4912zjf7bjx7954xbph03swxwd202ddqmhwqz7hf9"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-tseng-1.2.0.tar.bz2; + sha256 = "1qxi325a4cr8bjhnw6c3pb960kxcl1k0q39kmh090cil148dk40h"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videov4l = (stdenv.mkDerivation { - name = "xf86-video-v4l-0.1.1"; + name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-v4l-0.1.1.tar.bz2; - sha256 = "0w68msn8vb1k03mc5sy2cinvral35lzlz5nrb1zxma7nlfg59b9k"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; }) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovermilion = (stdenv.mkDerivation { - name = "xf86-video-vermilion-1.0.0"; + name = "xf86-video-vermilion-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vermilion-1.0.0.tar.bz2; - sha256 = "1vr7vfc35x8dd3ra66i5x2xyycl3ydh98wipz7ks4dkkgs4rh39z"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-vermilion-1.0.1.tar.bz2; + sha256 = "12qdk0p2r0pbmsl8fkgwhfh7szvb20yjaay88jlvb89rsbc4rssg"; }; buildInputs = [pkgconfig fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ]; }) // {inherit fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videovesa = (stdenv.mkDerivation { - name = "xf86-video-vesa-1.3.0"; + name = "xf86-video-vesa-2.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vesa-1.3.0.tar.bz2; - sha256 = "00z2jg409gyn6gkagdrs7la83qmj6k3w9nj4yg73w4pmh6p80v5r"; + url = mirror://xorg/individual/driver/xf86-video-vesa-2.2.0.tar.bz2; + sha256 = "09h2x02h05skg9mhknhla2xpzz1igym4gimiswrj0wil4myhfglb"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; - - xf86videovga = (stdenv.mkDerivation { - name = "xf86-video-vga-4.1.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vga-4.1.0.tar.bz2; - sha256 = "0havz5hv46qz3g6g0mq2568758apdapzy0yd5ny8qs06yz0g89fa"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; - - xf86videovia = (stdenv.mkDerivation { - name = "xf86-video-via-0.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-via-0.2.2.tar.bz2; - sha256 = "0qn89m1s50m4jajw95wcidarknyxn19h8696dbkgwy21cjpvs9jh"; - }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC mesaHeaders glproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation { - name = "xf86-video-vmware-10.14.1"; + name = "xf86-video-vmware-10.16.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vmware-10.14.1.tar.bz2; - sha256 = "1aaghvwy7wnk4pkmxym5cw8w499wqi293nqyc71h8hm5dcszsw8r"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-vmware-10.16.5.tar.bz2; + sha256 = "0rj32zsn8p61vxg01rzgvnjby4xpjg6cmxiy11v61cq6v2zrlkiy"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xineramaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation { - name = "xf86-video-voodoo-1.1.1"; + name = "xf86-video-voodoo-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-voodoo-1.1.1.tar.bz2; - sha256 = "073mc423wql4w72dbwf73lzr3k0pdxc9drnzs2xb4x76mqdn0x9r"; + url = mirror://xorg/X11R7.4/src/everything/xf86-video-voodoo-1.2.0.tar.bz2; + sha256 = "132bgkj2jans4psp0pw4326dgwj7dx9prqwb1z07019hskasd6xp"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; - }) // {inherit fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; + + xf86videowsfb = (stdenv.mkDerivation { + name = "xf86-video-wsfb-0.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-wsfb-0.2.1.tar.bz2; + sha256 = "0j6ij0yzz7car00x8h3xpmz2s86apvkvk0lcl9hzaffr2ym5iqrr"; + }; + buildInputs = [pkgconfig xorgserver xproto ]; + }) // {inherit xorgserver xproto ;}; + + xf86videoxgi = (stdenv.mkDerivation { + name = "xf86-video-xgi-1.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgi-1.5.0.tar.bz2; + sha256 = "154ilsc7vaphfh5ab5iy27pwdswbynsshkblji2c0h49xqr39cjz"; + }; + buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; + + xf86videoxgixp = (stdenv.mkDerivation { + name = "xf86-video-xgixp-1.7.99.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgixp-1.7.99.3.tar.bz2; + sha256 = "1n5v9wcdfp3k3r1xhicg2cw0xr73y3wciagpif7apl7awf76b88k"; + }; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86vidmodeproto = (stdenv.mkDerivation { name = "xf86vidmodeproto-2.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86vidmodeproto-2.2.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xf86vidmodeproto-2.2.2.tar.bz2; sha256 = "0vnrqhzrsyjh77zgrxlgx53r34dij15crpl9369wb7n71jcjy587"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xfd = (stdenv.mkDerivation { - name = "xfd-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfd-1.0.1.tar.bz2; - sha256 = "07ifbsdany081g6wip0mfq5s2xcdl69p76xnk9rxca84g0bal6qi"; - }; - buildInputs = [pkgconfig fontconfig freetype libXaw libXft libXt ]; - }) // {inherit fontconfig freetype libXaw libXft libXt ;}; - - xfindproxy = (stdenv.mkDerivation { - name = "xfindproxy-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfindproxy-1.0.1.tar.bz2; - sha256 = "1sl836x5dbjp6ipin67i0ikrv1l5whvhin3pw4rv85ryvpm5qn3b"; - }; - buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ]; - }) // {inherit libICE libX11 xproxymanagementprotocol libXt ;}; - - xfontsel = (stdenv.mkDerivation { - name = "xfontsel-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfontsel-1.0.1.tar.bz2; - sha256 = "0zsc9a4n4wpy6g6ajpjcqr277zy9anzhiyaal2cc7dz0gc62mjjy"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - - xfs = (stdenv.mkDerivation { - name = "xfs-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfs-1.0.4.tar.bz2; - sha256 = "06v4xrs2br8h8ailaphfbb2w2yf50xap7fdlihmmmbn74clxwba5"; - }; - buildInputs = [pkgconfig libFS libXfont xtrans ]; - }) // {inherit libFS libXfont xtrans ;}; - - xfsinfo = (stdenv.mkDerivation { - name = "xfsinfo-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfsinfo-1.0.1.tar.bz2; - sha256 = "1n8csr613bnq9kkspqg0113z548498005rvx83939wx7nd1k9hxd"; - }; - buildInputs = [pkgconfig libFS libX11 ]; - }) // {inherit libFS libX11 ;}; - - xfwp = (stdenv.mkDerivation { - name = "xfwp-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfwp-1.0.1.tar.bz2; - sha256 = "14vdkawdw2lxyx4r6ij2vlcx9ba1frw2d2l007fqc866afsfrmnd"; - }; - buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol ]; - }) // {inherit libICE libX11 xproxymanagementprotocol ;}; - xgamma = (stdenv.mkDerivation { name = "xgamma-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgamma-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xgamma-1.0.2.tar.bz2; sha256 = "07plrky99vwp13463zbp2fqmyfqkvmxc2ra8iypfy2n61wimngax"; }; buildInputs = [pkgconfig libX11 libXxf86vm ]; }) // {inherit libX11 libXxf86vm ;}; - xgc = (stdenv.mkDerivation { - name = "xgc-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgc-1.0.1.tar.bz2; - sha256 = "14qh1qbqh89aa8xyq6zc6qxk9cpnhm0a6axs5nms8qjgqg3dzbbw"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - xhost = (stdenv.mkDerivation { name = "xhost-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xhost-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xhost-1.0.2.tar.bz2; sha256 = "1dhdm6dz2jcnb08qlrjn2g1mzv3gfbyq6yqg9kjmh3r3kp22razd"; }; buildInputs = [pkgconfig libX11 libXau libXmu ]; @@ -2551,57 +1971,47 @@ rec { name = "xineramaproto-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xineramaproto-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xineramaproto-1.1.2.tar.bz2; sha256 = "0409qj8wdl1c3jchrqvdkl63s8r08gni4xhlxngkpz5wmwf2p9p8"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xinit = (stdenv.mkDerivation { - name = "xinit-1.0.5"; + xinput = (stdenv.mkDerivation { + name = "xinput-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xinit-1.0.5.tar.bz2; - sha256 = "0bf6y622c0d3i40ch65rs88fjhys1229kdshcy71q91dyf1m5mcm"; + url = mirror://xorg/X11R7.4/src/everything/xinput-1.3.0.tar.bz2; + sha256 = "0i9fh3flmigv7smfg879969kckw0c1h4ab0n3h9mdwmbi18kw31k"; }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; + buildInputs = [pkgconfig inputproto libX11 libXext libXi ]; + }) // {inherit inputproto libX11 libXext libXi ;}; xkbcomp = (stdenv.mkDerivation { - name = "xkbcomp-1.0.3"; + name = "xkbcomp-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbcomp-1.0.3.tar.bz2; - sha256 = "05n7mvw50v575kzsma1f3zp3l8gs2jp7ax4rpbmk7jg3vbjvld86"; + url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2; + sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + buildInputs = [pkgconfig libX11 libxkbfile ]; NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\""; }) // {inherit libX11 libxkbfile ;}; xkbevd = (stdenv.mkDerivation { name = "xkbevd-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbevd-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xkbevd-1.0.2.tar.bz2; sha256 = "0azpl6mcvsi718630vv0slls8avixvlsfd7nj614kagrxhbf6y2b"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; }) // {inherit libX11 libxkbfile ;}; - xkbprint = (stdenv.mkDerivation { - name = "xkbprint-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbprint-1.0.1.tar.bz2; - sha256 = "05rfvlla9wpbzlg86j83zf907h8cpywx0h5x7v5q0f11bgmgz380"; - }; - buildInputs = [pkgconfig libX11 libxkbfile ]; - }) // {inherit libX11 libxkbfile ;}; - xkbutils = (stdenv.mkDerivation { name = "xkbutils-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbutils-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xkbutils-1.0.1.tar.bz2; sha256 = "0mjq2yfd1kp3gasc08k6r0q16k4asdsafsxw3259fr5pipnp7bda"; }; buildInputs = [pkgconfig libXaw libX11 libxkbfile ]; @@ -2611,37 +2021,17 @@ rec { name = "xkill-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkill-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xkill-1.0.1.tar.bz2; sha256 = "1pm92hpq1vnj3zjl12x8d9g6a9nyfyz3ahvvicni7qjadsn1m8bp"; }; buildInputs = [pkgconfig libX11 libXmu ]; }) // {inherit libX11 libXmu ;}; - xload = (stdenv.mkDerivation { - name = "xload-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xload-1.0.2.tar.bz2; - sha256 = "02y5avipnrf9bvhmrs7172j60w3yq7azs6v3qyqmf9f5xyv7dcc6"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - - xlogo = (stdenv.mkDerivation { - name = "xlogo-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlogo-1.0.1.tar.bz2; - sha256 = "1ci6ylnpsy9sgvkkr1jn3rkklx89x8yfr6zk8ps97zj57nzgjnfy"; - }; - buildInputs = [pkgconfig libXaw libXext libXft libXp libXprintUtil libXrender libXt ]; - }) // {inherit libXaw libXext libXft libXp libXprintUtil libXrender libXt ;}; - xlsatoms = (stdenv.mkDerivation { name = "xlsatoms-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsatoms-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xlsatoms-1.0.1.tar.bz2; sha256 = "0nnm2ss1v93wz4jmlvhgxfsrxkx39g9km2jp2nagqdyv1id5fva5"; }; buildInputs = [pkgconfig libX11 libXmu ]; @@ -2651,87 +2041,37 @@ rec { name = "xlsclients-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsclients-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xlsclients-1.0.1.tar.bz2; sha256 = "160nk39dj9h5laxd0gbq7jl47y4ikpjf6kl4wlzm469mvk37334q"; }; buildInputs = [pkgconfig libX11 libXmu ]; }) // {inherit libX11 libXmu ;}; - xlsfonts = (stdenv.mkDerivation { - name = "xlsfonts-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsfonts-1.0.1.tar.bz2; - sha256 = "0857x0px3581b89lgv8q05dlc8aly1q71kpdqviviclr88cjdn68"; - }; - buildInputs = [pkgconfig libX11 ]; - }) // {inherit libX11 ;}; - - xmag = (stdenv.mkDerivation { - name = "xmag-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmag-1.0.2.tar.bz2; - sha256 = "0hyshs5afqs56y60li86pw65c07vk1wmkk8kzmkq1pbxc0z99pai"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - - xman = (stdenv.mkDerivation { - name = "xman-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xman-1.0.3.tar.bz2; - sha256 = "0jir4m55jfbpz32bi3s5zc2y8s12jnz3jd9f6iars41x5px3pq1q"; - }; - buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ]; - }) // {inherit libXaw libXp libXprintUtil libXt ;}; - xmessage = (stdenv.mkDerivation { name = "xmessage-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmessage-1.0.2.tar.bz2; + url = mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2; sha256 = "1hy3n227iyrm323hnrdld8knj9h82fz6s7x6bw899axcjdp03d02"; }; buildInputs = [pkgconfig libXaw libXt ]; }) // {inherit libXaw libXt ;}; - xmh = (stdenv.mkDerivation { - name = "xmh-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmh-1.0.1.tar.bz2; - sha256 = "1yn6q8lrc2ndx60j2d42xagpqn3w86vjlwk5p21cbgz0bi2znwcl"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - xmodmap = (stdenv.mkDerivation { name = "xmodmap-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmodmap-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xmodmap-1.0.3.tar.bz2; sha256 = "0zql66q2l8wbldfrzz53vlxpv7p62yhfj6lc2cn24n18g4jcggy3"; }; buildInputs = [pkgconfig libX11 ]; }) // {inherit libX11 ;}; - xmore = (stdenv.mkDerivation { - name = "xmore-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmore-1.0.1.tar.bz2; - sha256 = "09r5iwzarqgyxx36z3vsams5qi08n0a1wqx6y52vqx64ffz6cdb5"; - }; - buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ]; - }) // {inherit libXaw libXp libXprintUtil libXt ;}; - xorgcffiles = (stdenv.mkDerivation { name = "xorg-cf-files-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-cf-files-1.0.2.tar.bz2; + url = mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2; sha256 = "15wmz9whf0j9irz5scqyyic4ardr53r6k15x2wcnxmfkqap16ip3"; }; buildInputs = [pkgconfig ]; @@ -2741,118 +2081,78 @@ rec { name = "xorg-docs-1.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-docs-1.4.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xorg-docs-1.4.tar.bz2; sha256 = "09a9va5nljg0cahajadpkkqbhm0r6nl2z12yv7fyd5p31kjngz7z"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; xorgserver = (stdenv.mkDerivation { - name = "xorg-server-1.4.2"; + name = "xorg-server-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.4.2.tar.bz2; - sha256 = "0v9izyj2ksk062wafrfc61sydf4nwzx7mj3701q24n199kn6d742"; + url = mirror://xorg/individual/xserver/xorg-server-1.5.3.tar.bz2; + sha256 = "1fymhb0v83hmbka1sdg9z2vfkjagskawaxajks0n6xxyai7ig056"; }; - buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; - }) // {inherit pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;}; + buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; + }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;}; xorgsgmldoctools = (stdenv.mkDerivation { name = "xorg-sgml-doctools-1.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-sgml-doctools-1.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2; sha256 = "1snvlijv7ycdis0m7zhl6q6ibg2z6as3mdb17dlza0p0w3r7ivsd"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xphelloworld = (stdenv.mkDerivation { - name = "xphelloworld-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xphelloworld-1.0.1.tar.bz2; - sha256 = "09jlwfbhhxnj46wb4cdhagxfm23gg9qmwryqx5g16nsfpbihijmi"; - }; - buildInputs = [pkgconfig libX11 libXaw libXp libXprintAppUtil libXprintUtil libXt ]; - }) // {inherit libX11 libXaw libXp libXprintAppUtil libXprintUtil libXt ;}; - - xplsprinters = (stdenv.mkDerivation { - name = "xplsprinters-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xplsprinters-1.0.1.tar.bz2; - sha256 = "0wmhin7z59fb87288gpqx7ia049ly8i51yg7l1slp5z010c0mimd"; - }; - buildInputs = [pkgconfig libX11 libXp libXprintUtil ]; - }) // {inherit libX11 libXp libXprintUtil ;}; - xpr = (stdenv.mkDerivation { - name = "xpr-1.0.1"; + name = "xpr-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xpr-1.0.1.tar.bz2; - sha256 = "0jb2zpq8ibb9s1qmcb6zr6k1m5afd8m0xzp9k01wakyw4cfj4wdq"; + url = mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2; + sha256 = "1pwa4dcs7zw4iw52p23swnnq1idipfiadhpih6k47nhwdn4sj9f3"; }; buildInputs = [pkgconfig libX11 libXmu ]; }) // {inherit libX11 libXmu ;}; - xprehashprinterlist = (stdenv.mkDerivation { - name = "xprehashprinterlist-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprehashprinterlist-1.0.1.tar.bz2; - sha256 = "0n82yar7hg1npc63fmxrjj84grr6zivddccip1562gbhdwjyjrxs"; - }; - buildInputs = [pkgconfig libX11 libXp ]; - }) // {inherit libX11 libXp ;}; - xprop = (stdenv.mkDerivation { - name = "xprop-1.0.3"; + name = "xprop-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprop-1.0.3.tar.bz2; - sha256 = "19kz6dia3kw44rmmy39g5ygiwbrvgvh7mbq8lnbczd53i2w27nnx"; + url = mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2; + sha256 = "0wnpbigsl5frbh2xnjzdxmvlz47lda5qlg85pnhrr4asgnx7r96s"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - }) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libX11 ]; + }) // {inherit libX11 ;}; xproto = (stdenv.mkDerivation { - name = "xproto-7.0.10"; + name = "xproto-7.0.15"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproto-7.0.10.tar.bz2; - sha256 = "1x2dg14c1q1gi5sg1lpkw0aqaq6jkkzr8kqq2j3y8h9d4qh9jrbd"; - }; - buildInputs = [pkgconfig ]; - }) // {inherit ;}; - - xproxymanagementprotocol = (stdenv.mkDerivation { - name = "xproxymanagementprotocol-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproxymanagementprotocol-1.0.2.tar.bz2; - sha256 = "1g0ck81yx1bd0mm4sbf3xk2k1lr5ac7nhx17qlm18p680b87clf4"; + url = mirror://xorg/individual/proto/xproto-7.0.15.tar.bz2; + sha256 = "1vkbqy2vs0jf1z043fyjw1345rmh16lxzvgrd9p43mwl7syd137x"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; xrandr = (stdenv.mkDerivation { - name = "xrandr-1.2.2"; + name = "xrandr-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrandr-1.2.2.tar.bz2; - sha256 = "00wkm84radzpvnrk8jbv1sxnkw4sz3jazyvzh1wq4zx0jbs3ybv3"; + url = mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2; + sha256 = "01r22ngikdsfkv1sxc2f8a0lcr5c08krsvq9kqknd21b79zvf1mb"; }; buildInputs = [pkgconfig libX11 libXrandr libXrender ]; }) // {inherit libX11 libXrandr libXrender ;}; xrdb = (stdenv.mkDerivation { - name = "xrdb-1.0.4"; + name = "xrdb-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrdb-1.0.4.tar.bz2; - sha256 = "0040krghlckdk2q2mm8ng5krpm0xwlp7lar3bw56vsybx1vxx31z"; + url = mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2; + sha256 = "1ah00m82pc8yv5knp8szqnlip450pw3lg60vzlw05wahja9hhkf2"; }; buildInputs = [pkgconfig libX11 libXmu ]; }) // {inherit libX11 libXmu ;}; @@ -2861,28 +2161,18 @@ rec { name = "xrefresh-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrefresh-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2; sha256 = "1x9jdgwbd1ying44apk718h1ycbfx411p81mjzr51cn057yk2a2j"; }; buildInputs = [pkgconfig libX11 ]; }) // {inherit libX11 ;}; - xrx = (stdenv.mkDerivation { - name = "xrx-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrx-1.0.1.tar.bz2; - sha256 = "1r640xhbxbyjbmhxsc3gmsfq3cg8rw65jzw0f7krvxzj0z3cf6m5"; - }; - buildInputs = [pkgconfig libXaw libX11 libXau libXext xproxymanagementprotocol libXt xtrans ]; - }) // {inherit libXaw libX11 libXau libXext xproxymanagementprotocol libXt xtrans ;}; - xset = (stdenv.mkDerivation { - name = "xset-1.0.3"; + name = "xset-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xset-1.0.3.tar.bz2; - sha256 = "04adhsw6dbigiffr7blpq6nbksai88cnlcalr49xyhi4j3cxfgqf"; + url = mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2; + sha256 = "1bdxs24pf7g73n55a967fr96f9i5ilci5nzh32wr5axy6sxp8gkc"; }; buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ]; }) // {inherit libX11 libXext libXfontcache libXmu libXp libXxf86misc ;}; @@ -2891,117 +2181,67 @@ rec { name = "xsetmode-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetmode-1.0.0.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xsetmode-1.0.0.tar.bz2; sha256 = "1am0mylym97m79n54jvlc45njxdchv1mvqdwmpkcd499jb6lg2wq"; }; buildInputs = [pkgconfig libX11 libXi ]; }) // {inherit libX11 libXi ;}; - xsetpointer = (stdenv.mkDerivation { - name = "xsetpointer-1.0.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetpointer-1.0.0.tar.bz2; - sha256 = "0jkxddcf5gv1p1n72vkhfic5m2v0kppcrr1qrx6pckqb898g8rbx"; - }; - buildInputs = [pkgconfig libX11 libXi ]; - }) // {inherit libX11 libXi ;}; - xsetroot = (stdenv.mkDerivation { name = "xsetroot-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetroot-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xsetroot-1.0.2.tar.bz2; sha256 = "079mld5c05dx2xwhncc94xhrkp4n9388xdncx3x7km1h90gpb6jg"; }; buildInputs = [pkgconfig libX11 xbitmaps libXmu ]; }) // {inherit libX11 xbitmaps libXmu ;}; - xsm = (stdenv.mkDerivation { - name = "xsm-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsm-1.0.1.tar.bz2; - sha256 = "16mjk46iza0sqz2fqik416h77f0r3gm14p5i9c5bwnad76ska99g"; - }; - buildInputs = [pkgconfig libXaw libXt ]; - }) // {inherit libXaw libXt ;}; - - xstdcmap = (stdenv.mkDerivation { - name = "xstdcmap-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xstdcmap-1.0.1.tar.bz2; - sha256 = "0f77yxhb7brwjwnf6a3yc1s28kg1ij65lfznk52m3vkx2dh0d4hd"; - }; - buildInputs = [pkgconfig libX11 libXmu ]; - }) // {inherit libX11 libXmu ;}; - xtrans = (stdenv.mkDerivation { - name = "xtrans-1.0.4"; + name = "xtrans-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrans-1.0.4.tar.bz2; - sha256 = "133xzvxm3ckgh03cx3z5fqqw4qxz9s74b4qfcnqgzpifhbx1jlkn"; + url = mirror://xorg/X11R7.4/src/everything/xtrans-1.2.1.tar.bz2; + sha256 = "1gb4vyh6b4lybacvipjyqfqj1jxl4bav9mmngjdwl955ks6imwlz"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; - xtrap = (stdenv.mkDerivation { - name = "xtrap-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrap-1.0.2.tar.bz2; - sha256 = "1g0gmvf8fnch5ksq7lky3mbpgmlq19hfaxyllgsdyr8cbfj3slcg"; - }; - buildInputs = [pkgconfig libX11 libXTrap ]; - }) // {inherit libX11 libXTrap ;}; - - xvidtune = (stdenv.mkDerivation { - name = "xvidtune-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvidtune-1.0.1.tar.bz2; - sha256 = "0dhdfji0di1pjkcnq97y7kgrqn7xh3avjxn7jwfh3mpiq91fn3vd"; - }; - buildInputs = [pkgconfig libXaw libXt libXxf86vm ]; - }) // {inherit libXaw libXt libXxf86vm ;}; - xvinfo = (stdenv.mkDerivation { name = "xvinfo-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvinfo-1.0.2.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xvinfo-1.0.2.tar.bz2; sha256 = "0l7i9h3r0lzb6kmmcp751i92xml84rhzmz04i5lgj8y759hjlvhj"; }; buildInputs = [pkgconfig libX11 libXv ]; }) // {inherit libX11 libXv ;}; xwd = (stdenv.mkDerivation { - name = "xwd-1.0.1"; + name = "xwd-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwd-1.0.1.tar.bz2; - sha256 = "0cg1x9ga5cs2fc8xhgbxbknvyzr9l61kxalys0n9qhyzck6rpgf8"; + url = mirror://xorg/X11R7.4/src/everything/xwd-1.0.2.tar.bz2; + sha256 = "0qbz63lwdp7c8x0rbafamlja7pk3ahhmcim5cnd7m5f123h792db"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - }) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libX11 ]; + }) // {inherit libX11 ;}; xwininfo = (stdenv.mkDerivation { - name = "xwininfo-1.0.3"; + name = "xwininfo-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwininfo-1.0.3.tar.bz2; - sha256 = "12j7lmcdw4km9gm0x0cbmw3f39q54slg47wpb0z13yn6zfma3qzv"; + url = mirror://xorg/X11R7.4/src/everything/xwininfo-1.0.4.tar.bz2; + sha256 = "1r4f898f6xydg02n1m37qgibh49bffn0fwdxwww37k9jhrw556nz"; }; - buildInputs = [pkgconfig libX11 libXext libXmu ]; - }) // {inherit libX11 libXext libXmu ;}; + buildInputs = [pkgconfig libX11 libXext ]; + }) // {inherit libX11 libXext ;}; xwud = (stdenv.mkDerivation { name = "xwud-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwud-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.4/src/everything/xwud-1.0.1.tar.bz2; sha256 = "0v1kjdn5y7dh3fcp46z1m90i9d3xx1k1y4rdr6nj77j7nhwjvpnj"; }; buildInputs = [pkgconfig libX11 ]; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list new file mode 100644 index 00000000000..59e327af48d --- /dev/null +++ b/pkgs/servers/x11/xorg/extra.list @@ -0,0 +1,6 @@ +http://xcb.freedesktop.org/dist/xcb-proto-1.4.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-0.3.4.tar.bz2 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.2.tar.bz2 +mirror://xorg/individual/lib/pixman-0.15.2.tar.bz2 +mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 7fb12233044..72dfb0debe1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -2,10 +2,9 @@ # Typical command to generate the list of tarballs: -# export i="http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/"; curl $i | perl -e 'while (<>) { if (/href="([^"]*.bz2)"/) { print "$ENV{'i'}$1\n"; }; }' > tarballs -# manually added xcb tarballs from http://xcb.freedesktop.org/dist/ -# then run: perl ./generate-expr-from-tarballs.pl < tarballs - +# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list +# manually update extra.list +# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl use strict; @@ -22,27 +21,18 @@ my %pcMap; my %extraAttrs; +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4"); +$pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; -$pcMap{"fontconfig"} = "fontconfig"; $pcMap{"libpng12"} = "libpng"; -$pcMap{"libdrm"} = "libdrm"; -$pcMap{"libXaw"} = "libXaw"; -$pcMap{"zlib"} = "zlib"; -$pcMap{"perl"} = "perl"; -$pcMap{"mesa"} = "mesa"; -$pcMap{"mesaHeaders"} = "mesaHeaders"; -$pcMap{"mkfontscale"} = "mkfontscale"; -$pcMap{"mkfontdir"} = "mkfontdir"; -$pcMap{"bdftopcf"} = "bdftopcf"; -$pcMap{"libxslt"} = "libxslt"; $pcMap{"dbus-1"} = "dbus"; -$pcMap{"hal"} = "hal"; - +$pcMap{"uuid"} = "e2fsprogs"; +$pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; -$extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; "; +$extraAttrs{"xorgserver"} = " patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; "; $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; @@ -60,6 +50,9 @@ $extraAttrs{"xf86inputevdev"} = " $extraAttrs{"libXpm"} = " patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";"; +$extraAttrs{"xkbcomp"} = " NIX_CFLAGS_COMPILE = \"-DDFLT_XKB_CONFIG_ROOT=\\\"/etc/X11/xkb\\\"\"; "; + + my $downloadCache = "./download-cache"; $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; mkdir $downloadCache, 0755; @@ -74,7 +67,7 @@ while (<>) { die unless defined $1; my $pkg = $1; $pkg =~ s/-//g; - #next unless $pkg eq "xorgserver"; + #next unless $pkg eq "printproto"; #print "$pkg\n"; $tarball =~ /\/([^\/]*)\.tar\.bz2$/; @@ -102,16 +95,36 @@ while (<>) { die "cannot unpack `$path'" if $? != 0; print "\n"; - my $provides = `cd '$tmpDir'/* && ls *.pc.in`; + my $pkgDir = `echo $tmpDir/*`; + chomp $pkgDir; + + my $provides = `cd $pkgDir && ls *.pc.in`; my @provides2 = split '\n', $provides; + my @requires = (); + print "PROVIDES @provides2\n\n"; - foreach my $pc (@provides2) { + foreach my $pcFile (@provides2) { + my $pc = $pcFile; $pc =~ s/.pc.in//; die "collission with $pcMap{$pc}" if defined $pcMap{$pc}; $pcMap{$pc} = $pkg; + + print "$pkgDir/$pcFile\n"; + open FOO, "<$pkgDir/$pcFile" or die; + while () { + if (/Requires:(.*)/) { + my @reqs = split ' ', $1; + foreach my $req (@reqs) { + next unless $req =~ /^[a-z]+$/; + print "REQUIRE (from $pcFile): $req\n"; + push @requires, $req; + } + } + } + close FOO; + } - my @requires = (); my $file; { local $/; @@ -144,6 +157,10 @@ while (<>) { push @requires, "mkfontdir"; } + if ($file =~ /AM_PATH_PYTHON/) { + push @requires, "python"; + } + if ($file =~ /AC_PATH_PROG\(FCCACHE/) { # Don't run fc-cache. die if defined $extraAttrs{$pkg}; @@ -181,14 +198,14 @@ while (<>) { process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; - push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/; - push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videosis/; - push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videointel/; + push @requires, "glproto", "gl" if $pkg =~ /xf86videosis/; + push @requires, "glproto", "gl" if $pkg =~ /xf86videointel/; push @requires, "zlib" if $pkg =~ /xorgserver/; push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/; push @requires, "libxslt" if $pkg =~ /libxcb/; + push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/; - print "REQUIRES @requires => $pkg\n"; + print "REQUIRES $pkg => @requires\n"; $pkgRequires{$pkg} = \@requires; print "done\n"; @@ -197,7 +214,7 @@ while (<>) { print "\nWRITE OUT\n"; -open OUT, ">default2.nix"; +open OUT, ">default.nix"; print OUT ""; print OUT <driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { -Only in xorg-server-X11R7.2-1.2.0/GL/glx: glxdri.c~ diff --git a/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch b/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch deleted file mode 100644 index 2955819985b..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xorg-server-1.4/dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200 -+++ xorg-server-1.4/dix/devices.c 2007-10-23 17:50:38.000000000 -0200 -@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt - static void - CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) - { -+#ifdef XKB -+ if (!noXkbExtension) { -+ DeviceIntPtr dev = (DeviceIntPtr) -+ pDev->devPrivates[CoreDevicePrivatesIndex].ptr; -+ -+ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc) -+ (*dev->key->xkbInfo->kbdProc)(dev, ctrl); -+ } -+#else - return; -+#endif - } - - /** diff --git a/pkgs/servers/x11/xorg/xorgserver.sh b/pkgs/servers/x11/xorg/xorgserver.sh index d0ee29dabcf..0beb09d61a7 100644 --- a/pkgs/servers/x11/xorg/xorgserver.sh +++ b/pkgs/servers/x11/xorg/xorgserver.sh @@ -3,7 +3,6 @@ # NixOS, so force Make to search in our own Glibc. export VPATH=$(cat ${NIX_GCC}/nix-support/orig-libc)/lib -preConfigure=preConfigure preConfigure() { unpackFile $mesaSrc configureFlags="$configureFlags --with-mesa-source=$(ls -d $(pwd)/Mesa-*)" diff --git a/pkgs/shells/bash/4.0.nix b/pkgs/shells/bash/4.0.nix deleted file mode 100644 index 0554039f279..00000000000 --- a/pkgs/shells/bash/4.0.nix +++ /dev/null @@ -1,44 +0,0 @@ -{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null, readline ? null}: - -assert interactive -> ncurses != null; -assert interactive -> readline != null; - -stdenv.mkDerivation { - name = "bash-4.0"; - - src = fetchurl { - url = mirror://gnu/bash/bash-4.0.tar.gz; - sha256 = "9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518"; - }; - - NIX_CFLAGS_COMPILE = '' - -DSYS_BASHRC="/etc/bashrc" - -DSYS_BASH_LOGOUT="/etc/bash_logout" - -DDEFAULT_PATH_VALUE="/no-such-path" - -DSTANDARD_UTILS_PATH="/no-such-path" - -DNON_INTERACTIVE_LOGIN_SHELLS - -DSSH_SOURCE_BASHRC - ''; - - postInstall = "ln -s bash $out/bin/sh"; - - patches = [ - # For dietlibc builds. - ./winsize.patch - ]; - - configureFlags = if interactive then "--enable-readline --with-installed-readline" else ""; - - # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) - buildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive readline - ++ stdenv.lib.optional interactive ncurses; - - meta = { - homepage = http://www.gnu.org/software/bash/; - description = - "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); - }; -} diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 07d4de24da6..8a58f7aec00 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,31 +1,79 @@ -{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: +{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison}: -assert interactive -> ncurses != null; +assert interactive -> readline != null; -stdenv.mkDerivation { - name = "bash-3.2-p39"; +stdenv.mkDerivation rec { + name = "bash-4.0-p17"; src = fetchurl { - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; + url = "mirror://gnu/bash/bash-4.0.tar.gz"; + sha256 = "0605ql0ih55gpi0vfvcm45likzjafa4wjnkxqwq51aa0ysad74wp"; }; + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + postInstall = "ln -s bash $out/bin/sh"; - patches = [ - # For dietlibc builds. - ./winsize.patch - ]; + patchFlags = "-p0"; - # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) + patches = + let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/bash/bash-4.0-patches/bash40-${nr}"; + inherit sha256; + }; + in [ + (patch "001" "06q3y3i2kp09bnjd99lxa95psdmj2haril7pxhdbz9sx9qh19dg3") + (patch "002" "1x2w3mmz1qga30zf95wmnpjsdp8cnd2ljl29mfq9r6q1cvjifla9") + (patch "003" "1n3vg6p4nc7kd896s0fp48y9f6ddf3bkpdqzgmdpgqxi243c8073") + (patch "004" "1bnja962g9isrqhrw8dzxsx7ssvc2ayk1a9vmg2dx6gai8gys0sb") + (patch "005" "0l4l62riap2kqy20789x7f6bfx361yvixds0gnh10rli4v05h1j2") + (patch "006" "1r429n2b5cs2gi5zjv1hlr8k7jplnjg3y563369z799x1x9651y7") + (patch "007" "0vb11vy8r5ayr88hrlli8xj2qcird1qg8l99nknrwnni4jg5b3am") + (patch "008" "1z6q0lq1yxwpf6nf1z39jbyycv6cfv6gwpaqmgg7pnw31z029nw7") + (patch "009" "0avyvz8rkj66x715zf1b3w2pgbwwzaj977v9pcrscjksc50c4iq0") + (patch "010" "05j8xq2s1wnii1za1s6nglzga9xp7q1dmcs1bqqrlggz8mmnyhgj") + (patch "011" "1m2lhfhy6bl3j88qi9kcn6n1qb439n8pmhl4cqsmi2g8xwli9j7z") + (patch "012" "1ww327ga4s7607jgr0xd6nh8bg4xgf2vk63p2yy9b1iaq7lxdi5j") + (patch "013" "0fjc3qj4q6q2zfq1qmiarp6s4hhbh80q47xwws0mvgpks7wwl33n") + (patch "014" "16n3l7627n8b1p9s9ss9fcj7nbn1s6yndwmlh3v751knj73c9v8k") + (patch "015" "0548fm4vd3sv3y4g3csysm1mm7jk5hvyfwglw1c0pj2lvyzf583v") + (patch "016" "06fmf6jmgzl0x1vd7pkyi90sa1wjywkd42gi1phqmrwgj9p96flg") + (patch "017" "08gh63spac39z90n1d8gpx571x7n4bwzp2yqm3ik9c1rcgz2mvib") + ]; + + # Note: Bison is needed because the patches above modify parse.y. buildInputs = [bison] ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive ncurses; + ++ stdenv.lib.optional interactive readline; + + configureFlags = "--with-installed-readline"; meta = { homepage = http://www.gnu.org/software/bash/; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + (if interactive then " (for interactive use)" else ""); + + longDescription = '' + Bash is the shell, or command language interpreter, that will + appear in the GNU operating system. Bash is an sh-compatible + shell that incorporates useful features from the Korn shell + (ksh) and C shell (csh). It is intended to conform to the IEEE + POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers + functional improvements over sh for both programming and + interactive use. In addition, most sh scripts can be run by + Bash without modification. + ''; + + license = "GPLv3+"; }; } diff --git a/pkgs/shells/bash/new.nix b/pkgs/shells/bash/new.nix deleted file mode 100644 index beaf2f845e7..00000000000 --- a/pkgs/shells/bash/new.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: - -assert interactive -> ncurses != null; - -stdenv.mkDerivation { - name = "bash-3.2-p39"; - - src = fetchurl { - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; - }; - - NIX_CFLAGS_COMPILE = '' - -DSYS_BASHRC="/etc/bashrc" - -DSYS_BASH_LOGOUT="/etc/bash_logout" - -DDEFAULT_PATH_VALUE="/no-such-path" - -DSTANDARD_UTILS_PATH="/no-such-path" - -DNON_INTERACTIVE_LOGIN_SHELLS - -DSSH_SOURCE_BASHRC - ''; - - postInstall = "ln -s bash $out/bin/sh"; - - patches = [ - # For dietlibc builds. - ./winsize.patch - ]; - - # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) - buildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive ncurses; - - meta = { - homepage = http://www.gnu.org/software/bash/; - description = - "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); - }; -} diff --git a/pkgs/shells/bash/winsize.patch b/pkgs/shells/bash/winsize.patch deleted file mode 100644 index bbe4151e0cc..00000000000 --- a/pkgs/shells/bash/winsize.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rc bash-3.1-orig/lib/sh/winsize.c bash-3.1/lib/sh/winsize.c -*** bash-3.1-orig/lib/sh/winsize.c 2006-10-18 18:08:25.000000000 +0200 ---- bash-3.1/lib/sh/winsize.c 2006-10-18 18:10:00.000000000 +0200 -*************** -*** 30,35 **** ---- 30,37 ---- - - #include - -+ #include -+ - #if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) - /* For struct winsize on SCO */ - /* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */ diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index d8bab3c4206..7f44037c701 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -10,7 +10,7 @@ # system, e.g., cygwin and mingw builds on i686-cygwin. Most people # can ignore it. -{system, stdenvType ? system, allPackages}: +{system, stdenvType ? system, allPackages ? import ../..}: assert system != "i686-cygwin" -> system == stdenvType; @@ -18,21 +18,14 @@ assert system != "i686-cygwin" -> system == stdenvType; rec { - # Trivial environment used for building other environments. - stdenvInitial = import ./initial { - name = "stdenv-initial"; - inherit system; - }; - - # The native (i.e., impure) build environment. This one uses the # tools installed on the system outside of the Nix environment, # i.e., the stuff in /bin, /usr/bin, etc. This environment should # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). - stdenvNative = import ./native { - inherit stdenvInitial; - }; + stdenvNative = (import ./native { + inherit system allPackages; + }).stdenv; stdenvNativePkgs = allPackages { bootStdenv = stdenvNative; @@ -41,10 +34,10 @@ rec { # The Nix build environment. - stdenvNix = import ./nix (rec { + stdenvNix = import ./nix { stdenv = stdenvNative; pkgs = stdenvNativePkgs; - }); + }; # Linux standard environment. @@ -61,7 +54,7 @@ rec { stdenv = if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else - if stdenvType == "powerpc-linux" then stdenvLinux else + if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "i686-mingw" then stdenvMinGW else if stdenvType == "i686-darwin" then stdenvNix else stdenvNative; diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 0af3210dbc9..23cc2a0775f 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -8,7 +8,11 @@ _postHook="$postHook" preHook= postHook= -source $stdenv/setup +export PATH= +for i in $initialPath; do + if test "$i" = /; then i=; fi + PATH=$PATH${PATH:+:}$i/bin +done mkdir $out @@ -26,3 +30,8 @@ sed \ -e "s^@param4@^$p4^g" \ -e "s^@param5@^$p5^g" \ < "$setup" > "$out/setup" + +# Allow the user to install stdenv using nix-env and get the packages +# in stdenv. +mkdir $out/nix-support +echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 029e4b95482..1a1f588c16a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,20 +1,27 @@ -{ stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, shell +{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" , extraAttrs ? {} -, fetchurlBoot, forceFetchurlBoot + +, # The `fetchurl' to use for downloading curl and its dependencies + # (see all-packages.nix). + fetchurlBoot }: -let { +let + + lib = import ../../lib; stdenvGenerator = setupScript: rec { # The stdenv that we are producing. result = - stdenv.mkDerivation { - inherit name; + derivation { + inherit system name; - builder = ./builder.sh; + builder = shell; + + args = ["-e" ./builder.sh]; setup = setupScript; @@ -22,9 +29,16 @@ let { # TODO: make this more elegant. inherit param1 param2 param3 param4 param5; + + propagatedUserEnvPkgs = [gcc] ++ + lib.filter lib.isDerivation initialPath; } // { + + meta = { + description = "The default build environment for Unix packages in Nixpkgs"; + }; # Add a utility function to produce derivations that use this # stdenv and its shell. @@ -70,7 +84,7 @@ let { # For convenience, bring in the library functions in lib/ so # packages don't have to do that themselves. - lib = import ../../lib; + inherit lib; inherit fetchurlBoot; @@ -80,13 +94,9 @@ let { # "lift" packages like curl from the final stdenv for Linux to # all-packages.nix for that platform (meaning that it has a line # like curl = if stdenv ? curl then stdenv.curl else ...). - // extraAttrs - - // (if forceFetchurlBoot then {fetchurl = fetchurlBoot;} else {}); + // extraAttrs; }.result; - body = stdenvGenerator ./setup.sh; - -} +in stdenvGenerator ./setup.sh diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh deleted file mode 100644 index 52058cee0c9..00000000000 --- a/pkgs/stdenv/generic/setup-new.sh +++ /dev/null @@ -1,829 +0,0 @@ -exitHandler() { - exitCode=$? - set +e - - closeNest - - if test -n "$showBuildStats"; then - times > $NIX_BUILD_TOP/.times - local -a times=($(cat $NIX_BUILD_TOP/.times)) - # Print the following statistics: - # - user time for the shell - # - system time for the shell - # - user time for all child processes - # - system time for all child processes - echo "build time elapsed: " ${times[*]} - fi - - if test $exitCode != 0; then - eval "$failureHook" - - # If the builder had a non-zero exit code and - # $succeedOnFailure is set, create the file - # `$out/nix-support/failed' to signal failure, and exit - # normally. Otherwise, return the original exit code. - if test -n "$succeedOnFailure"; then - echo "build failed with exit code $exitCode (ignored)" - ensureDir "$out/nix-support" - echo -n $exitCode > "$out/nix-support/failed" - exit 0 - fi - - else - eval "$exitHook" - fi - - exit $exitCode -} - -trap "exitHandler" EXIT - - -###################################################################### -# Helper functions that might be useful in setup hooks. - - -addToSearchPathWithCustomDelimiter() { - local delimiter=$1 - local varName=$2 - local needDir=$3 - local addDir=${4:-$needDir} - local prefix=$5 - if [ -d $prefix$needDir ]; then - if [ -z ${!varName} ]; then - eval export ${varName}=${prefix}$addDir - else - eval export ${varName}=${!varName}${delimiter}${prefix}$addDir - fi - fi -} - -addToSearchPath() { - addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" -} - - -###################################################################### -# Initialisation. - -set -e - -test -z $NIX_GCC && NIX_GCC=@gcc@ - - -# Set up the initial path. -PATH= -for i in $NIX_GCC @initialPath@; do - if test "$i" = /; then i=; fi - PATH=$PATH${PATH:+:}$i/bin -done - -if test "$NIX_DEBUG" = "1"; then - echo "initial path: $PATH" -fi - - -# Execute the pre-hook. -export SHELL=@shell@ -PATH_DELIMITER=':' -if test -z "$shell"; then - export shell=@shell@ -fi -param1=@param1@ -param2=@param2@ -param3=@param3@ -param4=@param4@ -param5=@param5@ -if test -n "@preHook@"; then source @preHook@; fi -eval "$preHook" - - -# Check that the pre-hook initialised SHELL. -if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi - - -# Hack: run gcc's setup hook. -envHooks=() -if test -f $NIX_GCC/nix-support/setup-hook; then - source $NIX_GCC/nix-support/setup-hook -fi - - -# Ensure that the given directories exists. -ensureDir() { - local dir - for dir in "$@"; do - if ! test -x "$dir"; then mkdir -p "$dir"; fi - done -} - -installBin() { - ensureDir $out/bin - cp "$@" $out/bin -} - -assertEnvExists(){ - if test -z "${!1}"; then - msg=${2:-error: assertion failed: env var $1 is required} - echo $msg >&2; exit 1 - fi -} - - -# Allow the caller to augment buildInputs (it's not always possible to -# do this before the call to setup.sh, since the PATH is empty at that -# point; here we have a basic Unix environment). -eval "$addInputsHook" - - -# Recursively find all build inputs. -findInputs() { - local pkg=$1 - - case $pkgs in - *\ $pkg\ *) - return 0 - ;; - esac - - pkgs="$pkgs $pkg " - - if test -f $pkg/nix-support/setup-hook; then - source $pkg/nix-support/setup-hook - fi - - if test -f $pkg/nix-support/propagated-build-inputs; then - for i in $(cat $pkg/nix-support/propagated-build-inputs); do - findInputs $i - done - fi -} - -pkgs="" -for i in $buildInputs $propagatedBuildInputs; do - findInputs $i -done - - -# Set the relevant environment variables to point to the build inputs -# found above. -addToEnv() { - local pkg=$1 - - if test "$ignoreFailedInputs" != "1" -a -e $1/nix-support/failed; then - echo "failed input $1" >&2 - exit 1 - fi - - if test -d $1/bin; then - export _PATH=$_PATH${_PATH:+:}$1/bin - fi - - for i in "${envHooks[@]}"; do - $i $pkg - done -} - -for i in $pkgs; do - addToEnv $i -done - - -# Add the output as an rpath. -if test "$NIX_NO_SELF_RPATH" != "1"; then - export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" -fi - - -# Strip debug information by default. -if test -z "$NIX_STRIP_DEBUG"; then - export NIX_STRIP_DEBUG=1 - export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug" -fi - - -assertEnvExists NIX_STORE \ - "Error: you have an old version of Nix that does not set the - NIX_STORE variable. This is required for purity checking. - Please upgrade." - -assertEnvExists NIX_BUILD_TOP \ - "Error: you have an old version of Nix that does not set the - NIX_BUILD_TOP variable. This is required for purity checking. - Please upgrade." - - -# Set the TZ (timezone) environment variable, otherwise commands like -# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must -# be set--see zic manual page 2004'). -export TZ=UTC - - -# Set the prefix. This is generally $out, but it can be overriden, -# for instance if we just want to perform a test build/install to a -# temporary location and write a build report to $out. -if test -z "$prefix"; then - prefix="$out"; -fi - -if test "$useTempPrefix" = "1"; then - prefix="$NIX_BUILD_TOP/tmp_prefix"; -fi - - -PATH=$_PATH${_PATH:+:}$PATH -if test "$NIX_DEBUG" = "1"; then - echo "final path: $PATH" -fi - - -###################################################################### -# Misc. helper functions. - - -stripDirs() { - local dirs="$1" - local stripFlags="$2" - local dirsNew= - - for d in ${dirs}; do - if test -d "$prefix/$d"; then - dirsNew="${dirsNew} $prefix/$d " - fi - done - dirs=${dirsNew} - - if test -n "${dirs}"; then - header "stripping (with flags $stripFlags) in $dirs" - find $dirs -type f -print0 | xargs -0 -r strip $stripFlags || true - stopNest - fi -} - - -###################################################################### -# Textual substitution functions. - - -substitute() { - local input="$1" - local output="$2" - - local -a params=("$@") - local -a args=() - - local n p pattern replacement varName - - for ((n = 2; n < ${#params[*]}; n += 1)); do - p=${params[$n]} - - if test "$p" = "--replace"; then - pattern="${params[$((n + 1))]}" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi - - if test "$p" = "--subst-var"; then - varName="${params[$((n + 1))]}" - pattern="@$varName@" - replacement="${!varName}" - n=$((n + 1)) - fi - - if test "$p" = "--subst-var-by"; then - pattern="@${params[$((n + 1))]}@" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi - - if test ${#args[@]} != 0; then - args[${#args[@]}]="-a" - fi - args[${#args[@]}]="$pattern" - args[${#args[@]}]="$replacement" - done - - replace-literal -e -s -- "${args[@]}" < "$input" > "$output".tmp - if test -x "$output"; then - chmod +x "$output".tmp - fi - mv -f "$output".tmp "$output" -} - - -substituteInPlace() { - local fileName="$1" - shift - substitute "$fileName" "$fileName" "$@" -} - - -substituteAll() { - local input="$1" - local output="$2" - - # Select all environment variables that start with a lowercase character. - for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do - if test "$NIX_DEBUG" = "1"; then - echo "$envVar -> ${!envVar}" - fi - args="$args --subst-var $envVar" - done - - substitute "$input" "$output" $args -} - - -###################################################################### -# What follows is the generic builder. - - -nestingLevel=0 - -startNest() { - nestingLevel=$(($nestingLevel + 1)) - echo -en "\e[$1p" -} - -stopNest() { - nestingLevel=$(($nestingLevel - 1)) - echo -en "\e[q" -} - -header() { - startNest "$2" - echo "$1" -} - -# Make sure that even when we exit abnormally, the original nesting -# level is properly restored. -closeNest() { - while test $nestingLevel -gt 0; do - stopNest - done -} - - -# This function is useful for debugging broken Nix builds. It dumps -# all environment variables to a file `env-vars' in the build -# directory. If the build fails and the `-K' option is used, you can -# then go to the build directory and source in `env-vars' to reproduce -# the environment used for building. -dumpVars() { - if test "$noDumpEnvVars" != "1"; then - export > $NIX_BUILD_TOP/env-vars - fi -} - - -# Redirect stdout/stderr to a named pipe connected to a `tee' process -# that writes the specified file (and also to our original stdout). -# The original stdout is saved in descriptor 3. -startLog() { - local logFile=${logNr}_$1 - logNr=$((logNr + 1)) - if test "$logPhases" = 1; then - ensureDir $logDir - - exec 3>&1 - - if test "$dontLogThroughTee" != 1; then - # This required named pipes (fifos). - logFifo=$NIX_BUILD_TOP/log_fifo - test -p $logFifo || mkfifo $logFifo - startLogWrite "$logDir/$logFile" "$logFifo" - exec > $logFifo 2>&1 - else - exec > $logDir/$logFile 2>&1 - fi - fi -} - -# Factored into a separate function so that it can be overriden. -startLogWrite() { - tee "$1" < "$2" & - logWriterPid=$! -} - - -if test -z "$logDir"; then - logDir=$out/log -fi - -logNr=0 - -# Restore the original stdout/stderr. -stopLog() { - if test "$logPhases" = 1; then - exec >&3 2>&1 - - # Wait until the tee process has died. Otherwise output from - # different phases may be mixed up. - if test -n "$logWriterPid"; then - wait $logWriterPid - logWriterPid= - rm $logFifo - fi - fi -} - - -# Utility function: return the base name of the given path, with the -# prefix `HASH-' removed, if present. -stripHash() { - strippedName=$(basename $1); - if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then - strippedName=$(echo "$strippedName" | cut -c34-) - fi -} - - -unpackFile() { - curSrc="$1" - local cmd - - header "unpacking source archive $curSrc" 3 - - case "$curSrc" in - *.tar) - tar xvf $curSrc - ;; - *.tar.gz | *.tgz | *.tar.Z) - gzip -d < $curSrc | tar xvf - - ;; - *.tar.bz2 | *.tbz2) - bzip2 -d < $curSrc | tar xvf - - ;; - *.zip) - unzip $curSrc - ;; - *) - if test -d "$curSrc"; then - stripHash $curSrc - cp -prvd $curSrc $strippedName - else - if test -z "$unpackCmd"; then - echo "source archive $curSrc has unknown type" - exit 1 - fi - eval "$unpackCmd" - fi - ;; - esac - - stopNest -} - - -unpackPhase() { - eval "$preUnpack" - - if test -z "$srcs"; then - if test -z "$src"; then - echo 'variable $src or $srcs should point to the source' - exit 1 - fi - srcs="$src" - fi - - # To determine the source directory created by unpacking the - # source archives, we record the contents of the current - # directory, then look below which directory got added. Yeah, - # it's rather hacky. - local dirsBefore="" - for i in *; do - if test -d "$i"; then - dirsBefore="$dirsBefore $i " - fi - done - - # Unpack all source archives. - for i in $srcs; do - unpackFile $i - done - - # Find the source directory. - if test -n "$setSourceRoot"; then - eval "$setSourceRoot" - elif test -z "$sourceRoot"; then - sourceRoot= - for i in *; do - if test -d "$i"; then - case $dirsBefore in - *\ $i\ *) - ;; - *) - if test -n "$sourceRoot"; then - echo "unpacker produced multiple directories" - exit 1 - fi - sourceRoot=$i - ;; - esac - fi - done - fi - - if test -z "$sourceRoot"; then - echo "unpacker appears to have produced no directories" - exit 1 - fi - - echo "source root is $sourceRoot" - - # By default, add write permission to the sources. This is often - # necessary when sources have been copied from other store - # locations. - if test "dontMakeSourcesWritable" != 1; then - chmod -R u+w $sourceRoot - fi - - eval "$postUnpack" -} - - -patchPhase() { - eval "$prePatch" - - if test -z "$patchPhase" -a -z "$patches"; then return; fi - - for i in $patches; do - header "applying patch $i" 3 - local uncompress=cat - case $i in - *.gz) - uncompress="gzip -d" - ;; - *.bz2) - uncompress="bzip2 -d" - ;; - esac - $uncompress < $i | patch ${patchFlags:--p1} - stopNest - done - - eval "$postPatch" -} - - -fixLibtool() { - sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1" -} - - -configurePhase() { - eval "$preConfigure" - - if test -z "$configureScript"; then - configureScript=./configure - if ! test -x $configureScript; then - echo "no configure script, doing nothing" - return - fi - fi - - if test -z "$dontFixLibtool"; then - for i in $(find . -name "ltmain.sh"); do - echo "fixing libtool script $i" - fixLibtool $i - done - fi - - if test -z "$dontAddPrefix"; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" - fi - - # Add --disable-dependency-tracking to speed up some builds. - if test -z "$dontAddDisableDepTrack"; then - if grep -q dependency-tracking $configureScript; then - configureFlags="--disable-dependency-tracking $configureFlags" - fi - fi - - echo "configure flags: $configureFlags ${configureFlagsArray[@]}" - $configureScript $configureFlags"${configureFlagsArray[@]}" - - eval "$postConfigure" -} - - -buildPhase() { - eval "$preBuild" - - if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then - echo "no Makefile, doing nothing" - return - fi - - echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeFlagsArray[@]}" \ - $buildFlags "${buildFlagsArray[@]}" - - eval "$postBuild" -} - - -checkPhase() { - eval "$preCheck" - - echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeFlagsArray[@]}" \ - $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check} - - eval "$postCheck" -} - - -patchELF() { - # Patch all ELF executables and shared libraries. - header "patching ELF executables and libraries" - if test -e "$prefix"; then - find "$prefix" \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm +0100 \) \ - \) -print -exec patchelf --shrink-rpath {} \; - fi - stopNest -} - - -patchShebangs() { - # Rewrite all script interpreter file names (`#! /path') under the - # specified directory tree to paths found in $PATH. E.g., - # /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. - # Interpreters that are already in the store are left untouched. - header "patching script interpreter paths" - local dir="$1" - local f - for f in $(find "$dir" -type f -perm +0100); do - local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") - if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then - local newPath=$(type -P $(basename $oldPath) || true) - if test -n "$newPath" -a "$newPath" != "$oldPath"; then - echo "$f: interpreter changed from $oldPath to $newPath" - sed -i -e "1 s,$oldPath,$newPath," "$f" - fi - fi - done - stopNest -} - - -installPhase() { - eval "$preInstall" - - ensureDir "$prefix" - - installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ - $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" - - eval "$postInstall" -} - - -# The fixup phase performs generic, package-independent, Nix-related -# stuff, like running patchelf and setting the -# propagated-build-inputs. It should rarely be overriden. -fixupPhase() { - eval "$preFixup" - - # Put man/doc/info under $out/share. - forceShare=${forceShare:=man doc info} - if test -n "$forceShare"; then - for d in $forceShare; do - if test -d "$prefix/$d"; then - if test -d "$prefix/share/$d"; then - echo "both $d/ and share/$d/ exists!" - else - echo "fixing location of $d/ subdirectory" - ensureDir $prefix/share - if test -w $prefix/share; then - mv -v $prefix/$d $prefix/share - ln -sv share/$d $prefix - fi - fi - fi - done; - fi - - # TODO: strip _only_ ELF executables, and return || fail here... - if test -z "$dontStrip"; then - stripDebugList=${stripDebugList:-lib libexec bin sbin} - if test -n "$stripDebugList"; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" - fi - - stripAllList=${stripAllList:-} - if test -n "$stripAllList"; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" - fi - fi - - if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then - patchELF "$prefix" - fi - - if test -z "$dontPatchShebangs"; then - patchShebangs "$prefix" - fi - - if test -n "$propagatedBuildInputs"; then - ensureDir "$out/nix-support" - echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" - fi - - if test -n "$setupHook"; then - ensureDir "$out/nix-support" - substituteAll "$setupHook" "$out/nix-support/setup-hook" - fi - - eval "$postFixup" -} - - -distPhase() { - eval "$preDist" - - echo "dist flags: $distFlags ${distFlagsArray[@]}" - make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} - - if test "$dontCopyDist" != 1; then - ensureDir "$out/tarballs" - - # Note: don't quote $tarballs, since we explicitly permit - # wildcards in there. - cp -pvd ${tarballs:-*.tar.gz} $out/tarballs - fi - - eval "$postDist" -} - - -showPhaseHeader() { - local phase="$1" - case $phase in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - *) header "$phase";; - esac -} - - -genericBuild() { - header "building $out" - - if test -n "$buildCommand"; then - eval "$buildCommand" - return - fi - - if test -z "$phases"; then - phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ - configurePhase $preBuildPhases buildPhase checkPhase \ - $preInstallPhases installPhase fixupPhase \ - $preDistPhases distPhase $postPhases"; - fi - - for curPhase in $phases; do - if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi - if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi - if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi - if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi - if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi - - showPhaseHeader "$curPhase" - startLog "$curPhase" - dumpVars - - # Evaluate the variable named $curPhase if it exists, otherwise the - # function named $curPhase. - eval "${!curPhase:-$curPhase}" - - if test "$curPhase" = unpackPhase; then - cd "${sourceRoot:-.}" - fi - - stopLog - stopNest - done - - stopNest -} - - -# Execute the post-hook. -if test -n "@postHook@"; then source @postHook@; fi -eval "$postHook" - - -dumpVars diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b4e499a53bc..372bff1eae1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,3 +1,17 @@ +# Run the named hook, either by calling the function with that name or +# by evaluating the variable with that name. This allows convenient +# setting of hooks both from Nix expressions (as attributes / +# environment variables) and from shell scripts (as functions). +runHook() { + local hookName="$1" + if test "$(type -t $hookName)" = function; then + $hookName + else + eval "${!hookName}" + fi +} + + exitHandler() { exitCode=$? set +e @@ -16,7 +30,7 @@ exitHandler() { fi if test $exitCode != 0; then - eval "$failureHook" + runHook failureHook # If the builder had a non-zero exit code and # $succeedOnFailure is set, create the file @@ -30,7 +44,7 @@ exitHandler() { fi else - eval "$exitHook" + runHook exitHook fi exit $exitCode @@ -46,18 +60,14 @@ trap "exitHandler" EXIT addToSearchPathWithCustomDelimiter() { local delimiter=$1 local varName=$2 - local needDir=$3 - local addDir=${4:-$needDir} - local prefix=$5 - if [ -d $prefix$needDir ]; then - if [ -z ${!varName} ]; then - eval export ${varName}=${prefix}$addDir - else - eval export ${varName}=${!varName}${delimiter}${prefix}$addDir - fi + local dir=$3 + if [ -d "$dir" ]; then + eval export ${varName}=${!varName}${!varName:+$delimiter}${dir} fi } +PATH_DELIMITER=':' + addToSearchPath() { addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" } @@ -71,11 +81,17 @@ set -e test -z $NIX_GCC && NIX_GCC=@gcc@ +# Wildcard expansions that don't match should expand to an empty list. +# This ensures that, for instance, "for i in *; do ...; done" does the +# right thing. +shopt -s nullglob + + # Set up the initial path. PATH= for i in $NIX_GCC @initialPath@; do if test "$i" = /; then i=; fi - PATH=$PATH${PATH:+:}$i/bin + addToSearchPath PATH $i/bin done if test "$NIX_DEBUG" = "1"; then @@ -85,7 +101,6 @@ fi # Execute the pre-hook. export SHELL=@shell@ -PATH_DELIMITER=':' if test -z "$shell"; then export shell=@shell@ fi @@ -95,7 +110,7 @@ param3=@param3@ param4=@param4@ param5=@param5@ if test -n "@preHook@"; then source @preHook@; fi -eval "$preHook" +runHook preHook # Check that the pre-hook initialised SHELL. @@ -118,22 +133,15 @@ ensureDir() { } installBin() { - ensureDir $out/bin - cp "$@" $out/bin -} - -assertEnvExists(){ - if test -z "${!1}"; then - msg=${2:-error: assertion failed: env var $1 is required} - echo $msg >&2; exit 1 - fi + ensureDir $out/bin + cp "$@" $out/bin } # Allow the caller to augment buildInputs (it's not always possible to # do this before the call to setup.sh, since the PATH is empty at that # point; here we have a basic Unix environment). -eval "$addInputsHook" +runHook addInputsHook # Recursively find all build inputs. @@ -160,9 +168,6 @@ findInputs() { } pkgs="" -if test -n "$buildinputs"; then - buildInputs="$buildinputs" # compatibility -fi for i in $buildInputs $propagatedBuildInputs; do findInputs $i done @@ -173,15 +178,11 @@ done addToEnv() { local pkg=$1 - if test "$ignoreFailedInputs" != "1" -a -e $1/nix-support/failed; then - echo "failed input $1" >&2 - exit 1 - fi - if test -d $1/bin; then - export _PATH=$_PATH${_PATH:+:}$1/bin + addToSearchPath _PATH $1/bin fi + # Run the package-specific hooks set by the setup-hook scripts. for i in "${envHooks[@]}"; do $i $pkg done @@ -195,6 +196,9 @@ done # Add the output as an rpath. if test "$NIX_NO_SELF_RPATH" != "1"; then export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" + if test -n "$NIX_LIB64_IN_SELF_RPATH"; then + export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" + fi fi @@ -205,17 +209,6 @@ if test -z "$NIX_STRIP_DEBUG"; then fi -assertEnvExists NIX_STORE \ - "Error: you have an old version of Nix that does not set the - NIX_STORE variable. This is required for purity checking. - Please upgrade." - -assertEnvExists NIX_BUILD_TOP \ - "Error: you have an old version of Nix that does not set the - NIX_BUILD_TOP variable. This is required for purity checking. - Please upgrade." - - # Set the TZ (timezone) environment variable, otherwise commands like # `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must # be set--see zic manual page 2004'). @@ -240,6 +233,10 @@ if test "$NIX_DEBUG" = "1"; then fi +# Make GNU Make produce nested output. +export NIX_INDENT_MAKE=1 + + ###################################################################### # Misc. helper functions. @@ -258,7 +255,7 @@ stripDirs() { if test -n "${dirs}"; then header "stripping (with flags $stripFlags) in $dirs" - find $dirs -type f -print0 | xargs -0 strip $stripFlags || true + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true stopNest fi } @@ -379,58 +376,6 @@ dumpVars() { } -# Redirect stdout/stderr to a named pipe connected to a `tee' process -# that writes the specified file (and also to our original stdout). -# The original stdout is saved in descriptor 3. -startLog() { - local logFile=${logNr}_$1 - logNr=$((logNr + 1)) - if test "$logPhases" = 1; then - ensureDir $logDir - - exec 3>&1 - - if test "$dontLogThroughTee" != 1; then - # This required named pipes (fifos). - logFifo=$NIX_BUILD_TOP/log_fifo - test -p $logFifo || mkfifo $logFifo - startLogWrite "$logDir/$logFile" "$logFifo" - exec > $logFifo 2>&1 - else - exec > $logDir/$logFile 2>&1 - fi - fi -} - -# Factored into a separate function so that it can be overriden. -startLogWrite() { - tee "$1" < "$2" & - logWriterPid=$! -} - - -if test -z "$logDir"; then - logDir=$out/log -fi - -logNr=0 - -# Restore the original stdout/stderr. -stopLog() { - if test "$logPhases" = 1; then - exec >&3 2>&1 - - # Wait until the tee process has died. Otherwise output from - # different phases may be mixed up. - if test -n "$logWriterPid"; then - wait $logWriterPid - logWriterPid= - rm $logFifo - fi - fi -} - - # Utility function: return the base name of the given path, with the # prefix `HASH-' removed, if present. stripHash() { @@ -442,37 +387,34 @@ stripHash() { unpackFile() { - local file="$1" + curSrc="$1" local cmd - header "unpacking source archive $file" 3 + header "unpacking source archive $curSrc" 3 - case "$file" in + case "$curSrc" in *.tar) - tar xvf $file + tar xvf $curSrc ;; *.tar.gz | *.tgz | *.tar.Z) - gzip -d < $file | tar xvf - + gzip -d < $curSrc | tar xvf - ;; *.tar.bz2 | *.tbz2) - bzip2 -d < $file | tar xvf - + bzip2 -d < $curSrc | tar xvf - ;; *.zip) - unzip $file + unzip $curSrc ;; *) - if test -d "$file"; then - stripHash $file - cp -prvd $file $strippedName + if test -d "$curSrc"; then + stripHash $curSrc + cp -prvd $curSrc $strippedName else - if test -n "$findUnpacker"; then - $findUnpacker $1; - fi if test -z "$unpackCmd"; then - echo "source archive $file has unknown type" + echo "source archive $curSrc has unknown type" exit 1 fi - eval "$unpackCmd" + runHook unpackCmd fi ;; esac @@ -482,12 +424,7 @@ unpackFile() { unpackPhase() { - if test -n "$unpackPhase"; then - eval "$unpackPhase" - return - fi - - eval "$preUnpack" + runHook preUnpack if test -z "$srcs"; then if test -z "$src"; then @@ -515,8 +452,8 @@ unpackPhase() { # Find the source directory. if test -n "$setSourceRoot"; then - eval "$setSourceRoot" - else + runHook setSourceRoot + elif test -z "$sourceRoot"; then sourceRoot= for i in *; do if test -d "$i"; then @@ -528,7 +465,7 @@ unpackPhase() { echo "unpacker produced multiple directories" exit 1 fi - sourceRoot=$i + sourceRoot="$i" ;; esac fi @@ -546,27 +483,18 @@ unpackPhase() { # necessary when sources have been copied from other store # locations. if test "dontMakeSourcesWritable" != 1; then - chmod -R +w $sourceRoot + chmod -R u+w "$sourceRoot" fi - eval "$postUnpack" + runHook postUnpack } patchPhase() { - if test -n "$patchPhase"; then - eval "$patchPhase" - return - fi - - eval "$prePatch" + runHook prePatch if test -z "$patchPhase" -a -z "$patches"; then return; fi - if test -z "$patchFlags"; then - patchFlags="-p1" - fi - for i in $patches; do header "applying patch $i" 3 local uncompress=cat @@ -578,11 +506,11 @@ patchPhase() { uncompress="bzip2 -d" ;; esac - $uncompress < $i | patch $patchFlags + $uncompress < $i | patch ${patchFlags:--p1} stopNest done - eval "$postPatch" + runHook postPatch } @@ -592,12 +520,7 @@ fixLibtool() { configurePhase() { - if test -n "$configurePhase"; then - eval "$configurePhase" - return - fi - - eval "$preConfigure" + runHook preConfigure if test -z "$configureScript"; then configureScript=./configure @@ -625,20 +548,22 @@ configurePhase() { fi fi - echo "configure flags: $configureFlags ${configureFlagsArray[@]}" - $configureScript $configureFlags"${configureFlagsArray[@]}" + # By default, disable static builds. + if test -z "$dontDisableStatic"; then + if grep -q enable-static $configureScript; then + configureFlags="--disable-static $configureFlags" + fi + fi - eval "$postConfigure" + echo "configure flags: $configureFlags ${configureFlagsArray[@]}" + $configureScript $configureFlags "${configureFlagsArray[@]}" + + runHook postConfigure } buildPhase() { - if test -n "$buildPhase"; then - eval "$buildPhase" - return - fi - - eval "$preBuild" + runHook preBuild if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then echo "no Makefile, doing nothing" @@ -650,28 +575,19 @@ buildPhase() { $makeFlags "${makeFlagsArray[@]}" \ $buildFlags "${buildFlagsArray[@]}" - eval "$postBuild" + runHook postBuild } checkPhase() { - if test -n "$checkPhase"; then - eval "$checkPhase" - return - fi - - eval "$preCheck" - - if test -z "$checkTarget"; then - checkTarget="check" - fi + runHook preCheck echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" make ${makefile:+-f $makefile} \ $makeFlags "${makeFlagsArray[@]}" \ - $checkFlags "${checkFlagsArray[@]}" $checkTarget + $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check} - eval "$postCheck" + runHook postCheck } @@ -711,28 +627,17 @@ patchShebangs() { installPhase() { - if test -n "$installPhase"; then - eval "$installPhase" - return - fi - - eval "$preInstall" + runHook preInstall ensureDir "$prefix" - if test -z "$installCommand"; then - if test -z "$installTargets"; then - installTargets=install - fi - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ - $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" - else - eval "$installCommand" - fi + installTargets=${installTargets:-install} + echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" + make ${makefile:+-f $makefile} $installTargets \ + $makeFlags "${makeFlagsArray[@]}" \ + $installFlags "${installFlagsArray[@]}" - eval "$postInstall" + runHook postInstall } @@ -740,12 +645,7 @@ installPhase() { # stuff, like running patchelf and setting the # propagated-build-inputs. It should rarely be overriden. fixupPhase() { - if test -n "$fixupPhase"; then - eval "$fixupPhase" - return - fi - - eval "$preFixup" + runHook preFixup # Put man/doc/info under $out/share. forceShare=${forceShare:=man doc info} @@ -768,7 +668,7 @@ fixupPhase() { # TODO: strip _only_ ELF executables, and return || fail here... if test -z "$dontStrip"; then - stripDebugList=${stripDebugList:-lib bin sbin} + stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} if test -n "$stripDebugList"; then stripDirs "$stripDebugList" "${stripDebugFlags:--S}" fi @@ -797,38 +697,25 @@ fixupPhase() { substituteAll "$setupHook" "$out/nix-support/setup-hook" fi - eval "$postFixup" + runHook postFixup } distPhase() { - if test -n "$distPhase"; then - eval "$distPhase" - return - fi - - eval "$preDist" - - if test -z "$distTarget"; then - distTarget="dist" - fi + runHook preDist echo "dist flags: $distFlags ${distFlagsArray[@]}" - make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" $distTarget + make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then ensureDir "$out/tarballs" - if test -z "$tarballs"; then - tarballs="*.tar.gz" - fi - # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - cp -pvd $tarballs $out/tarballs + cp -pvd ${tarballs:-*.tar.gz} $out/tarballs fi - eval "$postDist" + runHook postDist } @@ -870,7 +757,6 @@ genericBuild() { if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi showPhaseHeader "$curPhase" - startLog "$curPhase" dumpVars # Evaluate the variable named $curPhase if it exists, otherwise the @@ -881,7 +767,6 @@ genericBuild() { cd "${sourceRoot:-.}" fi - stopLog stopNest done @@ -891,7 +776,7 @@ genericBuild() { # Execute the post-hook. if test -n "@postHook@"; then source @postHook@; fi -eval "$postHook" +runHook postHook dumpVars diff --git a/pkgs/stdenv/initial/builder.sh b/pkgs/stdenv/initial/builder.sh deleted file mode 100644 index 8d287286a9c..00000000000 --- a/pkgs/stdenv/initial/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -export PATH=/usr/bin:/bin - -mkdir $out - -sed -e "s^@initialPath@^/usr /^" -e "s^@preHook@^^" -e "s^@postHook@^^" -e "s^@shell@^/bin/sh^" < $stdenvScript > $out/setup diff --git a/pkgs/stdenv/initial/default.nix b/pkgs/stdenv/initial/default.nix deleted file mode 100644 index 1532406ba8b..00000000000 --- a/pkgs/stdenv/initial/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -# Here we construct an absolutely trivial `initial' standard -# environment. It's not actually a functional stdenv, since there is -# not necessarily a working C compiler. We need this to build -# gcc-wrapper et al. for the native stdenv. - -{system, name}: - -let { - - shell = "/bin/bash"; - - body = - - derivation { - inherit system name; - builder = shell; - args = ["-e" ./builder.sh]; - stdenvScript = ../generic/setup.sh; - } - - // { - mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // { - builder = shell; - args = ["-e" attrs.builder]; - stdenv = body; - system = body.system; - }); - - inherit shell; - }; - -} diff --git a/pkgs/stdenv/linux/bootstrap/i686/bash b/pkgs/stdenv/linux/bootstrap/i686/bash deleted file mode 100755 index a41afe58ac9..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/bash and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/bzip2 b/pkgs/stdenv/linux/bootstrap/i686/bzip2 index ea45149fa4d..c4a9e6cb872 100755 Binary files a/pkgs/stdenv/linux/bootstrap/i686/bzip2 and b/pkgs/stdenv/linux/bootstrap/i686/bzip2 differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/cp b/pkgs/stdenv/linux/bootstrap/i686/cp deleted file mode 100755 index 55142a9e0b8..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/cp and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/cpio b/pkgs/stdenv/linux/bootstrap/i686/cpio new file mode 100755 index 00000000000..03f053ce65e Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/i686/cpio differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 index b7434ff5b9e..394b0fb2b46 100755 Binary files a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 and b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix index e065931e5eb..4200bcb7ea6 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix @@ -1,27 +1,13 @@ { - bash = ./bash; + sh = ./sh; bzip2 = ./bzip2; - cp = ./cp; + mkdir = ./mkdir; + cpio = ./cpio; + ln = ./ln; curl = ./curl.bz2; - tar = ./tar.bz2; - binutilsURL = { - url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2; - sha1 = "73532561c2f98d0df641fbd778bc92cea298762a"; - }; - - gccURL = { - url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2; - sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55"; - }; - - glibcURL = { - url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2; - sha1 = "b9ae1e43e9977476ef53f8c1c9cd1cff5526ff40"; - }; - - staticToolsURL = { - url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2; - sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997"; + bootstrapTools = { + url = http://nixos.org/tarballs/stdenv-linux/i686/r13932/bootstrap-tools.cpio.bz2; + sha256 = "12z35wnpcbjwczsr9fldp6bjpz7wh5qwylw6xfrr9l4s7gmk3m8a"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/i686/ln b/pkgs/stdenv/linux/bootstrap/i686/ln new file mode 100755 index 00000000000..dda29b4ea2b Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/i686/ln differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/mkdir b/pkgs/stdenv/linux/bootstrap/i686/mkdir new file mode 100755 index 00000000000..b3682da3cd2 Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/i686/mkdir differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/sh b/pkgs/stdenv/linux/bootstrap/i686/sh new file mode 100755 index 00000000000..b03bbf0cfcd Binary files /dev/null and b/pkgs/stdenv/linux/bootstrap/i686/sh differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 b/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 deleted file mode 100755 index b6241bf3d23..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/tar.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bash b/pkgs/stdenv/linux/bootstrap/x86_64/bash deleted file mode 100755 index 68200f238e9..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/bash and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bzip2 b/pkgs/stdenv/linux/bootstrap/x86_64/bzip2 deleted file mode 100755 index dd2cce8952c..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/bzip2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/cp b/pkgs/stdenv/linux/bootstrap/x86_64/cp deleted file mode 100755 index 397b1e89809..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/cp and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 deleted file mode 100755 index 8e40942bcfe..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix index 1b265bd66a5..30b30d9c498 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix @@ -1,27 +1,10 @@ +# Use the static tools for i686-linux. They work on x86_64-linux +# machines as well. +(import ../i686) // + { - bash = ./bash; - bzip2 = ./bzip2; - cp = ./cp; - curl = ./curl.bz2; - tar = ./tar.bz2; - - binutilsURL = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2; - sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca"; + bootstrapTools = { + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r13932/bootstrap-tools.cpio.bz2; + sha256 = "135lx2945cxf43g9n39dxcamw6f6n8qp5iqbh4xma575rf2bx5js"; }; - - gccURL = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2; - sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755"; - }; - - glibcURL = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2; - sha1 = "74b1698a4595ce4b4f43a33b3ceca1e4459e494e"; - }; - - staticToolsURL = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2; - sha1 = "4da3af92c9bcd8fc43b31934d8429412e209741b"; - }; -} +} \ No newline at end of file diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 deleted file mode 100755 index 94b2bacdb9d..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 21594bad5a9..90444a96d76 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -9,124 +9,134 @@ rec { - bootstrapTools = + bootstrapFiles = if system == "i686-linux" then import ./bootstrap/i686 else if system == "x86_64-linux" then import ./bootstrap/x86_64 else if system == "powerpc-linux" then import ./bootstrap/powerpc else abort "unsupported platform for the pure Linux stdenv"; + commonPreHook = + '' + export NIX_ENFORCE_PURITY=1 + havePatchELF=1 + ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} + ''; + + # The bootstrap process proceeds in several steps. - # 1) Create a standard environment by downloading pre-built - # statically linked binaries of coreutils, gcc, etc. - - # To fetch the pre-built binaries, we use a statically linked `curl' - # binary which is unpacked here. - curl = derivation { - inherit system; - name = "curl"; - builder = bootstrapTools.bash; - inherit (bootstrapTools) bzip2 cp curl; - args = [ ./scripts/unpack-curl.sh ]; - }; + # 1) Create a standard environment by downloading pre-built binaries + # of coreutils, GCC, etc. + # This function downloads a file. - download = {url, sha1, pkgname}: derivation { + download = {url, sha256}: derivation { name = baseNameOf (toString url); - builder = bootstrapTools.bash; - inherit system curl url; + builder = bootstrapFiles.sh; + inherit system url; + inherit (bootstrapFiles) bzip2 mkdir curl cpio ln; args = [ ./scripts/download.sh ]; - outputHashAlgo = "sha1"; - outputHash = sha1; + outputHashAlgo = "sha256"; + outputHash = sha256; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; }; - # This function downloads and unpacks a file. - downloadAndUnpack = pkgname: {url, sha1}: derivation { - name = pkgname; - builder = bootstrapTools.bash; - inherit (bootstrapTools) bzip2 tar cp; - args = [ ./scripts/unpack.sh ]; - tarball = download {inherit url sha1 pkgname;}; + + # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). + bootstrapTools = derivation { + name = "bootstrap-tools"; + + builder = bootstrapFiles.sh; + + args = [ ./scripts/unpack-bootstrap-tools.sh ]; + + inherit (bootstrapFiles) bzip2 mkdir curl cpio; + + tarball = download { + inherit (bootstrapFiles.bootstrapTools) url sha256; + }; + inherit system; - allowedReferences = []; + + # Needed by the GCC wrapper. + langC = true; + langCC = true; }; - - # The various statically linked components that make up the standard - # environment. - staticTools = downloadAndUnpack "static-tools" bootstrapTools.staticToolsURL; - staticBinutils = downloadAndUnpack "static-binutils" bootstrapTools.binutilsURL; - staticGCC = (downloadAndUnpack "static-gcc" bootstrapTools.gccURL) - // { langC = true; langCC = false; langF77 = false; }; - staticGlibc = downloadAndUnpack "static-glibc" bootstrapTools.glibcURL; - - - # A helper function to call gcc-wrapper. - wrapGCC = - {gcc ? staticGCC, libc, binutils, shell ? ""}: - (import ../../build-support/gcc-wrapper) { - nativeTools = false; - nativeLibc = false; - inherit gcc binutils libc shell; - stdenv = stdenvInitial; - }; - - - # The "fake" standard environment used to build "real" standard - # environments. It consists of just the basic statically linked - # tools. - stdenvInitial = let { - body = derivation { - name = "stdenv-linux-initial"; - builder = bootstrapTools.bash; - args = [ ./scripts/builder-stdenv-initial.sh ]; - stdenvScript = ../generic/setup.sh; - inherit system staticTools curl; - } // { - # !!! too much duplication with stdenv/generic/default.nix - mkDerivation = attrs: (derivation ((removeAttrs attrs ["meta"]) // { - builder = bootstrapTools.bash; - args = ["-e" attrs.builder]; - stdenv = body; - system = body.system; - })) // { meta = if attrs ? meta then attrs.meta else {}; }; - shell = bootstrapTools.bash; - }; - }; - + # This function builds the various standard environments used during # the bootstrap. stdenvBootFun = - {gcc, staticGlibc, extraAttrs ? {}, extraPath ? []}: + {gcc, extraAttrs ? {}, extraPath ? [], fetchurl}: - let - fetchurlBoot = import ../../build-support/fetchurl { - stdenv = stdenvInitial; - inherit curl; - }; - in import ../generic { + import ../generic { + inherit system; name = "stdenv-linux-boot"; - param1 = if staticGlibc then "static" else "dynamic"; - preHook = ./scripts/prehook.sh; - stdenv = stdenvInitial; - shell = bootstrapTools.bash; - initialPath = [staticTools] ++ extraPath; - inherit fetchurlBoot; - forceFetchurlBoot = true; - inherit gcc extraAttrs; + param1 = bootstrapTools; + preHook = builtins.toFile "prehook.sh" + '' + export LD_LIBRARY_PATH=$param1/lib + # Don't patch #!/interpreter because it leads to retained + # dependencies on the bootstrapTools in the final stdenv. + dontPatchShebangs=1 + ${commonPreHook} + ''; + shell = "${bootstrapTools}/bin/sh"; + initialPath = [bootstrapTools] ++ extraPath; + fetchurlBoot = fetchurl; + inherit gcc; + extraAttrs = extraAttrs // {inherit fetchurl;}; + }; + + + # Build a dummy stdenv with no GCC or working fetchurl. This is + # because we need a stdenv to build the GCC wrapper and fetchurl. + stdenvLinuxBoot0 = stdenvBootFun { + gcc = "/no-such-path"; + fetchurl = null; + }; + + + fetchurl = import ../../build-support/fetchurl { + stdenv = stdenvLinuxBoot0; + curl = bootstrapTools; + }; + + + # The Glibc include directory cannot have the same prefix as the GCC + # include directory, since GCC gets confused otherwise (it will + # search the Glibc headers before the GCC headers). So create a + # dummy Glibc. + bootstrapGlibc = stdenvLinuxBoot0.mkDerivation { + name = "bootstrap-glibc"; + buildCommand = '' + ensureDir $out + ln -s ${bootstrapTools}/lib $out/lib + ln -s ${bootstrapTools}/include-glibc $out/include + ''; + }; + + + # A helper function to call gcc-wrapper. + wrapGCC = + {gcc ? bootstrapTools, libc, binutils, shell ? "", name ? "bootstrap-gcc"}: + + import ../../build-support/gcc-wrapper { + nativeTools = false; + nativeLibc = false; + inherit gcc binutils libc shell name; + stdenv = stdenvLinuxBoot0; }; # Create the first "real" standard environment. This one consists - # of statically linked components only, and a minimal glibc to keep - # the gcc configure script happy. + # of bootstrap tools only, and a minimal Glibc to keep the GCC + # configure script happy. stdenvLinuxBoot1 = stdenvBootFun { - # Use the statically linked, downloaded glibc/gcc/binutils. - gcc = wrapGCC {libc = staticGlibc; binutils = staticBinutils;}; - staticGlibc = true; + gcc = wrapGCC {libc = bootstrapGlibc; binutils = bootstrapTools;}; + inherit fetchurl; }; @@ -138,18 +148,18 @@ rec { }; - # 3) Build Glibc with the statically linked tools. The result is the - # full, dynamically linked, final Glibc. + # 3) Build Glibc with the bootstrap tools. The result is the full, + # dynamically linked, final Glibc. stdenvLinuxGlibc = stdenvLinuxBoot1Pkgs.glibc; # 4) Construct a second stdenv identical to the first, except that # this one uses the Glibc built in step 3. It still uses - # statically linked tools. + # the rest of the bootstrap tools, including GCC. stdenvLinuxBoot2 = removeAttrs (stdenvBootFun { - staticGlibc = false; - gcc = wrapGCC {binutils = staticBinutils; libc = stdenvLinuxGlibc;}; + gcc = wrapGCC {binutils = bootstrapTools; libc = stdenvLinuxGlibc;}; extraAttrs = {glibc = stdenvLinuxGlibc;}; + inherit fetchurl; }) ["gcc" "binutils"]; @@ -160,25 +170,18 @@ rec { }; - # Ugh, some packages in stdenvLinuxBoot3Pkgs need "sh", so create a - # package that contains just a symlink to bash. - shSymlink = stdenvLinuxBoot2Pkgs.runCommand "sh-symlink" {} '' - ensureDir $out/bin - ln -s $shell $out/bin/sh - ''; - - # 6) Construct a third stdenv identical to the second, except that # this one uses the dynamically linked GCC and Binutils from step - # 5. The other tools (e.g. coreutils) are still static. + # 5. The other tools (e.g. coreutils) are still from the + # bootstrap tools. stdenvLinuxBoot3 = stdenvBootFun { - staticGlibc = false; - gcc = wrapGCC { + gcc = wrapGCC rec { inherit (stdenvLinuxBoot2Pkgs) binutils; libc = stdenvLinuxGlibc; gcc = stdenvLinuxBoot2Pkgs.gcc.gcc; + name = ""; }; - extraPath = [stdenvLinuxBoot2Pkgs.replace shSymlink]; + inherit fetchurl; }; @@ -192,27 +195,31 @@ rec { # 8) Construct the final stdenv. It uses the Glibc, GCC and # Binutils built above, and adds in dynamically linked versions # of all other tools. + # + # When updating stdenvLinux, make sure that the result has no + # dependency (`nix-store -qR') on bootstrapTools. stdenvLinux = import ../generic { name = "stdenv-linux"; - preHook = ./scripts/prehook.sh; - initialPath = [ + + inherit system; + + preHook = builtins.toFile "prehook.sh" commonPreHook; + + initialPath = ((import ../common-path.nix) {pkgs = stdenvLinuxBoot3Pkgs;}) - stdenvLinuxBoot3Pkgs.patchelf - ]; + ++ [stdenvLinuxBoot3Pkgs.patchelf]; - stdenv = stdenvInitial; - - gcc = wrapGCC { + gcc = wrapGCC rec { inherit (stdenvLinuxBoot2Pkgs) binutils; libc = stdenvLinuxGlibc; gcc = stdenvLinuxBoot2Pkgs.gcc.gcc; - shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh"; + shell = stdenvLinuxBoot3Pkgs.bash + "/bin/bash"; + name = ""; }; - shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh"; + shell = stdenvLinuxBoot3Pkgs.bash + "/bin/bash"; - fetchurlBoot = stdenvLinuxBoot3.fetchurlBoot; - forceFetchurlBoot = false; + fetchurlBoot = fetchurl; extraAttrs = { inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 71aa638378c..2b4c6b812db 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,69 +1,228 @@ {system ? builtins.currentSystem}: -let +with import ../../top-level/all-packages.nix {inherit system;}; - pkgs = import ../../top-level/all-packages.nix {inherit system;}; +rec { - - # Have to do removeAttrs to prevent all-packages from copying - # stdenv-linux's dependencies, rather than building new ones with - # dietlibc. - pkgsToRemove = - [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep" - "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf" - ]; - pkgsDiet = import ../../top-level/all-packages.nix { - bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) pkgsToRemove; + # We want coreutils without ACL support. + coreutils_ = coreutils.function (args: { + aclSupport = false; + }); + + + gcc = gcc43; + + + curlDiet = import ../../tools/networking/curl { + inherit fetchurl; + stdenv = useDietLibC stdenv; + zlibSupport = false; + sslSupport = false; }; - pkgsStatic = import ../../top-level/all-packages.nix { - bootStdenv = removeAttrs (pkgs.makeStaticBinaries pkgs.stdenv) pkgsToRemove; + + bzip2Diet = import ../../tools/compression/bzip2 { + inherit fetchurl; + stdenv = useDietLibC stdenv; }; - - generator = pkgs.stdenv.mkDerivation { - name = "bootstrap-tools-generator"; - builder = ./make-bootstrap-tools.sh; - inherit (pkgsDiet) - coreutils diffutils gnugrep - gzip bzip2 gnumake bash patch binutils curl; + build = - findutils = pkgsDiet.findutils4227; # 4.2.28 is broken - - gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors + stdenv.mkDerivation { + name = "build"; - # patchelf is C++, won't work with dietlibc. - inherit (pkgsStatic) patchelf; + buildInputs = [nukeReferences cpio]; - gnutar = - # Tar seems to be broken on dietlibc on x86_64. - if system != "x86_64-linux" - then pkgsDiet.gnutar151 # 1.16 is broken - else pkgsStatic.gnutar; + buildCommand = '' + ensureDir $out/bin $out/lib $out/libexec - gawk = - # Dietlibc only provides sufficient math functions (fmod, sin, - # cos, etc.) on i686. On other platforms, use Glibc. - if system == "i686-linux" - then pkgsDiet.gawk - else pkgsStatic.gawk; - - gcc = import ../../development/compilers/gcc-4.2 { - inherit (pkgs) fetchurl stdenv; - noSysDirs = true; - langCC = false; - staticCompiler = true; - profiledCompiler = true; + # Copy what we need of Glibc. + cp -d ${glibc}/lib/ld-*.so* $out/lib + cp -d ${glibc}/lib/libc*.so* $out/lib + cp -d ${glibc}/lib/libc_nonshared.a $out/lib + cp -d ${glibc}/lib/libm*.so* $out/lib + cp -d ${glibc}/lib/libdl*.so* $out/lib + cp -d ${glibc}/lib/librt*.so* $out/lib + cp -d ${glibc}/lib/libpthread*.so* $out/lib + cp -d ${glibc}/lib/libnsl*.so* $out/lib + cp -d ${glibc}/lib/libutil*.so* $out/lib + cp -d ${glibc}/lib/crt?.o $out/lib + + cp -rL ${glibc}/include $out + chmod -R u+w $out/include + + # Hopefully we won't need these. + rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video + mv $out/include $out/include-glibc + + # Copy coreutils, bash, etc. + cp ${coreutils_}/bin/* $out/bin + (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) + + cp ${bash}/bin/bash $out/bin + cp ${findutils}/bin/find $out/bin + cp ${findutils}/bin/xargs $out/bin + cp -d ${diffutils}/bin/* $out/bin + cp -d ${gnused}/bin/* $out/bin + cp -d ${gnugrep}/bin/* $out/bin + cp ${gawk}/bin/gawk $out/bin + cp -d ${gawk}/bin/awk $out/bin + cp ${gnutar}/bin/tar $out/bin + cp ${gzip}/bin/gzip $out/bin + cp ${bzip2}/bin/bzip2 $out/bin + cp -d ${gnumake}/bin/* $out/bin + cp -d ${patch}/bin/* $out/bin + cp ${patchelf}/bin/* $out/bin + cp ${replace}/bin/* $out/bin + + cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep + + # Copy what we need of GCC. + cp -d ${gcc.gcc}/bin/gcc $out/bin + cp -d ${gcc.gcc}/bin/cpp $out/bin + cp -d ${gcc.gcc}/bin/g++ $out/bin + cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib + cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib + cp -rd ${gcc.gcc}/lib/gcc $out/lib + chmod -R u+w $out/lib + rm -f $out/lib/gcc/*/*/include*/linux + rm -f $out/lib/gcc/*/*/include*/sound + rm -rf $out/lib/gcc/*/*/include*/root + #rm -f $out/lib/gcc/*/*/*.a + cp -rd ${gcc.gcc}/libexec/* $out/libexec + mkdir $out/include + cp -rd ${gcc.gcc}/include/c++ $out/include + chmod -R u+w $out/include + rm -rf $out/include/c++/*/ext/pb_ds + rm -rf $out/include/c++/*/ext/parallel + + cp -d ${gmp}/lib/libgmp*.so* $out/lib + cp -d ${mpfr}/lib/libmpfr*.so* $out/lib + + # Copy binutils. + for i in as ld ar ranlib nm strip readelf objdump; do + cp ${binutils}/bin/$i $out/bin + done + + chmod -R u+w $out + + # Strip executables even further. + for i in $out/bin/* $out/libexec/gcc/*/*/*; do + if test -x $i -a ! -L $i; then + chmod +w $i + strip -s $i || true + fi + done + + nuke-refs $out/bin/* + nuke-refs $out/lib/* + nuke-refs $out/libexec/gcc/*/*/* + + mkdir $out/.pack + mv $out/* $out/.pack + mv $out/.pack $out/pack + + mkdir $out/on-server + (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 + + mkdir $out/in-nixpkgs + cp ${klibc}/lib/klibc/bin.static/sh $out/in-nixpkgs + cp ${klibc}/lib/klibc/bin.static/cpio $out/in-nixpkgs + cp ${klibc}/lib/klibc/bin.static/mkdir $out/in-nixpkgs + cp ${klibc}/lib/klibc/bin.static/ln $out/in-nixpkgs + cp ${curlDiet}/bin/curl $out/in-nixpkgs + cp ${bzip2Diet}/bin/bzip2 $out/in-nixpkgs + chmod u+w $out/in-nixpkgs/* + strip $out/in-nixpkgs/* + nuke-refs $out/in-nixpkgs/* + bzip2 $out/in-nixpkgs/curl + ''; # */ + + # The result should not contain any references (store paths) so + # that we can safely copy them out of the store and to other + # locations in the store. + allowedReferences = []; }; + - glibc = pkgs.glibc; + unpack = + + stdenv.mkDerivation { + name = "unpack"; - # The result should not contain any references (store paths) so - # that we can safely copy them out of the store and to other - # locations in the store. - allowedReferences = []; - }; + buildCommand = '' + ${build}/in-nixpkgs/mkdir $out + ${build}/in-nixpkgs/bzip2 -d < ${build}/on-server/bootstrap-tools.cpio.bz2 | (cd $out && ${build}/in-nixpkgs/cpio -V -i) -in generator + for i in $out/bin/* $out/libexec/gcc/*/*/*; do + echo patching $i + if ! test -L $i; then + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ + $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i + fi + done + + # Fix the libc linker script. + for i in $out/lib/libc.so; do + cat $i | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $i.tmp + mv $i.tmp $i + done + ''; # " */ + + allowedReferences = ["out"]; + }; + + + test = + + stdenv.mkDerivation { + name = "test"; + + LD_LIBRARY_PATH = "${unpack}/lib"; + + realBuilder = "${unpack}/bin/bash"; + + buildCommand = '' + export PATH=${unpack}/bin + ls -l + mkdir $out + mkdir $out/bin + sed --version + find --version + diff --version + patch --version + make --version + awk --version + grep --version + gcc --version + + ${build}/in-nixpkgs/sh -c 'echo Hello World' + + ldlinux=$(echo ${unpack}/lib/ld-linux*.so.2) + + export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}" + export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" + export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" + + echo '#include ' >> foo.c + echo '#include ' >> foo.c + echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c + $CC -o $out/bin/foo foo.c + $out/bin/foo + + echo '#include ' >> bar.cc + echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc + $CXX -v -o $out/bin/bar bar.cc + $out/bin/bar + + tar xvf ${hello.src} + cd hello-* + ./configure --prefix=$out + make + make install + ''; # */ + }; + +} diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh deleted file mode 100644 index 820e26f5d65..00000000000 --- a/pkgs/stdenv/linux/make-bootstrap-tools.sh +++ /dev/null @@ -1,168 +0,0 @@ -source $stdenv/setup - -ensureDir $out/in-nixpkgs -ensureDir $out/on-server - -# Everything we put in check-only is merely to allow Nix to check that -# we aren't putting binaries with store path references in tarballs. -ensureDir $out/check-only - - -export PATH=$coreutils/bin:$PATH # !!! temporary hack - - -nukeRefs() { - # Dirty, disgusting, but it works ;-) - fileName=$1 - cat $fileName | sed "s|/nix/store/[a-z0-9]*-|/nix/store/ffffffffffffffffffffffffffffffff-|g" > $fileName.tmp - if test -x $fileName; then chmod +x $fileName.tmp; fi - mv $fileName.tmp $fileName -} - - -# Create the tools that need to be in-tree, i.e., the ones that are -# necessary for the absolute first stage of the bootstrap. -cp $bash/bin/bash $out/in-nixpkgs -nukeRefs $out/in-nixpkgs/bash -cp $bzip2/bin/bzip2 $out/in-nixpkgs -cp $coreutils/bin/cp $out/in-nixpkgs -cp $gnutar/bin/tar $out/in-nixpkgs -nukeRefs $out/in-nixpkgs/tar - -if test "$system" = "powerpc-linux"; then - nukeRefs $out/in-nixpkgs/cp -fi - - -# Create the tools tarball. -mkdir tools -mkdir tools/bin - -cp $coreutils/bin/* tools/bin -rm tools/bin/groups # has references -rm tools/bin/printf # idem - -cp $findutils/bin/find tools/bin -cp $findutils/bin/xargs tools/bin -cp $diffutils/bin/* tools/bin -cp $gnused/bin/* tools/bin -cp $gnugrep/bin/* tools/bin -cp $gawk/bin/gawk tools/bin -ln -s gawk tools/bin/awk -cp $gnutar/bin/* tools/bin -cp $gzip/bin/gzip tools/bin -cp $bzip2/bin/bzip2 tools/bin -cp $gnumake/bin/* tools/bin -cp $patch/bin/* tools/bin -cp $patchelf/bin/* tools/bin - -nukeRefs tools/bin/diff -nukeRefs tools/bin/sed -nukeRefs tools/bin/gawk -nukeRefs tools/bin/tar -nukeRefs tools/bin/grep -nukeRefs tools/bin/fgrep -nukeRefs tools/bin/egrep -nukeRefs tools/bin/patchelf -nukeRefs tools/bin/make - - -# Create the binutils tarball. -mkdir binutils -mkdir binutils/bin -for i in as ld ar ranlib nm strip readelf objdump; do - cp $binutils/bin/$i binutils/bin - nukeRefs binutils/bin/$i -done - - -# Create the gcc tarball. -mkdir gcc -mkdir gcc/bin -cp $gcc/bin/gcc gcc/bin -cp $gcc/bin/cpp gcc/bin -nukeRefs gcc/bin/gcc -nukeRefs gcc/bin/cpp -cp -prd $gcc/lib gcc -cp -prd $gcc/libexec gcc -chmod -R +w gcc -nukeRefs gcc/libexec/gcc/*/*/cc1 -nukeRefs gcc/libexec/gcc/*/*/collect2 -if test -e gcc/lib/libgcc_s.so.1; then - nukeRefs gcc/lib/libgcc_s.so.1 -fi -if test -e $gcc/lib64; then - cp -prd $gcc/lib64 gcc - chmod -R +w gcc/lib64 - nukeRefs gcc/lib64/libgcc_s.so.1 -fi -rm -f gcc/lib*/libmud* gcc/lib*/libiberty* gcc/lib*/libssp* gcc/lib*/libgomp* -rm -rf gcc/lib/gcc/*/*/install-tools -rm -rf gcc/lib/gcc/*/*/include/root -rm -rf gcc/lib/gcc/*/*/include/linux -if test "$system" = "powerpc-linux"; then - nukeRefs gcc/lib/gcc/powerpc-unknown-linux-gnu/*/include/bits/mathdef.h -fi -# Dangling symlink "sound", probably produced by fixinclude. -# Should investigate why it's there in the first place. -rm -f gcc/lib/gcc/*/*/include/sound - - -# Create the glibc tarball. -mkdir glibc -mkdir glibc/lib -cp $glibc/lib/*.a glibc/lib -rm -f glibc/lib/*_p.a -nukeRefs glibc/lib/libc.a -cp $glibc/lib/*.o glibc/lib -cp -prd $glibc/include glibc -chmod -R +w glibc -rm glibc/include/linux -cp -prd $(readlink $glibc/include/linux) glibc/include -rm glibc/include/asm -if test -L "$(readlink $glibc/include/asm)"; then - ln -s $(readlink $(readlink $glibc/include/asm)) glibc/include/asm -else - cp -prd "$(readlink $glibc/include/asm)" glibc/include -fi -for i in glibc/include/asm-*; do - target=$(readlink $i) - rm $i - cp -prd $target glibc/include -done -# Hopefully we won't need these. -rm -f glibc/include/mtd glibc/include/rdma glibc/include/sound glibc/include/video - - -# Strip executables even further. -for i in $out/in-nixpkgs/* */bin/* gcc/libexec/gcc/*/*/*; do - if test -x $i; then - chmod +w $i - strip -s $i || true - fi -done - - -# Pack, unpack everything. -bzip2 < $curl/bin/curl > $out/in-nixpkgs/curl.bz2 -bzip2 $out/in-nixpkgs/tar -chmod +x $out/in-nixpkgs/*.bz2 - -tar cfj $out/on-server/static-tools.tar.bz2 tools -tar cfj $out/on-server/binutils.tar.bz2 binutils -tar cfj $out/on-server/gcc.tar.bz2 gcc -tar cfj $out/on-server/glibc.tar.bz2 glibc - -for i in $out/on-server/*.tar.bz2; do - (cd $out/check-only && tar xfj $i) -done - -for i in $out/in-nixpkgs/*.bz2; do - (cd $out/check-only && bunzip2 < $i > $(basename $i .bz2)) -done - - -# Check that everything is statically linked -for i in $(find $out -type f -perm +111); do - if ldd $i | grep -q "=>"; then echo "not statically linked: $i"; exit 1; fi -done diff --git a/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh deleted file mode 100644 index 6bd2f3084bf..00000000000 --- a/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -PATH=$staticTools/bin - -mkdir $out - -sed -e "s^@initialPath@^$staticTools^" -e "s^@preHook@^^" -e "s^@postHook@^^" -e "s^@shell@^$SHELL^" < $stdenvScript > $out/setup diff --git a/pkgs/stdenv/linux/scripts/download.sh b/pkgs/stdenv/linux/scripts/download.sh index 1d010f88d1e..e7594f208ea 100644 --- a/pkgs/stdenv/linux/scripts/download.sh +++ b/pkgs/stdenv/linux/scripts/download.sh @@ -1,3 +1,8 @@ set -e + +$ln -s $curl curl.bz2 +$bzip2 -d -f curl.bz2 +./curl --version + echo "downloading $out from $url" -$curl/bin/curl --fail --location --max-redirs 20 "$url" > "$out" +./curl --fail --location --max-redirs 20 "$url" > "$out" diff --git a/pkgs/stdenv/linux/scripts/prehook.sh b/pkgs/stdenv/linux/scripts/prehook.sh index 4ba81f1eef7..29c02e2eaf2 100644 --- a/pkgs/stdenv/linux/scripts/prehook.sh +++ b/pkgs/stdenv/linux/scripts/prehook.sh @@ -1,8 +1,3 @@ export NIX_ENFORCE_PURITY=1 -if test "$param1" = "static"; then - export NIX_CFLAGS_LINK="-static" - export NIX_LDFLAGS_BEFORE="-static" -fi - havePatchELF=1 diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh new file mode 100644 index 00000000000..bb9c7071f3d --- /dev/null +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -0,0 +1,35 @@ +set -e + +# Unpack the bootstrap tools tarball. +echo Unpacking the bootstrap tools... +$mkdir $out +$bzip2 -d < $tarball | (cd $out && $cpio -V -i) + +# Set the ELF interpreter / RPATH in the bootstrap binaries. +echo Patching the bootstrap tools... + +# On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So +# use a copy of patchelf. +LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 $out/bin/cp $out/bin/patchelf . + +for i in $out/bin/* $out/libexec/gcc/*/*/*; do + echo patching $i + if ! test -L $i; then + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ + ./patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i + fi +done + +# Fix the libc linker script. +export PATH=$out/bin +cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp +mv $out/lib/libc.so.tmp $out/lib/libc.so + +# Provide some additional symlinks. +ln -s bash $out/bin/sh + +ln -s bzip2 $out/bin/bunzip2 + +# fetchurl needs curl. +bzip2 -d < $curl > $out/bin/curl +chmod +x $out/bin/curl diff --git a/pkgs/stdenv/linux/scripts/unpack-curl.sh b/pkgs/stdenv/linux/scripts/unpack-curl.sh deleted file mode 100644 index 3023f865c94..00000000000 --- a/pkgs/stdenv/linux/scripts/unpack-curl.sh +++ /dev/null @@ -1,11 +0,0 @@ -set -x -set -e - -# Tricky: need to make $out/bin without mkdir ;-). So use cp to copy -# the current (empty) directory. -$cp -prvd . $out -$cp -prvd . $out/bin - -$cp $curl curl.bz2 -$bzip2 -d curl.bz2 -$cp curl $out/bin diff --git a/pkgs/stdenv/linux/scripts/unpack.sh b/pkgs/stdenv/linux/scripts/unpack.sh deleted file mode 100644 index eb916cbc48d..00000000000 --- a/pkgs/stdenv/linux/scripts/unpack.sh +++ /dev/null @@ -1,8 +0,0 @@ -set -e - -$cp $tar .tar.bz2 -$bzip2 -d .tar.bz2 - -$bzip2 -d < $tarball | ./.tar xvf - - -$cp -prd * $out diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index ee2f9e9eb9f..248cc2a3357 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,11 +1,11 @@ -{stdenvInitial}: +{system, allPackages ? import ../../..}: -let - - system = stdenvInitial.system; +rec { shell = "/bin/bash"; + path = ["/" "/usr" "/usr/local"]; + prehookBase = builtins.toFile "prehook-base.sh" '' # Disable purity tests; it's allowed (even needed) to link to @@ -46,44 +46,53 @@ let # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). - makeStdenv = {stdenvBoot, extraPath, forceFetchurlBoot}: import ../generic { - name = "stdenv-native"; + makeStdenv = + {gcc, fetchurl, extraPath ? []}: - preHook = - if system == "i686-darwin" || system == "powerpc-darwin" then prehookDarwin else - if system == "i686-freebsd" then prehookFreeBSD else - prehookBase; + import ../generic { + name = "stdenv-native"; - initialPath = extraPath ++ ["/" "/usr" "/usr/local"]; + preHook = + if system == "i686-darwin" || system == "powerpc-darwin" then prehookDarwin else + if system == "i686-freebsd" then prehookFreeBSD else + prehookBase; - stdenv = stdenvBoot; + initialPath = extraPath ++ path; - gcc = import ../../build-support/gcc-wrapper { - name = "gcc-native"; - nativeTools = true; - nativeLibc = true; - nativePrefix = "/usr"; - stdenv = stdenvBoot; + fetchurlBoot = fetchurl; + + inherit system shell gcc; }; - inherit shell forceFetchurlBoot; - fetchurlBoot = import ../../build-support/fetchurl { - stdenv = stdenvBoot; - # Curl should be in /usr/bin or so. - curl = null; - }; + stdenvBoot0 = makeStdenv { + gcc = "/no-such-path"; + fetchurl = null; + }; + + + gcc = import ../../build-support/gcc-wrapper { + name = "gcc-native"; + nativeTools = true; + nativeLibc = true; + nativePrefix = "/usr"; + stdenv = stdenvBoot0; }; - + + fetchurl = import ../../build-support/fetchurl { + stdenv = stdenvBoot0; + # Curl should be in /usr/bin or so. + curl = null; + }; + + # First build a stdenv based only on tools outside the store. stdenvBoot1 = makeStdenv { - stdenvBoot = stdenvInitial; - extraPath = []; - forceFetchurlBoot = true; - }; + inherit gcc fetchurl; + } // {inherit fetchurl;}; - stdenvBoot1Pkgs = import ../../.. { + stdenvBoot1Pkgs = allPackages { inherit system; bootStdenv = stdenvBoot1; }; @@ -93,9 +102,10 @@ let # most systems don't have, so we mustn't rely on the native # environment providing it). stdenvBoot2 = makeStdenv { - stdenvBoot = stdenvBoot1; + inherit gcc fetchurl; extraPath = [stdenvBoot1Pkgs.replace]; - forceFetchurlBoot = false; }; -in stdenvBoot2 + + stdenv = stdenvBoot2; +} diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 23471267302..521f381eed2 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -5,7 +5,7 @@ import ../generic { preHook = ./prehook.sh; initialPath = (import ../common-path.nix) {pkgs = pkgs;}; - inherit stdenv; + system = stdenv.system; gcc = import ../../build-support/gcc-wrapper { nativeTools = false; @@ -23,5 +23,4 @@ import ../generic { shell = pkgs.bash + "/bin/sh"; fetchurlBoot = stdenv.fetchurlBoot; - forceFetchurlBoot = false; } diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 3474d3eeb0d..95a1a6da9b5 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -buildPhase=buildPhase buildPhase() { xmkmf make World @@ -18,7 +17,6 @@ buildPhase() { cd .. } -installPhase=installPhase installPhase() { ensureDir $out/bin ensureDir $out/man/man1 diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index cb9ee9e7f06..cc00857f33d 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -2,8 +2,22 @@ stdenv.mkDerivation { name = "cpio-2.9"; + src = fetchurl { url = mirror://gnu/cpio/cpio-2.9.tar.bz2; sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv"; }; + + patches = [ + # Make it compile on GCC 4.3. + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1"; + sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3"; + }) + ]; + + meta = { + homepage = http://www.gnu.org/software/cpio/; + description = "A program to create or extract from cpio archives"; + }; } diff --git a/pkgs/tools/archivers/gnutar/1.15.1.nix b/pkgs/tools/archivers/gnutar/1.15.1.nix deleted file mode 100644 index 77dc1a3c76e..00000000000 --- a/pkgs/tools/archivers/gnutar/1.15.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnutar-1.15.1"; - src = fetchurl { - url = http://nixos.org/tarballs/tar-1.15.1.tar.bz2; - md5 = "57da3c38f8e06589699548a34d5a5d07"; - }; -} diff --git a/pkgs/tools/archivers/gnutar/1.17.nix b/pkgs/tools/archivers/gnutar/1.17.nix deleted file mode 100644 index c87b855ed63..00000000000 --- a/pkgs/tools/archivers/gnutar/1.17.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnutar-1.17"; - src = - fetchurl { - url = mirror://gnu/tar/tar-1.17.tar.bz2; - sha256 = "14m49kya1swilivc2laycw3p3y3i1s3q0vkhwjan58aiv8fh5y8r"; - }; - patches = [./implausible.patch]; -} diff --git a/pkgs/tools/archivers/gnutar/1.18.nix b/pkgs/tools/archivers/gnutar/1.18.nix deleted file mode 100644 index aab315f673e..00000000000 --- a/pkgs/tools/archivers/gnutar/1.18.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnutar-1.17"; - src = - fetchurl { - url = mirror://gnu/tar/tar-1.18.tar.bz2; - sha256 = "0png2yqkw333acf55k0hjs0mcx1s0w0gkf50pa6hv3kw8bh4x524"; - }; - patches = [./implausible.patch ./gnulib-futimens.patch]; -} diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index e2d9b9eee8b..a49b4de52b0 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,17 +1,34 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "gnutar-1.20"; +stdenv.mkDerivation rec { + name = "gnutar-1.22"; src = fetchurl { - url = mirror://gnu/tar/tar-1.20.tar.bz2; - sha256 = "1swx3whm2vh0qzq8v04vgwk5zds6zlznk52xwivj7p2szcxg72xy"; + url = "mirror://gnu/tar/tar-1.22.tar.bz2"; + sha256 = "0kdaadflxa6wznbbrp0xlxk9926hrr4yg7wr6m98ygvs35zvdvrw"; }; patches = [./implausible.patch]; meta = { - homepage = http://www.gnu.org/software/grep/; - description = "GNU implementation of the tar archiver"; + homepage = http://www.gnu.org/software/tar/; + description = "GNU implementation of the `tar' archiver"; + + longDescription = '' + The Tar program provides the ability to create tar archives, as + well as various other kinds of manipulation. For example, you + can use Tar on previously created archives to extract files, to + store additional files, or to update or list files which were + already stored. + + Initially, tar archives were used to store files conveniently on + magnetic tape. The name "Tar" comes from this use; it stands + for tape archiver. Despite the utility's name, Tar can direct + its output to available devices, files, or other programs (using + pipes), it can even access remote devices or files (as + archives). + ''; + + license = "GPLv3+"; }; } diff --git a/pkgs/tools/archivers/unzip/builder.sh b/pkgs/tools/archivers/unzip/builder.sh deleted file mode 100644 index fc38b004381..00000000000 --- a/pkgs/tools/archivers/unzip/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source $stdenv/setup - -builder() { - make -f unix/Makefile generic -} - -installer() { - make -f unix/Makefile prefix=$out install -} - -buildPhase=builder -installPhase=installer - -genericBuild diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 9e17e2d9edd..c72def3731a 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -2,13 +2,17 @@ stdenv.mkDerivation { name = "unzip-5.52"; - builder = ./builder.sh; + src = fetchurl { url = http://nixos.org/tarballs/unzip552.tar.gz; md5 = "9d23919999d6eac9217d1f41472034a9"; }; + buildPhase = "make -f unix/Makefile generic"; + + installPhase = "make -f unix/Makefile prefix=$out install"; + meta = { - homepage = http://www.info-zip.org; + homepage = http://www.info-zip.org; }; } diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index efeb9dac657..ea2ebc4c2db 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -3,20 +3,18 @@ installFlags="PREFIX=$out" if test -n "$sharedLibrary"; then - preBuild=preBuild preBuild() { make -f Makefile-libbz2_so } - preInstall=preInstall preInstall() { ensureDir $out/lib mv libbz2.so* $out/lib + ln -s libbz2.so.1.0 $out/lib/libbz2.so } fi -postInstall=postInstall postInstall() { rm $out/bin/bunzip2* $out/bin/bzcat* ln -s bzip2 $out/bin/bunzip2 diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index eedcf242bca..ddc31de6196 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; sharedLibrary = - !stdenv.isDarwin && !(stdenv ? isDietLibC) && stdenv.system != "i686-cygwin"; + !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin"; meta = { homepage = http://www.bzip.org; diff --git a/pkgs/tools/compression/lzma/default.nix b/pkgs/tools/compression/lzma/default.nix index 67ef9c3add1..bcc649e073d 100644 --- a/pkgs/tools/compression/lzma/default.nix +++ b/pkgs/tools/compression/lzma/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lzma-4.32.5"; + name = "lzma-4.32.7"; src = fetchurl { - url = http://tukaani.org/lzma/lzma-4.32.5.tar.gz; - sha256 = "1mqy1biy46gqky6n3gyr2l395hwckh0xyi96waz5p5x8mgp372ch"; + url = http://tukaani.org/lzma/lzma-4.32.7.tar.gz; + sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz"; }; CFLAGS = "-O3"; diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh index adbddfdf9f5..376c0bf4f39 100644 --- a/pkgs/tools/compression/zdelta/builder.sh +++ b/pkgs/tools/compression/zdelta/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -installPhase=installPhase installPhase() { ensureDir $out/bin cp -p zdc zdu $out/bin diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 0e2fa198a86..8a055d274c9 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, x11, mesa}: stdenv.mkDerivation { - name = "glxinfo-6.5.2"; + name = "glxinfo-7.4.1"; src = fetchurl { - url = mirror://sourceforge/mesa3d/MesaDemos-6.5.2.tar.bz2; - sha256 = "1shfwy0sy3kdk3nykp1gv6s0lafqgqnadwarw5cbpw7mkfap8kw0"; + url = mirror://sourceforge/mesa3d/MesaDemos-7.4.1.tar.bz2; + md5 = "1e169fb6abc2b45613f1c98a82dfe690"; }; buildInputs = [x11 mesa]; diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh index 11ff6f5a332..89d4e3b98ea 100644 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ b/pkgs/tools/graphics/ploticus/builder.sh @@ -4,14 +4,10 @@ preBuild() { cd src } -preBuild=preBuild - preInstall() { ensureDir $out/bin } -preInstall=preInstall - postInstall() { # Install the "prefabs". ensureDir $out/share/ploticus/prefabs && \ @@ -34,7 +30,4 @@ EOF ln -s "$out/man/man1/pl.1" "$out/man/man1/ploticus.1" } -postInstall=postInstall - - genericBuild diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh index d00aa90c61f..f128c4ce364 100644 --- a/pkgs/tools/graphics/transfig/builder.sh +++ b/pkgs/tools/graphics/transfig/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -patchPhase=patchPhase patchPhase() { for i in $patches; do header "applying patch $i" 3 @@ -25,14 +24,12 @@ configureImakefiles() { cp tmpsed transfig/Imakefile } -buildPhase=buildPhase buildPhase() { xmkmf make Makefiles make } -preInstall=preInstall preInstall() { ensureDir $out ensureDir $out/lib diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a23f20bb244..5cff1d5712e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,18 +1,26 @@ {stdenv, fetchurl, aclSupport ? false, acl}: -stdenv.mkDerivation { - name = "coreutils-6.12"; +stdenv.mkDerivation rec { + name = "coreutils-7.2"; src = fetchurl { - url = mirror://gnu/coreutils/coreutils-6.12.tar.gz; - sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9"; - }; - - meta = { - homepage = http://www.gnu.org/software/coreutils/; - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; + url = "mirror://gnu/coreutils/${name}.tar.gz"; + sha256 = "1cpx66kwcg5w78by8i27wb24j0flz2ivv9fqmd4av8z5jbnbyxyx"; }; buildInputs = stdenv.lib.optional aclSupport acl; - # Older kernels: patches = ./setting-time-backward-compatibility.patch; + + meta = { + homepage = http://www.gnu.org/software/coreutils/; + description = "The basic file, shell and text manipulation utilities of the GNU operating system"; + + longDescription = '' + The GNU Core Utilities are the basic file, shell and text + manipulation utilities of the GNU operating system. These are + the core utilities which are expected to exist on every + operating system. + ''; + + license = "GPLv3+"; + }; } diff --git a/pkgs/tools/misc/coreutils/gnulib-futimens.patch b/pkgs/tools/misc/coreutils/gnulib-futimens.patch deleted file mode 100644 index f107f017d82..00000000000 --- a/pkgs/tools/misc/coreutils/gnulib-futimens.patch +++ /dev/null @@ -1,54 +0,0 @@ -now hat glibc-2.6 declares futimens. -http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html - -diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c ---- cpio-2.7.orig/lib/utimens.c 2007-05-20 21:23:57.000000000 +0900 -+++ cpio-2.7/lib/utimens.c 2007-05-21 08:40:22.000000000 +0900 -@@ -73,7 +73,7 @@ - Return 0 on success, -1 (setting errno) on failure. */ - - int --futimens (int fd ATTRIBUTE_UNUSED, -+gl_futimens (int fd ATTRIBUTE_UNUSED, - char const *file, struct timespec const timespec[2]) - { - /* There's currently no interface to set file timestamps with -@@ -166,5 +166,5 @@ - int - utimens (char const *file, struct timespec const timespec[2]) - { -- return futimens (-1, file, timespec); -+ return gl_futimens (-1, file, timespec); - } -diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h ---- cpio-2.7.orig/lib/utimens.h 2007-05-20 21:23:57.000000000 +0900 -+++ cpio-2.7/lib/utimens.h 2007-05-21 08:39:57.000000000 +0900 -@@ -1,3 +1,3 @@ - #include "timespec.h" --int futimens (int, char const *, struct timespec const [2]); -+int gl_futimens (int, char const *, struct timespec const [2]); - int utimens (char const *, struct timespec const [2]); -diff -ru coreutils-6.9.orig/src/copy.c coreutils-6.9/src/copy.c ---- coreutils-6.9.orig/src/copy.c 2007-05-21 09:27:22.000000000 +0900 -+++ coreutils-6.9/src/copy.c 2007-05-21 09:27:47.000000000 +0900 -@@ -623,7 +623,7 @@ - timespec[0] = get_stat_atime (src_sb); - timespec[1] = get_stat_mtime (src_sb); - -- if (futimens (dest_desc, dst_name, timespec) != 0) -+ if (gl_futimens (dest_desc, dst_name, timespec) != 0) - { - error (0, errno, _("preserving times for %s"), quote (dst_name)); - if (x->require_preserve) -diff -ru coreutils-6.9.orig/src/touch.c coreutils-6.9/src/touch.c ---- coreutils-6.9.orig/src/touch.c 2007-05-21 09:27:22.000000000 +0900 -+++ coreutils-6.9/src/touch.c 2007-05-21 09:27:57.000000000 +0900 -@@ -182,7 +182,7 @@ - t = timespec; - } - -- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); -+ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); - - if (fd == STDIN_FILENO) - { diff --git a/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch b/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch deleted file mode 100644 index afeb49cbad5..00000000000 --- a/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- coreutils-6.12/lib/utimens.c 2008-05-29 09:21:57.000000000 -0400 -+++ lib/utimens.c 2008-06-07 11:36:50.000000000 -0400 -@@ -96,20 +96,42 @@ - #endif - - /* POSIX 200x added two interfaces to set file timestamps with -- nanosecond resolution. */ -+ nanosecond resolution. We provide a fallback for ENOSYS (for -+ example, compiling against Linux 2.6.25 kernel headers and glibc -+ 2.7, but running on Linux 2.6.18 kernel). */ - #if HAVE_UTIMENSAT - if (fd < 0) -- return utimensat (AT_FDCWD, file, timespec, 0); -+ { -+ int result = utimensat (AT_FDCWD, file, timespec, 0); -+#ifdef __linux__ -+ /* Work around what might be a kernel bug: -+ http://bugzilla.redhat.com/442352 -+ http://bugzilla.redhat.com/449910 -+ It appears that utimensat can mistakenly return 280 rather -+ than 0 to indicate success. -+ FIXME: remove in 2010 or whenever the offending kernels -+ are no longer in common use. */ -+ if (0 < result) -+ result = 0; -+#endif -+ -+ if (result == 0 || errno != ENOSYS) -+ return result; -+ } - #endif - #if HAVE_FUTIMENS -- return futimens (fd, timespec); --#else -+ { -+ int result = futimens (fd, timespec); -+ if (result == 0 || errno != ENOSYS) -+ return result; -+ } -+#endif - - /* The platform lacks an interface to set file timestamps with - nanosecond resolution, so do the best we can, discarding any - fractional part of the timestamp. */ - { --# if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES -+#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES - struct timeval timeval[2]; - struct timeval const *t; - if (timespec) -@@ -125,9 +147,9 @@ - - if (fd < 0) - { --# if HAVE_FUTIMESAT -+# if HAVE_FUTIMESAT - return futimesat (AT_FDCWD, file, t); --# endif -+# endif - } - else - { -@@ -141,21 +163,21 @@ - worth optimizing, and who knows what other messed-up systems - are out there? So play it safe and fall back on the code - below. */ --# if HAVE_FUTIMESAT -+# if HAVE_FUTIMESAT - if (futimesat (fd, NULL, t) == 0) - return 0; --# elif HAVE_FUTIMES -+# elif HAVE_FUTIMES - if (futimes (fd, t) == 0) - return 0; --# endif -+# endif - } --# endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ -+#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ - - if (!file) - { --# if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES)) -+#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES)) - errno = ENOSYS; --# endif -+#endif - - /* Prefer EBADF to ENOSYS if both error numbers apply. */ - if (errno == ENOSYS) -@@ -170,9 +192,9 @@ - return -1; - } - --# if HAVE_WORKING_UTIMES -+#if HAVE_WORKING_UTIMES - return utimes (file, t); --# else -+#else - { - struct utimbuf utimbuf; - struct utimbuf const *ut; -@@ -187,9 +209,8 @@ - - return utime (file, ut); - } --# endif /* !HAVE_WORKING_UTIMES */ -+#endif /* !HAVE_WORKING_UTIMES */ - } --#endif /* !HAVE_FUTIMENS */ - } - - /* Set the access and modification time stamps of FILE to be - diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 34667f596ed..2350ab26049 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, coreutils}: -stdenv.mkDerivation { - name = "findutils-4.2.33"; +stdenv.mkDerivation rec { + name = "findutils-4.4.1"; + src = fetchurl { - url = mirror://gnu/findutils/findutils-4.2.33.tar.gz; - sha256 = "0y0gmdc55kknf5438c1da5xsvpch3v800r79rgz5rv6fb90djg41"; + url = "mirror://gnu/findutils/${name}.tar.gz"; + sha256 = "0f61phan4q8w5i1lz768q973c1spfqgvc470jc89rpg0gxfvi9bp"; }; + buildInputs = [coreutils]; patches = [ ./findutils-path.patch ./change_echo_path.patch ] @@ -13,8 +15,27 @@ stdenv.mkDerivation { # The locate command probably won't work though. ++ stdenv.lib.optional (stdenv ? isDietLibC) ./dietlibc-hack.patch; + doCheck = true; + meta = { homepage = http://www.gnu.org/software/findutils/; - description = "The basic directory searching utilities of the GNU operating system"; + description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; + + longDescription = '' + The GNU Find Utilities are the basic directory searching + utilities of the GNU operating system. These programs are + typically used in conjunction with other programs to provide + modular and powerful directory search and file locating + capabilities to other commands. + + The tools supplied with this package are: + + * find - search for files in a directory hierarchy; + * locate - list files in databases that match a pattern; + * updatedb - update a file name database; + * xargs - build and execute command lines from standard input. + ''; + + license = "GPLv3+"; }; } diff --git a/pkgs/tools/misc/hg2git/default.nix b/pkgs/tools/misc/hg2git/default.nix new file mode 100644 index 00000000000..291391b6719 --- /dev/null +++ b/pkgs/tools/misc/hg2git/default.nix @@ -0,0 +1,26 @@ +args: with args; +stdenv.mkDerivation { + name = "hg2git"; + + src = sourceByName "hg2git"; + + buildInputs =([mercurial.python mercurial makeWrapper]); + + installPhase = '' + ensureDir $out/bin; + cp hg2git.sh hg2git.py $out/bin + cat >> $out/bin/hg2git-doc << EOF + #!${coreutils}/bin/cat + $(cat hg2git.txt) + EOF + chmod +x $out/bin/hg2git-doc + wrapProgram $out/bin/hg2git.sh \ + --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" + ''; + + meta = { + description = "mercurial to git one way conversion"; + homepage = "http://git.grml.org/?p=hg-to-git.git;a=summary"; + license = "?"; # the .py file is GPLv2 + }; +} diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e1e4cf01ad3..a1ed9e9e449 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -2,12 +2,13 @@ stdenv.mkDerivation rec { name = "idutils-4.2"; + src = fetchurl { url = "mirror://gnu/idutils/${name}.tar.gz"; sha256 = "16gsy7vrjax2zl4galwq03l0y97d18p0pyd5cccyc4i8y3mhwx65"; }; - buildInputs = [ emacs ]; + buildInputs = stdenv.lib.optional stdenv.isLinux emacs; doCheck = true; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 32f2094b44c..57bc769d240 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "memtest86+-1.70"; + name = "memtest86+-2.11"; src = fetchurl { - url = http://www.memtest.org/download/1.70/memtest86+-1.70.tar.gz; - sha256 = "1swj4hc764qwb3j80kvvb4qg5maq9dp8pxzy9jkk187jf92j8vfw"; + url = http://www.memtest.org/download/2.11/memtest86+-2.11.tar.gz; + sha256 = "03kcw6f62na3s08ybhnafn4s1pqs0z5lxl103xwxx77345r6m1s3"; }; preBuild = '' @@ -16,11 +16,19 @@ stdenv.mkDerivation { touch gnu/stubs-32.h fi ''; - - NIX_CFLAGS_COMPILE = "-I."; + + # Override the default optimisation setting (`-Os') to prevent lots + # of spurious errors. See + # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412. + NIX_CFLAGS_COMPILE = "-O1 -I."; installPhase = '' ensureDir $out cp memtest.bin $out/ ''; + + meta = { + homepage = http://www.memtest.org/; + description = "A tool to detect memory errors"; + }; } diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index d256eda7a4b..11e4cf856f4 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -2,20 +2,23 @@ stdenv.mkDerivation { name = "parted-1.8.8"; + src = fetchurl { url = mirror://gnu/parted/parted-1.8.8.tar.bz2; sha256 = "1sn5qcdi4pvxnxz8ryh5p52qmqd72qbk0d0a65pksxf7khd83kfz"; }; + buildInputs = [e2fsprogs readline]; preConfigure='' export CFLAGS=-fgnu89-inline export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fgnu89-inline" ''; + configureFlags = "--without-readline"; meta = { - description = "industrial-strength package for creating, destroying, resizing, checking and copying partitions"; + description = "Tool to create, destroy, resize, check and copy partitions"; homepage = http://www.gnu.org/software/parted/; license = "GPLv3"; }; diff --git a/pkgs/tools/misc/su/default.nix b/pkgs/tools/misc/su/default.nix index 45290ad9038..ad7dddbde97 100644 --- a/pkgs/tools/misc/su/default.nix +++ b/pkgs/tools/misc/su/default.nix @@ -5,23 +5,28 @@ # coreutils a dependency on PAM. stdenv.mkDerivation { - name = "su-6.7"; + name = "su-7.0"; + src = fetchurl { - url = mirror://gnu/coreutils/coreutils-6.7.tar.bz2; - md5 = "a16465d0856cd011a1acc1c21040b7f4"; + url = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-7.0.tar.gz"; + sha256 = "00cwf8rqbj89ikv8fhdhv26dpc2ghzw1hn48pk1vg3nnmxj55nr7"; }; + patches = [ # PAM patch taken from SUSE's coreutils-6.7-5.src.rpm. ./su-pam.patch - ../coreutils/gnulib-futimens.patch ]; + buildInputs = [pam]; - buildPhase = " + + buildPhase = '' make -C lib - make -C src su su_OBJECTS=\"su.o getdef.o\" CFLAGS=\"-DUSE_PAM\" LDFLAGS=\"-lpam -lpam_misc -ldl\" - "; - installPhase = " + make -C src version.h + make -C src su su_OBJECTS="su.o getdef.o" CFLAGS="-DUSE_PAM" LDFLAGS="-lpam -lpam_misc -ldl" + ''; + + installPhase = '' ensureDir $out/bin cp src/su $out/bin - "; + ''; } diff --git a/pkgs/tools/misc/su/su-pam.patch b/pkgs/tools/misc/su/su-pam.patch index 3f81a47f12d..5962d285ebc 100644 --- a/pkgs/tools/misc/su/su-pam.patch +++ b/pkgs/tools/misc/su/su-pam.patch @@ -1,6 +1,6 @@ -diff -rcN coreutils-6.7-orig/getdef.c coreutils-6.7/getdef.c -*** coreutils-6.7-orig/getdef.c Thu Jan 1 00:00:00 1970 ---- coreutils-6.7/getdef.c Tue Jan 16 22:18:41 2007 +diff -rcN coreutils-7.0-orig/src/getdef.c coreutils-7.0/src/getdef.c +*** coreutils-7.0-orig/src/getdef.c 1970-01-01 01:00:00.000000000 +0100 +--- coreutils-7.0/src/getdef.c 2009-02-02 15:28:08.000000000 +0100 *************** *** 0 **** --- 1,257 ---- @@ -261,9 +261,9 @@ diff -rcN coreutils-6.7-orig/getdef.c coreutils-6.7/getdef.c + } + + #endif -diff -rcN coreutils-6.7-orig/getdef.h coreutils-6.7/getdef.h -*** coreutils-6.7-orig/getdef.h Thu Jan 1 00:00:00 1970 ---- coreutils-6.7/getdef.h Tue Jan 16 22:18:41 2007 +diff -rcN coreutils-7.0-orig/src/getdef.h coreutils-7.0/src/getdef.h +*** coreutils-7.0-orig/src/getdef.h 1970-01-01 01:00:00.000000000 +0100 +--- coreutils-7.0/src/getdef.h 2009-02-02 15:28:08.000000000 +0100 *************** *** 0 **** --- 1,29 ---- @@ -296,310 +296,12 @@ diff -rcN coreutils-6.7-orig/getdef.h coreutils-6.7/getdef.h + extern void free_getdef_data (void); + + #endif /* _GETDEF_H_ */ -diff -rcN coreutils-6.7-orig/src/getdef.c coreutils-6.7/src/getdef.c -*** coreutils-6.7-orig/src/getdef.c Thu Jan 1 00:00:00 1970 ---- coreutils-6.7/src/getdef.c Tue Jan 16 22:18:57 2007 +diff -rcN coreutils-7.0-orig/src/su.c coreutils-7.0/src/su.c +*** coreutils-7.0-orig/src/su.c 2008-08-24 22:30:10.000000000 +0200 +--- coreutils-7.0/src/su.c 2009-02-02 15:31:08.000000000 +0100 *************** -*** 0 **** ---- 1,257 ---- -+ /* Copyright (C) 2003, 2004, 2005 Thorsten Kukuk -+ Author: Thorsten Kukuk -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 as -+ published by the Free Software Foundation. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+ #ifdef HAVE_CONFIG_H -+ #include -+ #endif -+ -+ #define _GNU_SOURCE -+ -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ -+ #include "getdef.h" -+ -+ struct item { -+ char *name; /* name of the option. */ -+ char *value; /* value of the option. */ -+ struct item *next; /* pointer to next option. */ -+ }; -+ -+ static struct item *list = NULL; -+ -+ void -+ free_getdef_data (void) -+ { -+ struct item *ptr; -+ -+ ptr = list; -+ while (ptr != NULL) -+ { -+ struct item *tmp; -+ tmp = ptr->next; -+ free (ptr->name); -+ free (ptr->value); -+ free (ptr); -+ ptr = tmp; -+ } -+ -+ list = NULL; -+ } -+ -+ /* Add a new entry to the list. */ -+ static void -+ store (const char *name, const char *value) -+ { -+ struct item *new = malloc (sizeof (struct item)); -+ -+ if (new == NULL) -+ abort (); -+ -+ if (name == NULL) -+ abort (); -+ -+ new->name = strdup (name); -+ new->value = strdup (value?:""); -+ new->next = list; -+ list = new; -+ } -+ -+ /* search a special entry in the list and return the value. */ -+ static const char * -+ search (const char *name) -+ { -+ struct item *ptr; -+ -+ ptr = list; -+ while (ptr != NULL) -+ { -+ if (strcasecmp (name, ptr->name) == 0) -+ return ptr->value; -+ ptr = ptr->next; -+ } -+ -+ return NULL; -+ } -+ -+ /* Load the login.defs file (/etc/login.defs) */ -+ static void -+ load_defaults_internal (const char *filename) -+ { -+ FILE *fp; -+ char *buf = NULL; -+ size_t buflen = 0; -+ -+ fp = fopen (filename, "r"); -+ if (NULL == fp) -+ return; -+ -+ while (!feof (fp)) -+ { -+ char *tmp, *cp; -+ #if defined(HAVE_GETLINE) -+ ssize_t n = getline (&buf, &buflen, fp); -+ #elif defined (HAVE_GETDELIM) -+ ssize_t n = getdelim (&buf, &buflen, '\n', fp); -+ #else -+ ssize_t n; -+ -+ if (buf == NULL) -+ { -+ buflen = 8096; -+ buf = malloc (buflen); -+ } -+ buf[0] = '\0'; -+ fgets (buf, buflen - 1, fp); -+ if (buf != NULL) -+ n = strlen (buf); -+ else -+ n = 0; -+ #endif /* HAVE_GETLINE / HAVE_GETDELIM */ -+ cp = buf; -+ -+ if (n < 1) -+ break; -+ -+ tmp = strchr (cp, '#'); /* remove comments */ -+ if (tmp) -+ *tmp = '\0'; -+ while (isspace ((int)*cp)) /* remove spaces and tabs */ -+ ++cp; -+ if (*cp == '\0') /* ignore empty lines */ -+ continue; -+ -+ if (cp[strlen (cp) - 1] == '\n') -+ cp[strlen (cp) - 1] = '\0'; -+ -+ tmp = strsep (&cp, " \t="); -+ if (cp != NULL) -+ while (isspace ((int)*cp) || *cp == '=') -+ ++cp; -+ -+ store (tmp, cp); -+ } -+ fclose (fp); -+ -+ if (buf) -+ free (buf); -+ } -+ -+ static void -+ load_defaults (void) -+ { -+ load_defaults_internal ("/etc/default/su"); -+ load_defaults_internal ("/etc/login.defs"); -+ } -+ -+ int -+ getdef_bool (const char *name, int dflt) -+ { -+ const char *val; -+ -+ if (list == NULL) -+ load_defaults (); -+ -+ val = search (name); -+ -+ if (val == NULL) -+ return dflt; -+ -+ return (strcasecmp (val, "yes") == 0); -+ } -+ -+ long -+ getdef_num (const char *name, long dflt) -+ { -+ const char *val; -+ char *cp; -+ long retval; -+ -+ if (list == NULL) -+ load_defaults (); -+ -+ val = search (name); -+ -+ if (val == NULL) -+ return dflt; -+ -+ retval = strtol (val, &cp, 0); -+ if (*cp != '\0' || -+ ((retval == LONG_MAX || retval == LONG_MIN) && errno == ERANGE)) -+ { -+ fprintf (stderr, -+ "%s contains invalid numerical value: %s!\n", -+ name, val); -+ retval = dflt; -+ } -+ return retval; -+ } -+ -+ unsigned long -+ getdef_unum (const char *name, unsigned long dflt) -+ { -+ const char *val; -+ char *cp; -+ unsigned long retval; -+ -+ if (list == NULL) -+ load_defaults (); -+ -+ val = search (name); -+ -+ if (val == NULL) -+ return dflt; -+ -+ retval = strtoul (val, &cp, 0); -+ if (*cp != '\0' || (retval == ULONG_MAX && errno == ERANGE)) -+ { -+ fprintf (stderr, -+ "%s contains invalid numerical value: %s!\n", -+ name, val); -+ retval = dflt; -+ } -+ return retval; -+ } -+ -+ const char * -+ getdef_str (const char *name, const char *dflt) -+ { -+ const char *retval; -+ -+ if (list == NULL) -+ load_defaults (); -+ -+ retval = search (name); -+ -+ return retval ?: dflt; -+ } -+ -+ #if defined(TEST) -+ -+ int -+ main () -+ { -+ printf ("CYPT=%s\n", getdef_str ("cRypt", "no")); -+ printf ("LOG_UNKFAIL_ENAB=%s\n", getdef_str ("log_unkfail_enab","")); -+ printf ("DOESNOTEXIST=%s\n", getdef_str ("DOESNOTEXIST","yes")); -+ return 0; -+ } -+ -+ #endif -diff -rcN coreutils-6.7-orig/src/getdef.h coreutils-6.7/src/getdef.h -*** coreutils-6.7-orig/src/getdef.h Thu Jan 1 00:00:00 1970 ---- coreutils-6.7/src/getdef.h Tue Jan 16 22:18:57 2007 -*************** -*** 0 **** ---- 1,29 ---- -+ /* Copyright (C) 2003, 2005 Thorsten Kukuk -+ Author: Thorsten Kukuk -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 as -+ published by the Free Software Foundation. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+ #ifndef _GETDEF_H_ -+ -+ #define _GETDEF_H_ 1 -+ -+ extern int getdef_bool (const char *name, int dflt); -+ extern long getdef_num (const char *name, long dflt); -+ extern unsigned long getdef_unum (const char *name, unsigned long dflt); -+ extern const char *getdef_str (const char *name, const char *dflt); -+ -+ /* Free all data allocated by getdef_* calls before. */ -+ extern void free_getdef_data (void); -+ -+ #endif /* _GETDEF_H_ */ -diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c -*** coreutils-6.7-orig/src/su.c Sun Oct 22 16:54:15 2006 ---- coreutils-6.7/src/su.c Tue Jan 16 22:19:02 2007 -*************** -*** 38,43 **** ---- 38,49 ---- +*** 37,42 **** +--- 37,48 ---- restricts who can su to UID 0 accounts. RMS considers that to be fascist. @@ -613,8 +315,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. *************** -*** 53,58 **** ---- 59,71 ---- +*** 52,57 **** +--- 58,70 ---- #include #include #include @@ -629,8 +331,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c /* Hide any system prototype for getusershell. This is necessary because some Cray systems have a conflicting *************** -*** 66,71 **** ---- 79,87 ---- +*** 65,70 **** +--- 78,86 ---- #if HAVE_SYSLOG_H && HAVE_SYSLOG # include @@ -641,7 +343,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c # undef SYSLOG_SUCCESS # undef SYSLOG_FAILURE *************** -*** 99,117 **** +*** 98,116 **** # include #endif @@ -661,7 +363,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c /* The shell to run if none is given in the user's passwd entry. */ #define DEFAULT_SHELL "/bin/sh" ---- 115,127 ---- +--- 114,126 ---- # include #endif @@ -676,8 +378,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c /* The shell to run if none is given in the user's passwd entry. */ #define DEFAULT_SHELL "/bin/sh" *************** -*** 119,125 **** ---- 129,137 ---- +*** 118,124 **** +--- 128,136 ---- /* The user to become if none is specified. */ #define DEFAULT_USER "root" @@ -688,8 +390,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c void endusershell (); void setusershell (); *************** -*** 216,222 **** ---- 228,253 ---- +*** 212,218 **** +--- 224,249 ---- } #endif @@ -717,7 +419,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c false if not. Return true without asking for a password if run by UID 0 or if PW has an empty password. */ *************** -*** 224,233 **** +*** 220,229 **** static bool correct_password (const struct passwd *pw) { @@ -728,7 +430,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c endspent (); if (sp) ---- 255,303 ---- +--- 251,299 ---- static bool correct_password (const struct passwd *pw) { @@ -779,8 +481,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c endspent (); if (sp) *************** -*** 248,253 **** ---- 318,324 ---- +*** 244,249 **** +--- 314,320 ---- encrypted = crypt (unencrypted, correct); memset (unencrypted, 0, strlen (unencrypted)); return STREQ (encrypted, correct); @@ -789,7 +491,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c /* Update `environ' for the new shell based on PW, with SHELL being *************** -*** 272,279 **** +*** 268,275 **** xsetenv ("USER", pw->pw_name); xsetenv ("LOGNAME", pw->pw_name); xsetenv ("PATH", (pw->pw_uid @@ -798,7 +500,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c } else { ---- 343,350 ---- +--- 339,346 ---- xsetenv ("USER", pw->pw_name); xsetenv ("LOGNAME", pw->pw_name); xsetenv ("PATH", (pw->pw_uid @@ -808,8 +510,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c else { *************** -*** 283,288 **** ---- 354,365 ---- +*** 279,284 **** +--- 350,361 ---- { xsetenv ("HOME", pw->pw_dir); xsetenv ("SHELL", shell); @@ -823,28 +525,28 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c { xsetenv ("USER", pw->pw_name); *************** -*** 303,314 **** ---- 380,414 ---- - error (EXIT_FAIL, errno, _("cannot set groups")); +*** 299,310 **** +--- 376,410 ---- + error (EXIT_FAILURE, errno, _("cannot set groups")); endgrent (); #endif + #ifdef USE_PAM + retval = pam_setcred (pamh, PAM_ESTABLISH_CRED); + if (retval != PAM_SUCCESS) -+ error (EXIT_FAIL, 0, "%s", pam_strerror (pamh, retval)); ++ error (EXIT_FAILURE, 0, "%s", pam_strerror (pamh, retval)); + + retval = pam_open_session (pamh,0); + if (retval != PAM_SUCCESS) -+ { -+ pam_setcred (pamh, PAM_DELETE_CRED); -+ error (EXIT_FAIL, 0, "could not open session: %s", -+ pam_strerror (pamh, retval)); -+ } ++ { ++ pam_setcred (pamh, PAM_DELETE_CRED); ++ error (EXIT_FAILURE, 0, "could not open session: %s", ++ pam_strerror (pamh, retval)); ++ } + #endif /* USE_PAM */ if (setgid (pw->pw_gid)) - error (EXIT_FAIL, errno, _("cannot set group id")); + error (EXIT_FAILURE, errno, _("cannot set group id")); if (setuid (pw->pw_uid)) - error (EXIT_FAIL, errno, _("cannot set user id")); + error (EXIT_FAILURE, errno, _("cannot set user id")); } + #ifdef USE_PAM @@ -861,8 +563,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c If COMMAND is nonzero, pass it to the shell with the -c option. Pass ADDITIONAL_ARGS to the shell as more arguments; there *************** -*** 321,326 **** ---- 421,523 ---- +*** 317,322 **** +--- 417,519 ---- size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; char const **args = xnmalloc (n_args, sizeof *args); size_t argno = 1; @@ -967,8 +669,8 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c if (simulate_login) { *************** -*** 339,344 **** ---- 536,546 ---- +*** 335,340 **** +--- 532,542 ---- args[argno++] = "-f"; if (command) { @@ -981,19 +683,19 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c args[argno++] = command; } *************** -*** 495,500 **** ---- 697,705 ---- +*** 491,496 **** +--- 693,701 ---- #ifdef SYSLOG_FAILURE log_su (pw, false); #endif + #ifdef USE_PAM + sleep (getdef_num ("FAIL_DELAY", 1)); + #endif - error (EXIT_FAIL, 0, _("incorrect password")); + error (EXIT_FAILURE, 0, _("incorrect password")); } #ifdef SYSLOG_SUCCESS *************** -*** 516,524 **** +*** 512,520 **** shell = NULL; } shell = xstrdup (shell ? shell : pw->pw_shell); @@ -1003,7 +705,7 @@ diff -rcN coreutils-6.7-orig/src/su.c coreutils-6.7/src/su.c if (simulate_login && chdir (pw->pw_dir) != 0) error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ---- 721,732 ---- +--- 717,728 ---- shell = NULL; } shell = xstrdup (shell ? shell : pw->pw_shell); diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 05531482c79..54f9bc57f0c 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}: +{stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}: stdenv.mkDerivation { name = "system-config-printer-0.9.93"; @@ -6,11 +6,10 @@ stdenv.mkDerivation { url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2; md5 = "b97deae648bc1c5825874d250a9c140c"; }; - patchPhase = '' - sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages + preConfigure = '' + sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages echo > man/system-config-printer.1 echo > man/system-config-printer-applet.1 - ./bootstrap ''; - buildInputs = [ perl perlXMLParser autoconf automake intltool gettext desktop_file_utils ]; + buildInputs = [ perl perlXMLParser desktop_file_utils ]; } diff --git a/pkgs/tools/networking/cksfv/builder.sh b/pkgs/tools/networking/cksfv/builder.sh deleted file mode 100644 index 63e914092a5..00000000000 --- a/pkgs/tools/networking/cksfv/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd cksfv-*/src || exit 1 -make || exit 1 -mkdir $out || exit 1 -mkdir $out/bin || exit 1 -install cksfv $out/bin || exit 1 diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 643355eb5d2..2bf553f95de 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -1,10 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cksfv-1.3"; - builder = ./builder.sh; + name = "cksfv-1.3.13"; + src = fetchurl { - url = http://www.fodder.org/cksfv/cksfv-1.3.tar.gz; - md5 = "e00cf6a80a566539eb6f3432f2282c38"; + url = http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.13.tar.bz2; + sha256 = "0d8lipfdwcs31qql3qhqvgd2c6jhdlfnhdsyw84kka781ay1pvhn"; + }; + + meta = { + homepage = http://zakalwe.fi/~shd/foss/cksfv/; + description = "A tool for verifying files against a SFV checksum file"; }; } diff --git a/pkgs/tools/networking/curl/connect-timeout.patch b/pkgs/tools/networking/curl/connect-timeout.patch index 339930e03f6..1edb1f70b9b 100644 --- a/pkgs/tools/networking/curl/connect-timeout.patch +++ b/pkgs/tools/networking/curl/connect-timeout.patch @@ -1,8 +1,8 @@ -diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c -*** curl-7.18.1-orig/lib/connect.c 2008-02-07 23:25:04.000000000 +0100 ---- curl-7.18.1/lib/connect.c 2008-04-23 11:25:30.000000000 +0200 +diff -rc curl-7.19.3-orig/lib/connect.c curl-7.19.3/lib/connect.c +*** curl-7.19.3-orig/lib/connect.c 2009-01-02 23:30:50.000000000 +0100 +--- curl-7.19.3/lib/connect.c 2009-01-21 15:04:08.000000000 +0100 *************** -*** 99,105 **** +*** 115,121 **** singleipconnect(struct connectdata *conn, const Curl_addrinfo *ai, /* start connecting to this */ long timeout_ms, @@ -10,7 +10,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c /* * Curl_timeleft() returns the amount of milliseconds left allowed for the ---- 99,106 ---- +--- 115,122 ---- singleipconnect(struct connectdata *conn, const Curl_addrinfo *ai, /* start connecting to this */ long timeout_ms, @@ -20,8 +20,8 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c /* * Curl_timeleft() returns the amount of milliseconds left allowed for the *************** -*** 552,557 **** ---- 553,559 ---- +*** 541,546 **** +--- 542,548 ---- { curl_socket_t sockfd; Curl_addrinfo *ai; @@ -30,7 +30,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c /* first close the failed socket */ sclose(conn->sock[sockindex]); *************** -*** 565,571 **** +*** 554,560 **** ai = conn->ip_addr->ai_next; while(ai) { @@ -38,7 +38,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c if(sockfd != CURL_SOCKET_BAD) { /* store the new socket descriptor */ conn->sock[sockindex] = sockfd; ---- 567,573 ---- +--- 556,562 ---- ai = conn->ip_addr->ai_next; while(ai) { @@ -47,36 +47,36 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c /* store the new socket descriptor */ conn->sock[sockindex] = sockfd; *************** -*** 720,726 **** +*** 714,720 **** singleipconnect(struct connectdata *conn, const Curl_addrinfo *ai, long timeout_ms, ! bool *connected) { + struct Curl_sockaddr_ex addr; char addr_buf[128]; - int rc; ---- 722,729 ---- +--- 716,723 ---- singleipconnect(struct connectdata *conn, const Curl_addrinfo *ai, long timeout_ms, ! bool *connected, ! bool *timed_out) { + struct Curl_sockaddr_ex addr; char addr_buf[128]; - int rc; *************** -*** 740,745 **** ---- 743,750 ---- - struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage; - const void *iptoprint; +*** 730,735 **** +--- 733,740 ---- + struct sockaddr_in6 * const sa6 = (void *)&addr.sa_addr; + #endif + *timed_out = FALSE; + - addr->family=ai->ai_family; - addr->socktype=conn->socktype; - addr->protocol=ai->ai_protocol; + /* + * The Curl_sockaddr_ex structure is basically libcurl's external API + * curl_sockaddr structure with enough space available to directly hold *************** -*** 841,848 **** +*** 880,887 **** infof(data, "connected\n"); return sockfd; } @@ -85,7 +85,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c else { data->state.os_errno = error; infof(data, "%s\n", Curl_strerror(conn, error)); ---- 846,855 ---- +--- 885,894 ---- infof(data, "connected\n"); return sockfd; } @@ -97,7 +97,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c data->state.os_errno = error; infof(data, "%s\n", Curl_strerror(conn, error)); *************** -*** 872,879 **** +*** 911,918 **** int num_addr; Curl_addrinfo *ai; Curl_addrinfo *curr_addr; @@ -106,7 +106,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c struct timeval before = Curl_tvnow(); /************************************************************* ---- 879,886 ---- +--- 918,925 ---- int num_addr; Curl_addrinfo *ai; Curl_addrinfo *curr_addr; @@ -116,7 +116,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c /************************************************************* *************** -*** 915,933 **** +*** 955,973 **** curr_addr = curr_addr->ai_next, aliasindex++) { /* start connecting to the IP curr_addr points to */ @@ -135,8 +135,8 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c - before = after; } /* end of connect-to-each-address loop */ - if(sockfd == CURL_SOCKET_BAD) { ---- 922,938 ---- + *sockconn = sockfd; /* the socket descriptor we've connected */ +--- 962,978 ---- curr_addr = curr_addr->ai_next, aliasindex++) { /* start connecting to the IP curr_addr points to */ @@ -153,4 +153,4 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c } } /* end of connect-to-each-address loop */ - if(sockfd == CURL_SOCKET_BAD) { + *sockconn = sockfd; /* the socket descriptor we've connected */ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a429e1c9514..0f758087f20 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, zlibSupport ? false, zlib, sslSupport ? false, openssl ? null}: +{stdenv, fetchurl, zlibSupport ? false, zlib ? null, sslSupport ? false, openssl ? null}: assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; -stdenv.mkDerivation { - name = "curl-7.18.1"; +stdenv.mkDerivation rec { + name = "curl-7.19.4"; src = fetchurl { - url = http://curl.haxx.se/download/curl-7.18.1.tar.bz2; - sha256 = "0v5fpr4bsdlg262nsgrijlfhp3vgr1ypir1rrkmhxcsnpv4frw6c"; + url = "http://curl.haxx.se/download/${name}.tar.bz2"; + sha256 = "11myjjvx1bjl709bgibv8pb1sjf4cicim16k860qzg7d1ll3cd7v"; }; buildInputs = diff --git a/pkgs/tools/networking/dhcp/builder.sh b/pkgs/tools/networking/dhcp/builder.sh index 645d9326406..19c3d608736 100644 --- a/pkgs/tools/networking/dhcp/builder.sh +++ b/pkgs/tools/networking/dhcp/builder.sh @@ -9,7 +9,6 @@ makeFlagsArray=(CLIENT_PATH='\"FAKE_PATH=/nothing\"' \ LIBDIR=$out/lib INCDIR=$out/include VARDB=$OUT/var/run \ ) -configurePhase=configurePhase configurePhase() { # Patch the header that contains absolute paths to the tools. sed -i "includes/dhcpd.h" \ @@ -18,7 +17,6 @@ configurePhase() { ./configure } -preBuild=preBuild preBuild() { substituteInPlace client/scripts/linux --replace /bin/bash $shell } diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 818d4e836d8..8419976aebb 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, gettext}: -assert stdenv.isLinux; +assert stdenv.isLinux && stdenv ? glibc; stdenv.mkDerivation { name = "checkinstall-1.6.2pre20081116"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 02db6f4493c..2abce029c2a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { --disable-init-state ''; + doCheck = true; + passthru = { inherit aterm; }; meta = { diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index dee5d81b558..cc0a8411443 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -16,19 +16,14 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = "-L${elfutils}/lib"; - preConfigure = " + preConfigure = '' rm -rf zlib file sqlite - # Grrr, rpcgen can't find cpp. (NIXPKGS-48) - mkdir rpcgen - echo \"#! $shell\" > rpcgen/rpcgen - echo \"exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \\\"\\$@\\\"\" >> rpcgen/rpcgen - chmod +x rpcgen/rpcgen - export PATH=$(pwd)/rpcgen:$PATH - substituteInPlace ./installplatform --replace /usr/bin/env $(type -tp env) substituteInPlace Makefile.in --replace /var/tmp $(pwd)/dummy - "; + ''; + + dontDisableStatic = true; configureFlags = "--without-selinux --without-lua --without-python --without-perl"; diff --git a/pkgs/tools/security/gnupg/builder.sh b/pkgs/tools/security/gnupg/builder.sh index c5545c7456c..aaf20c63899 100644 --- a/pkgs/tools/security/gnupg/builder.sh +++ b/pkgs/tools/security/gnupg/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { if test -n "$idea"; then gunzip < $idea > ./cipher/idea.c diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.4.nix similarity index 82% rename from pkgs/tools/security/seccure/0.3.nix rename to pkgs/tools/security/seccure/0.4.nix index b9a8d42541e..79be594cee1 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -2,8 +2,8 @@ args : with args; with builderDefs; let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { - url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; - sha256 = "0isah96p35yxm86dklmgmdkvpflqi2aj4k344jp57chrhg5av74d"; + url = http://point-at-infinity.org/seccure/seccure-0.4.tar.gz; + sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955"; }; buildInputs = [libgcrypt]; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index c44aa10c700..4f44d61108e 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,21 +1,37 @@ {stdenv, fetchurl, pcre}: +let version = "2.5.4"; in + stdenv.mkDerivation { - name = "gnugrep-2.5.3"; + name = "gnugrep-${version}"; src = fetchurl { - url = http://nixos.org/tarballs/grep-2.5.3-with-info.tar.bz2; - sha256 = "0rg9dipksqzbg8v1xalib1n3xkkycc5r1l2gb9cxy1cz3cjip5l8"; + url = "mirror://gnu/grep/grep-${version}.tar.bz2"; + sha256 = "0800lj1ywf43x5jnjyga56araak0f601sd9k5q1vv3s5057cdgha"; }; buildInputs = [pcre]; - preBuild = '' - makeFlagsArray=(mkdir_p="mkdir -p") + doCheck = true; + + # On Mac OS X, force use of mkdir -p, since Grep's fallback + # (./install-sh) is broken. + preConfigure = '' + export MKDIR_P="mkdir -p" ''; - + meta = { homepage = http://www.gnu.org/software/grep/; description = "GNU implementation of the Unix grep command"; + + longDescription = '' + The grep command searches one or more input files for lines + containing a match to a specified pattern. By default, grep + prints the matching lines. + ''; + + license = "GPLv3+"; }; + + passthru = {inherit pcre;}; } diff --git a/pkgs/tools/text/gnused/4.1.2.nix b/pkgs/tools/text/gnused/4.1.2.nix deleted file mode 100644 index fce5228cbbb..00000000000 --- a/pkgs/tools/text/gnused/4.1.2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnused-4.1.2"; - src = fetchurl { - url = mirror://gnu/sed/sed-4.1.2.tar.gz; - md5 = "928f0e06422f414091917401f1a834d0"; - }; -} diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index a57b5cc594a..9eab819612f 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; # First install the `File::MMagic' Perl module. + # !!! this shouldn't refer to Perl 5.10.0! preConfigure = '' ( cd File-MMagic && \ perl Makefile.PL \ - LIB="$out/lib/site_perl/5.10.0" \ + LIB="$out/lib/perl5/site_perl/5.10.0" \ INSTALLSITEMAN3DIR="$out/man" && \ make && make install ) export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB" diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 18833a45828..72e528a5ed1 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { # XXX: We work around the fact that `wrapProgram' doesn't support # spaces below by inserting escaped backslashes. wrapProgram $out/bin/$i --prefix PERL5LIB : \ - "${XMLSAX}/lib/site_perl:${XMLParser}/lib/site_perl" \ + "${XMLSAX}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \ --prefix PERL5LIB : \ - "${XMLNamespaceSupport}/lib/site_perl" \ + "${XMLNamespaceSupport}/lib/perl5/site_perl" \ --prefix XML_CATALOG_FILES "\ " \ "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml" done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62d543dec7f..512b3a8d9af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -115,8 +115,6 @@ let inherit (lib) lowPrio appendToName; - stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh; - # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;}; @@ -215,7 +213,7 @@ let # just the plain stdenv. stdenv_32bit = if system == "x86_64-linux" then - overrideGCC stdenv gcc43multi + overrideGCC stdenv gcc43_multi else stdenv; @@ -505,8 +503,7 @@ let }; convertlit = import ../tools/text/convertlit { - inherit fetchurl unzip libtommath; - stdenv = stdenvNew; + inherit fetchurl stdenv unzip libtommath; }; unifdef = import ../development/tools/misc/unifdef { @@ -514,7 +511,7 @@ let }; coreutils = useFromStdenv "coreutils" - ((if stdenv ? isDietLibC + (makeOverridable (if stdenv ? isDietLibC then import ../tools/misc/coreutils-5 else import ../tools/misc/coreutils) { @@ -531,8 +528,7 @@ let }; cron = import ../tools/system/cron { # see also fcron - inherit fetchurl; - stdenv = stdenvNew; + inherit fetchurl stdenv; }; curl = import ../tools/networking/curl { @@ -705,7 +701,7 @@ let inherit (xlibs) xproto libXt libX11; }; - glxinfo = assert mesaSupported; import ../tools/graphics/glxinfo { + glxinfo = import ../tools/graphics/glxinfo { inherit fetchurl stdenv x11 mesa; }; @@ -746,19 +742,11 @@ let inherit fetchurl stdenv; }); - gnused412 = import ../tools/text/gnused/4.1.2.nix { - inherit fetchurl stdenv; - }; - gnutar = useFromStdenv "gnutar" (import ../tools/archivers/gnutar { inherit fetchurl stdenv; }); - gnutar151 = import ../tools/archivers/gnutar/1.15.1.nix { - inherit fetchurl stdenv; - }; - graphviz = import ../tools/graphics/graphviz { inherit fetchurl stdenv pkgconfig libpng libjpeg expat x11 yacc libtool fontconfig gd; @@ -767,7 +755,8 @@ let }; groff = import ../tools/text/groff { - inherit fetchurl stdenv ghostscript perl; + inherit fetchurl stdenv perl; + ghostscript = null; }; grub = import ../tools/misc/grub { @@ -1250,7 +1239,7 @@ let inherit fetchurl stdenv ncurses; }; - seccure = composedArgsAndFun (selectVersion ../tools/security/seccure "0.3") { + seccure = composedArgsAndFun (selectVersion ../tools/security/seccure "0.4") { inherit builderDefs libgcrypt; }; @@ -1322,7 +1311,7 @@ let }; system_config_printer = import ../tools/misc/system-config-printer { - inherit stdenv fetchurl perl perlXMLParser autoconf automake intltool gettext desktop_file_utils; + inherit stdenv fetchurl perl perlXMLParser desktop_file_utils; }; tcpdump = import ../tools/networking/tcpdump { @@ -1463,11 +1452,7 @@ let xpf = import ../tools/text/xml/xpf { inherit fetchurl stdenv python; - - libxml2 = import ../development/libraries/libxml2 { - inherit fetchurl stdenv zlib python; - pythonSupport = true; - }; + libxml2 = libxml2Python; }; xsel = import ../tools/misc/xsel { @@ -1490,19 +1475,14 @@ let ### SHELLS - bash = lowPrio (useFromStdenv "bash" - (import ../shells/bash { - inherit fetchurl stdenv bison; - })); + bash = lowPrio (useFromStdenv "bash" bashReal); - bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix { - inherit fetchurl stdenv ncurses texinfo bison; - interactive = true; - }); + bashReal = makeOverridable (import ../shells/bash) { + inherit fetchurl stdenv bison; + }; - bash4 = appendToName "interactive" (import ../shells/bash/4.0.nix { - inherit fetchurl stdenv ncurses texinfo bison; - readline = readline6; + bashInteractive = appendToName "interactive" (bashReal.override { + inherit readline; interactive = true; }); @@ -1557,79 +1537,7 @@ let inherit fetchurl stdenv gawk system; }; - g77 = import ../build-support/gcc-wrapper { - name = "g77"; - nativeTools = false; - nativeLibc = false; - gcc = import ../development/compilers/gcc-3.3 { - inherit fetchurl stdenv noSysDirs; - langF77 = true; - langCC = false; - }; - inherit (stdenv.gcc) binutils libc; - inherit stdenv; - }; - - g77_40 = import ../build-support/gcc-wrapper { - name = "g77-4.0"; - nativeTools = false; - nativeLibc = false; - gcc = import ../development/compilers/gcc-4.0 { - inherit fetchurl stdenv noSysDirs; - langF77 = true; - langCC = false; - inherit gmp mpfr; - }; - inherit (stdenv.gcc) binutils libc; - inherit stdenv; - }; - - g77_41 = import ../build-support/gcc-wrapper { - name = "g77-4.1"; - nativeTools = false; - nativeLibc = false; - gcc = import ../development/compilers/gcc-4.1 { - inherit fetchurl stdenv noSysDirs; - langF77 = true; - langCC = false; - langC = false; - inherit gmp mpfr; - }; - inherit (stdenv.gcc) binutils libc; - inherit stdenv; - }; - - g77_42 = import ../build-support/gcc-wrapper { - name = "g77-4.2"; - nativeTools = false; - nativeLibc = false; - gcc = import ../development/compilers/gcc-4.2/fortran.nix { - inherit fetchurl stdenv noSysDirs; - langF77 = true; - langCC = false; - langC = false; - inherit gmp mpfr; - }; - inherit (stdenv.gcc) binutils libc; - inherit stdenv; - }; - - gfortran = import ../build-support/gcc-wrapper-new { - name = "gfortran"; - nativeTools = false; - nativeLibc = false; - gcc = import ../development/compilers/gcc-4.2/fortran.nix { - inherit fetchurl stdenv noSysDirs; - langF77 = true; - langCC = false; - langC = false; - inherit gmp mpfr; - }; - inherit (stdenv.gcc) binutils libc; - inherit stdenv; - }; - - gcc = gcc42; + gcc = gcc43; gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 { inherit fetchurl stdenv noSysDirs; @@ -1648,31 +1556,32 @@ let # expects a single digit after the dot. As a workaround, we feed # GCC with Texinfo 4.9. Stupid bug, hackish workaround. - gcc40 = wrapGCC (import ../development/compilers/gcc-4.0 { + gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.0) { inherit fetchurl stdenv noSysDirs; texinfo = texinfo49; profiledCompiler = true; }); - gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 { + gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) { inherit fetchurl stdenv noSysDirs; texinfo = texinfo49; profiledCompiler = false; }); - gcc42 = useFromStdenv "gcc" (wrapGCC (import ../development/compilers/gcc-4.2 { + gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.2) { inherit fetchurl stdenv noSysDirs; - profiledCompiler = true; - })); + profiledCompiler = false; + }); - gcc43 = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper-new) glibc (import ../development/compilers/gcc-4.3 { + gcc43 = useFromStdenv "gcc" gcc43_real; + + gcc43_real = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { inherit fetchurl stdenv texinfo gmp mpfr noSysDirs; - profiledCompiler = false; - })); + profiledCompiler = true; + }); - gcc43multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper-new) glibc_multi (import ../development/compilers/gcc-4.3 { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc42); - inherit fetchurl texinfo gmp mpfr noSysDirs; + gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43_real.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); profiledCompiler = false; enableMultilib = true; })); @@ -1687,6 +1596,39 @@ let texinfo = texinfo49; }); + gfortran = gfortran43; + + gfortran40 = wrapGCC (gcc40.gcc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + inherit gmp mpfr; + }); + + gfortran41 = wrapGCC (gcc41.gcc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + inherit gmp mpfr; + }); + + gfortran42 = wrapGCC (gcc42.gcc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + inherit gmp mpfr; + }); + + gfortran43 = wrapGCC (gcc43_real.gcc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + # This new ghc stuff is under heavy development and will change ! # =============================================================== @@ -2006,7 +1948,7 @@ let /* gcj = import ../build-support/gcc-wrapper/default2.nix { - name = "gcj"; + name = "gcj-wrapper"; nativeTools = false; nativeLibc = false; gcc = import ../development/compilers/gcc-4.0 { @@ -2152,28 +2094,31 @@ let }; octave = import ../development/interpreters/octave { - inherit stdenv fetchurl readline ncurses perl flex qhull texinfo; - g77 = g77_42; + inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo; }; # mercurial (hg) bleeding edge version octaveHG = import ../development/interpreters/octave/hg.nix { - inherit fetchurl readline ncurses perl flex atlas getConfig glibc qhull; + inherit fetchurl readline ncurses perl flex atlas getConfig glibc qhull gfortran; inherit automake autoconf bison gperf lib python gnuplot texinfo texLive; # for dev Version inherit stdenv; inherit (xlibs) libX11; #stdenv = overrideGCC stdenv gcc40; - g77 = g77_42; inherit (bleedingEdgeRepos) sourceByName; }; - perl = if !stdenv.isLinux then sysPerl else realPerl; + perl = if !stdenv.isLinux then sysPerl else perlReal; perl58 = if !stdenv.isLinux then sysPerl else import ../development/interpreters/perl-5.8 { inherit fetchurl stdenv; }; + perlReal = import ../development/interpreters/perl-5.10 { + fetchurl = fetchurlBoot; + inherit stdenv; + }; + # FIXME: unixODBC needs patching on Darwin (see darwinports) phpOld = import ../development/interpreters/php { inherit stdenv fetchurl flex bison libxml2 apacheHttpd; @@ -2244,11 +2189,6 @@ let inherit clisp stdenv fetchurl builderDefs unzip; }; - realPerl = import ../development/interpreters/perl-5.10 { - fetchurl = fetchurlBoot; - inherit stdenv; - }; - ruby = import ../development/interpreters/ruby { inherit fetchurl stdenv readline ncurses zlib lib openssl; }; @@ -2368,18 +2308,18 @@ let inherit fetchurl stdenv perl m4 lzma; }; - automake = automake19x; + automake = automake110x; automake17x = import ../development/tools/misc/automake/automake-1.7.x.nix { - inherit fetchurl stdenv perl autoconf; + inherit fetchurl stdenv perl autoconf makeWrapper; }; automake19x = import ../development/tools/misc/automake/automake-1.9.x.nix { - inherit fetchurl stdenv perl autoconf; + inherit fetchurl stdenv perl autoconf makeWrapper; }; automake110x = import ../development/tools/misc/automake/automake-1.10.x.nix { - inherit fetchurl stdenv perl autoconf; + inherit fetchurl stdenv perl autoconf makeWrapper; }; avrdude = import ../development/tools/misc/avrdude { @@ -2456,10 +2396,9 @@ let qt = if getPkgConfig "doxygen" "qt4" true then qt4 else null; }; - elfutils = composedArgsAndFun - (selectVersion ../development/tools/misc/elfutils "0.131") { - inherit fetchurl stdenv; - }; + elfutils = import ../development/tools/misc/elfutils { + inherit fetchurl stdenv m4; + }; epm = import ../development/tools/misc/epm { inherit fetchurl stdenv rpm; @@ -2497,14 +2436,10 @@ let inherit fetchurl stdenv; }; - gnum4_1411 = import ../development/tools/misc/gnum4/1.4.11.nix { - inherit fetchurl stdenv; - }; - - gnumake = import ../development/tools/build-managers/gnumake { - inherit fetchurl stdenv; - log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true; - }; + gnumake = useFromStdenv "gnumake" + (import ../development/tools/build-managers/gnumake { + inherit fetchurl stdenv; + }); gnumake380 = import ../development/tools/build-managers/gnumake-3.80 { inherit fetchurl stdenv; @@ -2564,25 +2499,22 @@ let inherit fetchurl stdenv perl; }; - libtool = import ../development/tools/misc/libtool { + libtool = libtool_2; + + libtool_1_5 = import ../development/tools/misc/libtool { inherit fetchurl stdenv perl m4; }; - libtool2 = import ../development/tools/misc/libtool/libtool2.nix { + libtool_2 = import ../development/tools/misc/libtool/libtool2.nix { inherit fetchurl stdenv lzma perl m4; }; - libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix { - inherit fetchurl stdenv perl m4; - }); - lsof = import ../development/tools/misc/lsof { inherit fetchurl stdenv; }; ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") { - inherit fetchurl stdenv builderDefs stringsWithDeps lib; - elfutils = elfutils.passthru.function {version = "0.127";}; + inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils; }; mk = import ../development/tools/build-managers/mk { @@ -2685,7 +2617,8 @@ let }; gdb = import ../development/tools/misc/gdb { - inherit fetchurl stdenv ncurses readline gmp mpfr texinfo; + inherit fetchurl stdenv ncurses gmp mpfr texinfo; + readline = readline5; }; valgrind = import ../development/tools/analysis/valgrind { @@ -2719,8 +2652,7 @@ let acl = useFromStdenv "acl" (import ../development/libraries/acl { - inherit stdenv fetchurl gettext attr; - libtool = libtoolOld; + inherit stdenv fetchurl gettext attr libtool; }); adns = selectVersion ../development/libraries/adns "1.4" { @@ -2760,22 +2692,21 @@ let aterm = aterm25; - aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix { + aterm242fixes = lowPrio (import ../development/libraries/aterm/2.4.2-fixes.nix { inherit fetchurl stdenv; - }; + }); aterm25 = import ../development/libraries/aterm/2.5.nix { inherit fetchurl stdenv; }; - aterm28 = import ../development/libraries/aterm/2.8.nix { + aterm28 = lowPrio (import ../development/libraries/aterm/2.8.nix { inherit fetchurl stdenv; - }; + }); attr = useFromStdenv "attr" (import ../development/libraries/attr { - inherit stdenv fetchurl gettext; - libtool = libtoolOld; + inherit stdenv fetchurl gettext libtool; }); axis = import ../development/libraries/axis { @@ -2819,7 +2750,7 @@ let cairo = import ../development/libraries/cairo { inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng; - inherit (xlibs) pixman; + inherit (xlibs) pixman libxcb xcbutil; }; cairomm = import ../development/libraries/cairomm { @@ -3014,7 +2945,7 @@ let inherit fetchurl stdenv openal; }; - freeglut = assert mesaSupported; import ../development/libraries/freeglut { + freeglut = import ../development/libraries/freeglut { inherit fetchurl stdenv x11 mesa; }; @@ -3055,7 +2986,7 @@ let use_svn = stdenv.system == "x86_64-linux"; }; - gettext = composedArgsAndFun (selectVersion ../development/libraries/gettext "0.17") { + gettext = import ../development/libraries/gettext { inherit fetchurl stdenv; }; @@ -3082,16 +3013,21 @@ let inherit fetchurl stdenv pkgconfig gettext; }; - glibc = useFromStdenv "glibc" - (import ../development/libraries/glibc-2.7 { - inherit fetchurl stdenv kernelHeaders; - #installLocales = false; - }); + glibc = useFromStdenv "glibc" glibc29; - glibcUnstable = lowPrio (import ../development/libraries/glibc-2.8 { - inherit fetchurl stdenv kernelHeaders; - installLocales = getPkgConfig "glibc" "locales" false; - }); + glibc27 = import ../development/libraries/glibc-2.7 { + inherit fetchurl stdenv kernelHeaders; + #installLocales = false; + }; + + glibc29 = import ../development/libraries/glibc-2.9 { + inherit fetchurl stdenv kernelHeaders; + installLocales = getPkgConfig "glibc" "locales" false; + }; + + glibcLocales = makeOverridable (import ../development/libraries/glibc-2.9/locales.nix) { + inherit fetchurl stdenv; + }; glibc_multi = assert system == "x86_64-linux"; @@ -3126,6 +3062,7 @@ let gmp = import ../development/libraries/gmp { inherit fetchurl stdenv m4; + cxx = false; }; goocanvas = import ../development/libraries/goocanvas { @@ -3142,7 +3079,7 @@ let inherit lib selectVersion stdenv fetchurl perl bison pkgconfig libxml2 python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883 - dbus libavc1394 ladspaH taglib bzip2 which; + dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which; flex = flex2535; inherit (xorg) libX11 libXv libXext; inherit (gtkLibs) glib pango gtk; @@ -3170,7 +3107,7 @@ let inherit fetchurl stdenv; }; - gtkLibs = recurseIntoAttrs gtkLibs212; + gtkLibs = recurseIntoAttrs gtkLibs216; gtkLibs1x = import ../development/libraries/gtk-libs/1.x { inherit fetchurl stdenv x11 libtiff libjpeg libpng; @@ -3197,6 +3134,13 @@ let xineramaSupport = true; }; + gtkLibs216 = import ../development/libraries/gtk-libs/2.16 { + inherit fetchurl stdenv pkgconfig gettext perl x11 jasper + libtiff libjpeg libpng cairo libsigcxx cairomm; + inherit (xlibs) libXinerama libXrandr; + xineramaSupport = true; + }; + gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp { inherit fetchurl stdenv mono pkgconfig monoDLLFixer; inherit (gnome) gtk; @@ -3273,10 +3217,7 @@ let inherit fetchurl stdenv; }; - intltool = composedArgsAndFun (selectVersion ../development/tools/misc/intltool "0.40.5") { - inherit fetchurl stdenv lib builderDefs stringsWithDeps - perl perlXMLParser; - }; + intltool = gnome.intltool; isocodes = import ../development/libraries/iso-codes { inherit stdenv fetchurl gettext python; @@ -3315,10 +3256,10 @@ let }; libao = import ../development/libraries/libao { - inherit stdenv fetchurl pkgconfig; + inherit stdenv fetchurl pkgconfig pulseaudio; }; - libarchive = selectVersion ../development/libraries/libarchive "2.4.12" { + libarchive = import ../development/libraries/libarchive { inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils; }; @@ -3336,7 +3277,7 @@ let libcanberra = import ../development/libraries/libcanberra { inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio libvorbis; - inherit (gtkLibs214) gtk gthread; + inherit (gtkLibs) gtk gthread; gstreamer = gst_all.gstreamer; }; @@ -3352,7 +3293,7 @@ let inherit fetchurl stdenv libcddb pkgconfig ncurses help2man; }; - libcm = assert mesaSupported; import ../development/libraries/libcm { + libcm = import ../development/libraries/libcm { inherit fetchurl stdenv pkgconfig xlibs mesa; inherit (gtkLibs) glib; }; @@ -3385,7 +3326,7 @@ let }; libdrm = import ../development/libraries/libdrm { - inherit fetchurl stdenv; + inherit fetchurl stdenv pkgconfig pthread_stubs; }; libdvdcss = import ../development/libraries/libdvdcss { @@ -3480,12 +3421,12 @@ let inherit fetchurl stdenv mediastreamer; }; - libjpeg = import ../development/libraries/libjpeg { - inherit fetchurl stdenv libtool; + libjpeg = makeOverridable (import ../development/libraries/libjpeg) { + inherit fetchurl stdenv; + libtool = libtool_1_5; }; - libjpegStatic = lowPrio (appendToName "static" (import ../development/libraries/libjpeg-static { - inherit fetchurl stdenv libtool; + libjpegStatic = lowPrio (appendToName "static" (libjpeg.override { static = true; })); @@ -3529,8 +3470,7 @@ let inherit fetchurl stdenv; }; - liboil = composedArgsAndFun - (selectVersion ../development/libraries/liboil "0.3.15") { + liboil = import ../development/libraries/liboil { inherit fetchurl stdenv pkgconfig; inherit (gtkLibs) glib; }; @@ -3566,7 +3506,7 @@ let inherit fetchurl stdenv pkgconfig; }; - libsigsegv = selectVersion ../development/libraries/libsigsegv "2.5" { + libsigsegv = import ../development/libraries/libsigsegv/2.5.nix { inherit fetchurl stdenv; }; @@ -3641,7 +3581,7 @@ let inherit fetchurl stdenv; }; - libxklavier = selectVersion ../development/libraries/libxklavier "3.4" { + libxklavier = import ../development/libraries/libxklavier { inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2; inherit (xorg) libX11 libICE libxkbfile; inherit (gtkLibs) glib; @@ -3651,15 +3591,14 @@ let inherit fetchurl stdenv libtool; }; - libxml2 = import ../development/libraries/libxml2 { + libxml2 = makeOverridable (import ../development/libraries/libxml2) { inherit fetchurl stdenv zlib python; pythonSupport = false; }; - libxml2Python = lowPrio (appendToName "with-python" (import ../development/libraries/libxml2 { - inherit fetchurl stdenv zlib python; + libxml2Python = libxml2.override { pythonSupport = true; - })); + }; libxslt = import ../development/libraries/libxslt { inherit fetchurl stdenv libxml2; @@ -3702,8 +3641,8 @@ let system == "i686-linux" || system == "x86_64-linux"; - mesa = assert mesaSupported; import ../development/libraries/mesa { - inherit fetchurl stdenv pkgconfig x11 xlibs libdrm; + mesa = import ../development/libraries/mesa { + inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm; }; mesaHeaders = import ../development/libraries/mesa/headers.nix { @@ -3783,19 +3722,19 @@ let openexr_1_6_1 = import ../development/libraries/openexr { inherit fetchurl stdenv ilmbase zlib pkgconfig lib; - version = "1.6.1"; - # optional features: - inherit ctl; + version = "1.6.1"; + # optional features: + inherit ctl; }; # This older version is needed by blender (it complains about missing half.h ) openexr_1_4_0 = import ../development/libraries/openexr { inherit fetchurl stdenv ilmbase zlib pkgconfig lib; - version = "1.4.0"; + version = "1.4.0"; }; openldap = import ../development/libraries/openldap { - inherit fetchurl stdenv openssl cyrus_sasl db4; + inherit fetchurl stdenv openssl cyrus_sasl db4 groff; }; openssl = import ../development/libraries/openssl { @@ -3803,7 +3742,7 @@ let inherit stdenv perl; }; - ortp = selectVersion ../development/libraries/ortp "0.13.1" { + ortp = import ../development/libraries/ortp { inherit fetchurl stdenv; }; @@ -3838,7 +3777,7 @@ let }; popt = import ../development/libraries/popt { - inherit fetchurl stdenv gettext; + inherit fetchurl stdenv; }; proj = import ../development/libraries/proj.4 { @@ -3853,16 +3792,7 @@ let inherit fetchurl stdenv; }; - qt3gcc33 = import ../development/libraries/qt-3 { - stdenv = overrideGCC stdenv gcc33; - inherit fetchurl x11 zlib libjpeg libpng which mysql mesa; - inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor; - openglSupport = false; - mysqlSupport = false; - }; - - qt3 = import ../development/libraries/qt-3 { + qt3 = makeOverridable (import ../development/libraries/qt-3) { inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto libXmu libXinerama xineramaproto libXcursor; @@ -3870,11 +3800,13 @@ let mysqlSupport = getConfig ["qt" "mysql"] false; }; - qt3mysql = import ../development/libraries/qt-3 { - inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; - inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor; - openglSupport = mesaSupported; + qt3gcc33 = qt3.override { + stdenv = overrideGCC stdenv gcc33; + openglSupport = false; + mysqlSupport = false; + }; + + qt3mysql = qt3.override { mysqlSupport = true; }; @@ -3887,7 +3819,7 @@ let inherit (gnome) glib; }; - readline = readline5; + readline = readline6; readline4 = import ../development/libraries/readline/readline4.nix { inherit fetchurl stdenv ncurses; @@ -3897,7 +3829,7 @@ let inherit fetchurl stdenv ncurses; }; - readline6 = import ../development/libraries/readline/6.0.nix { + readline6 = import ../development/libraries/readline/readline6.nix { inherit fetchurl stdenv ncurses; }; @@ -4427,18 +4359,21 @@ let }; postfix = import ../servers/mail/postfix { - inherit fetchurl stdenv db4 openssl cyrus_sasl; - glibc = stdenv.glibc; + inherit fetchurl stdenv db4 openssl cyrus_sasl glibc; }; pulseaudio = import ../servers/pulseaudio { - inherit fetchurl stdenv pkgconfig gnum4 libtool gdbm + inherit fetchurl stdenv pkgconfig gnum4 gdbm dbus hal avahi liboil libsamplerate libsndfile speex intltool gettext; inherit (gtkLibs) glib; inherit (xlibs) libX11 libICE libSM; + inherit alsaLib; # Needs ALSA >= 1.0.17. gconf = gnome.GConf; - alsaLib = alsa_1_0_19.alsaLib; # Needs ALSA >= 1.0.17. + + # Work around Libtool 1.5 interaction with Ltdl 2.x + # ("undefined reference to lt__PROGRAM__LTX_preloaded_symbols"). + libtool = libtool_1_5; }; tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors { @@ -4524,10 +4459,10 @@ let inherit fetchurl openssl stdenv libcap pam; }; - xorg = recurseIntoAttrs (import ../servers/x11/xorg { + xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa mesaHeaders - xkeyboard_config dbus hal; + xkeyboard_config dbus hal python e2fsprogs openssl gperf m4; }); xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) { @@ -4574,20 +4509,13 @@ let inherit fetchurl stdenv; }; - alsa = composedArgsAndFun (selectVersion ../os-specific/linux/alsa "1.0.16") { - inherit fetchurl stdenv ncurses gettext; + alsaLib = import ../os-specific/linux/alsa-lib { + inherit stdenv fetchurl; }; - - alsaLib = alsa.alsaLib; - alsaUtils = alsa.alsaUtils; - - # A newer ALSA. Make it the default during the next `stdenv-updates' merge. - alsa_1_0_19 = import ../os-specific/linux/alsa/1.0.19.nix { - inherit fetchurl stdenv ncurses gettext; - version = "1.0.19"; + + alsaUtils = import ../os-specific/linux/alsa-utils { + inherit stdenv fetchurl alsaLib gettext ncurses; }; - alsaLib_1_0_19 = alsa_1_0_19.alsaLib; - alsaUtils_1_0_19 = alsa_1_0_19.alsaUtils; blcr = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){ inherit perl; @@ -4699,11 +4627,6 @@ let inherit fetchurl stdenv pkgconfig libdaemon; }; - initscripts = import ../os-specific/linux/initscripts { - inherit fetchurl stdenv popt pkgconfig; - inherit (gtkLibs) glib; - }; - iproute = import ../os-specific/linux/iproute { inherit fetchurl stdenv flex bison db4; }; @@ -4746,25 +4669,21 @@ let inherit fetchurl stdenv bison flex; }; - kernelHeaders = kernelHeaders_2_6_23; + kernelHeaders = kernelHeaders_2_6_28; kernelHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { inherit fetchurl stdenv unifdef; }; - kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix { - inherit fetchurl stdenv; - }; - kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.16.nix { inherit fetchurl stdenv; }; - kernelHeaders_2_6_25 = import ../os-specific/linux/kernel-headers/2.6.25.4.nix { + kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix { inherit fetchurl stdenv; }; - kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix { + kernelHeaders_2_6_27 = import ../os-specific/linux/kernel-headers/2.6.27.8.nix { inherit fetchurl stdenv; }; @@ -5046,7 +4965,8 @@ let }; splashutils = - if kernel.features ? fbSplash then splashutils_13 else + # Splashutils 1.3 is broken, so disable splash on older kernels. + if kernel.features ? fbSplash then /* splashutils_13 */ null else if kernel.features ? fbConDecor && system != "x86_64-linux" then splashutils_15 else null; @@ -5105,7 +5025,7 @@ let kernelPackages_2_6_28 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_28); # The current default kernel / kernel modules. - kernelPackages = kernelPackages_2_6_25; + kernelPackages = kernelPackages_2_6_28; customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) { inherit fetchurl stdenv perl mktemp module_init_tools; @@ -5204,7 +5124,7 @@ let aggregateModules = modules: import ../os-specific/linux/module-init-tools/aggregator.nix { - inherit stdenv module_init_tools modules; + inherit stdenv module_init_tools modules buildEnv; }; modutils = import ../os-specific/linux/modutils { @@ -5238,7 +5158,8 @@ let }; pam_console = import ../os-specific/linux/pam_console { - inherit stdenv fetchurl pam autoconf automake libtool pkgconfig bison; + inherit stdenv fetchurl pam autoconf automake pkgconfig bison; + libtool = libtool_1_5; flex = if stdenv.system == "i686-linux" then flex else flex2533; inherit (gtkLibs) glib; }; @@ -5521,7 +5442,8 @@ let }); shared_mime_info = import ../data/misc/shared-mime-info { - inherit fetchurl stdenv pkgconfig gettext intltool libxml2; + inherit fetchurl stdenv pkgconfig gettext + intltool perl perlXMLParser libxml2; inherit (gtkLibs) glib; }; @@ -5574,8 +5496,8 @@ let inherit builderDefs; }; - xkeyboard_config = composedArgsAndFun (selectVersion ../data/misc/xkeyboard-config "1.2") { - inherit fetchurl stdenv perl perlXMLParser gettext; + xkeyboard_config = import ../data/misc/xkeyboard-config { + inherit fetchurl stdenv perl perlXMLParser gettext intltool; inherit (xlibs) xkbcomp; }; @@ -5775,7 +5697,7 @@ let inherit (gnome) esound; }; - compiz_050 = assert mesaSupported; import ../applications/window-managers/compiz/0.5.0.nix { + compiz_050 = import ../applications/window-managers/compiz/0.5.0.nix { inherit fetchurl stdenv pkgconfig libpng mesa; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM libXrender xextproto; @@ -5792,7 +5714,7 @@ let version = "0.6.2"; }; - compizBase = composedArgsAndFun (assert mesaSupported; selectVersion ../applications/window-managers/compiz "0.8.0") { + compizBase = composedArgsAndFun (selectVersion ../applications/window-managers/compiz "0.8.0") { inherit lib builderDefs stringsWithDeps; inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext intltool; @@ -5815,7 +5737,7 @@ let extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; }; - compizFusion = assert mesaSupported; import ../applications/window-managers/compiz-fusion { + compizFusion = import ../applications/window-managers/compiz-fusion { version = getConfig ["compizFusion" "version"] "0.7.8"; inherit compiz; inherit stringsWithDeps lib builderDefs; @@ -6008,9 +5930,9 @@ let }; evince = import ../applications/misc/evince { - inherit fetchurl stdenv perl perlXMLParser gettext + inherit fetchurl stdenv perl perlXMLParser gettext intltool pkgconfig poppler libspectre djvulibre libxslt - dbus dbus_glib shared_mime_info makeWrapper; + dbus dbus_glib shared_mime_info which makeWrapper; inherit (gnome) gnomedocutils gnomeicontheme libgnome libgnomeui libglade glib gtk scrollkeeper; }; @@ -6090,7 +6012,7 @@ let python dbus dbus_glib freetype fontconfig bzip2; inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; - inherit (alsa) alsaLib; + inherit alsaLib; #enableOfficialBranding = true; xulrunner = xulrunner3_1; autoconf = autoconf213; @@ -6101,7 +6023,7 @@ let python dbus dbus_glib freetype fontconfig bzip2 xlibs file; inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; - inherit (alsa) alsaLib; + inherit alsaLib; autoconf = autoconf213; #enableOfficialBranding = true; }); @@ -6181,7 +6103,7 @@ let inherit (xlibs) libX11 libICE libSM; }; - gnash = assert mesaSupported; import ../applications/video/gnash { + gnash = import ../applications/video/gnash { inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng boost freetype agg dbus curl pkgconfig x11 libtool lib libungif gettext makeWrapper ming dejagnu python; @@ -6549,6 +6471,13 @@ let panotools = import ../applications/graphics/panotools { inherit stdenv fetchsvn libpng libjpeg libtiff automake libtool autoconf; }; + + pavucontrol = import ../applications/audio/pavucontrol { + inherit fetchurl stdenv pkgconfig pulseaudio libsigcxx + libcanberra intltool gettext; + inherit (gtkLibs) gtkmm; + inherit (gnome) libglademm; + }; paraview = import ../applications/graphics/paraview { inherit fetchurl stdenv cmake qt4; @@ -7008,8 +6937,7 @@ let }; xineUI = import ../applications/video/xine-ui { - inherit fetchurl stdenv pkgconfig x11 xineLib libpng readline ncurses curl; - inherit (xorg) libXext libXv libXxf86vm libXtst inputproto; + inherit fetchurl stdenv pkgconfig xlibs xineLib libpng readline ncurses curl; }; xmms = import ../applications/audio/xmms { @@ -7296,10 +7224,11 @@ let fetchurl stdenv pkgconfig flex bison popt zlib libxml2 libxslt perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 + docbook_xml_dtd_43 gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 - libcm python dbus_glib ncurses which libxml2Python + libcm python dbus dbus_glib ncurses which libxml2Python iconnamingutils openssl hal samba fam libgcrypt libtasn1 - xmlto docbook2x docbook_xsl intltool; + xmlto docbook2x docbook_xsl intltool enchant isocodes; }); kde3 = { @@ -7441,7 +7370,7 @@ let }; scilab = (import ../applications/science/math/scilab) { - inherit stdenv fetchurl lib g77; + inherit stdenv fetchurl lib gfortran; inherit (gtkLibs) gtk; inherit ncurses Xaw3d tcl tk ocaml x11; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 3ab039d1d6f..39e7c4a1ec8 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -231,7 +231,7 @@ let xauth xf86inputkeyboard xf86inputmouse - xf86videoi810 + xf86videointel xf86videovesa xkbcomp xorgserver @@ -331,7 +331,7 @@ let x86_64LinuxPkgs = commonLinuxPkgs "x86_64-linux" // { inherit (allPackages {system = "x86_64-linux";}) aterm242fixes - gcc43multi + gcc43_multi ; }; @@ -395,9 +395,15 @@ let cygwinPkgs = { inherit (allPackages {system = "i686-cygwin";}) aterm + autoconf + automake110x + automake19x gnum4 - readline + libtool ncurses + nixUnstable + readline + subversion ; }; @@ -407,5 +413,5 @@ in [ #i686FreeBSDPkgs #powerpcDarwinPkgs i686DarwinPkgs - #cygwinPkgs + cygwinPkgs ] diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 1976b1b23ec..60aa070e90a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -99,6 +99,7 @@ in { docbook_xml_dtd_42 = all; docbook_xml_dtd_43 = all; docbook_xsl = all; + dosbox = linux; doxygen = linux; e2fsprogs = linux; emacs22 = all; @@ -120,12 +121,14 @@ in { gcc = all; gcc33 = linux; gcc34 = linux; - gcc43multi = ["x86_64-linux"]; + gcc43_multi = ["x86_64-linux"]; gdb = all; ghostscript = linux; ghostscriptX = linux; gimp = linux; git = linux; + glibc = linux; + glibcLocales = linux; gnash = linux; gnugrep = all; gnum4 = all; @@ -176,7 +179,7 @@ in { libarchive = linux; libsmbios = linux; libtool = all; - libtool2 = all; + libtool_2 = all; libxml2 = all; libxslt = all; lout = linux; @@ -219,6 +222,7 @@ in { pam_unix2 = linux; pan = gtkSupported; par2cmdline = all; + pavucontrol = linux; pciutils = linux; perl = all; php = linux; @@ -341,11 +345,11 @@ in { haskellPackages_ghc6102 = { darcs = ghcSupported; ghc = ghcSupported; - gtk2hs = ghcSupported; - leksah = ghcSupported; + gtk2hs = linux; + leksah = linux; lhs2tex = ghcSupported; haskellPlatform = linux; /* OpenGL/mesa seems to fail on darwin */ - xmonad = ghcSupported; + xmonad = linux; }; kde3 = { @@ -401,6 +405,13 @@ in { virtualbox = linux; }; + strategoPackages = { + sdf = all; + strategoxt = all; + javafront = all; + dryad = linux; + }; + perlPackages = { TaskCatalystTutorial = linux; }; @@ -421,7 +432,7 @@ in { xauth = linux; xf86inputkeyboard = linux; xf86inputmouse = linux; - xf86videoi810 = linux; + xf86videointel = linux; xf86videovesa = linux; xkbcomp = linux; xmessage = linux;