diff --git a/maintainers/scripts/hydra_eval_check b/maintainers/scripts/hydra_eval_check index 07bf576df4b..e16a40455a3 100755 --- a/maintainers/scripts/hydra_eval_check +++ b/maintainers/scripts/hydra_eval_check @@ -5,7 +5,6 @@ hydra_eval_jobs \ --argstr system x86_64-linux \ --argstr system i686-linux \ --argstr system x86_64-darwin \ - --argstr system i686-darwin \ --argstr system i686-cygwin \ --argstr system i686-freebsd \ --arg officialRelease false \ diff --git a/pkgs/applications/audio/amarok/live.nix b/pkgs/applications/audio/amarok/live.nix deleted file mode 100644 index e90ca874827..00000000000 --- a/pkgs/applications/audio/amarok/live.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchgit, fetchgitrevision -, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl -, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon -, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig -, repository ? "git://git.kde.org/amarok" -, branch ? "heads/master" -, rev ? fetchgitrevision repository branch -, src ? fetchgit { - url = repository; - rev = rev; - } -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - pname = "amarok"; - version = "live"; - - inherit src; - - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl - libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig ]; - - postInstall = '' - mkdir -p $out/nix-support - echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages - ''; - meta = { - description = "Popular music player for KDE"; - license = "GPL"; - homepage = http://amarok.kde.org; - inherit (kdelibs.meta) maintainers; - }; -} diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix new file mode 100644 index 00000000000..81d44fdcb74 --- /dev/null +++ b/pkgs/applications/audio/bristol/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: + +stdenv.mkDerivation rec { + name = "bristol-${version}"; + version = "0.60.10"; + + src = fetchurl { + url = "mirror://sourceforge/bristol/${name}.tar.gz"; + sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; + }; + + buildInputs = [ + alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + xlibs.xproto + ]; + + meta = with stdenv.lib; { + description = "A range of synthesiser, electric piano and organ emulations"; + homepage = http://bristol.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d25cfeb3cd1..a73744ebbe8 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -2,17 +2,17 @@ , libglademm, libcanberra, intltool, gettext }: stdenv.mkDerivation rec { - name = "pavucontrol-0.9.10"; + name = "pavucontrol-1.0"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz"; - sha256 = "0g2sd9smwwpnyq8yc65dl9z0iafj2rrimi8v58wkxx98vhnnvsby"; + url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; + sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix"; }; buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra intltool gettext ]; - configureFlags = "--disable-lynx"; + configureFlags = "--disable-lynx --disable-gtk3"; meta = { description = "PulseAudio Volume Control"; diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index aa1a5b91a82..9814b2138c3 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,7 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0rcay0wci2kiwil2h505b674cblmn4nq8pqw9g9pgqmaqjq6f711"; }; - doCheck = true; + /* FIXME: Tests currently fail on Darwin: + + building test scripts for ed-1.5... + testing ed-1.5... + *** Output e1.o of script e1.ed is incorrect *** + *** Output r3.o of script r3.ed is incorrect *** + make: *** [check] Error 127 + + */ + doCheck = !stdenv.isDarwin; crossAttrs = { compileFlags = [ "CC=${stdenv.cross.config}-gcc" ]; diff --git a/pkgs/applications/editors/emacs-modes/nxml/builder.sh b/pkgs/applications/editors/emacs-modes/nxml/builder.sh deleted file mode 100644 index d2393362ebb..00000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/emacs/site-lisp -cd $out/emacs/site-lisp -tar xvfz $src -mv nxml-mode-*/* . -rmdir nxml-mode-* diff --git a/pkgs/applications/editors/emacs-modes/nxml/default.nix b/pkgs/applications/editors/emacs-modes/nxml/default.nix deleted file mode 100644 index c8d441475c8..00000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "nxml-mode-20041004"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz; - md5 = "ac137024cf337d6f11d8ab278d39b4db"; - }; -} diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 1c08dc6db8d..289cf7ff8d6 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command + # It have no reasons to exist in a redistribuable package + postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; + meta = { description = "A GTK2 small and ligthweight IDE."; longDescription = '' diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix deleted file mode 100644 index 1126a7278d6..00000000000 --- a/pkgs/applications/editors/jedit/wrapper.nix +++ /dev/null @@ -1,18 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = jedit.name+"_startscript"; - - java = jre+"/bin/java"; - jeditjar = jedit+"/lib/jedit.jar"; - - phases = "buildPhase"; - - buildPhase = " -mkdir -p \$out/bin -cat > \$out/bin/${jedit.name} << EOF -#!/bin/sh -exec $java -jar $jeditjar \\$* -EOF - chmod +x \$out/bin/${jedit.name} -"; -} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 974ced7d2b1..15cdadb04f5 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -2,27 +2,16 @@ stdenv.mkDerivation (rec { pname = "nano"; - version = "2.2.3"; + version = "2.2.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2"; + sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"; }; - + buildInputs = [ ncurses gettext ]; - - configureFlags = '' - --disable-browser - --disable-help - --disable-justify - --disable-mouse - --disable-operatingdir - --disable-speller - --disable-tabcomp - --disable-wrapping - ''; meta = { homepage = http://www.nano-editor.org/; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 41028601da7..bd53f8d81d0 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, x11, motif, libXpm}: -assert stdenv.system == "i686-linux"; +assert stdenv.isLinux; stdenv.mkDerivation { name = "nedit-5.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit motif; buildInputs = [x11 motif libXpm]; - buildFlags = if stdenv.system == "i686-linux" then "linux" else ""; + buildFlags = if stdenv.isLinux then "linux" else ""; meta = { homepage = http://www.nedit.org; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index f5a07d72c0e..a64561b1099 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.8"; + name = "zile-2.4.9"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "0jdwyyncplxpb32amf3qs3vsc3fcqmlb2hiayz1cmkg3ckhg94xp"; + sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7"; }; buildInputs = [ ncurses boehmgc ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 15d7042e7dd..ed04ddaa84a 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,24 +3,24 @@ , libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb -, openexr, pixman, pkgconfig, sqlite, bash }: +, openexr, pixman, pkgconfig, sqlite, bash, libxslt }: assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.1"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd"; + sha256 = "8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f"; }; buildInputs = [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 - librsvg libtiff libxcb openexr pixman pkgconfig sqlite + librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt ]; preConfigure = '' diff --git a/pkgs/applications/graphics/darktable/libpng-15.patch b/pkgs/applications/graphics/darktable/libpng-15.patch deleted file mode 100644 index f817a326448..00000000000 --- a/pkgs/applications/graphics/darktable/libpng-15.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 5803d31ae7704e0349821dcc20a94a1cddda69f1 -Author: Tim Harder -Date: Wed Sep 21 14:13:55 2011 -0700 - - Fix build with libpng-1.5 - - Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and - Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore - via the png.h header. - -diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c -index 40c7d48..c7be566 100644 ---- a/src/imageio/format/png.c -+++ b/src/imageio/format/png.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - DT_MODULE(1) - diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 7662d64e9de..769acd2a3b6 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { patches = [ ./glib-top-level-header.patch ]; + # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command + # It have no reasons to exist in a redistribuable package + postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; + meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4b2ebceda47..0e8f860c510 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, tk }: stdenv.mkDerivation rec { - name = "gocr-0.44"; + name = "gocr-0.49"; src = fetchurl { - url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; - sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0"; + url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; + postInstall = '' + sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl + ''; + meta = { + homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh deleted file mode 100644 index 2283e956f7b..00000000000 --- a/pkgs/applications/graphics/kuickshow/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -patchPhase=patchPhase -patchPhase() { - sed -e "s@-ljpeg6b@-ljpeg@" -i configure -} - -genericBuild - -ln -sv $KDEDIR/share/mimelnk $out/share diff --git a/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch b/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch deleted file mode 100644 index bc0210803a1..00000000000 --- a/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,7 @@ - cmake_minimum_required(VERSION 2.6) - -+option (WITH_RAWZOR "Build with Rawzor support" ON) -+ - add_subdirectory (rtexif) - add_subdirectory (rtengine) - add_subdirectory (rtgui) ---- a/rtengine/CMakeLists.txt -+++ b/rtengine/CMakeLists.txt -@@ -9,9 +9,13 @@ - IF (WIN32) - SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") - SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") -- SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") -+ SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a") -+ if (WITH_RAWZOR) - ADD_DEFINITIONS (-DRAWZOR_SUPPORT) -+ SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") -+ endif (WITH_RAWZOR) - ELSE (WIN32) -+ if (WITH_RAWZOR) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") - SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") -@@ -19,10 +23,11 @@ - SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) -- pkg_check_modules (IPTCDATA REQUIRED libiptcdata) -- pkg_check_modules (LCMS REQUIRED lcms) - SET (EXTRA_LIB "-lrwz_sdk") - ADD_DEFINITIONS (-DRAWZOR_SUPPORT) -+ endif (WITH_RAWZOR) -+ pkg_check_modules (IPTCDATA REQUIRED libiptcdata) -+ pkg_check_modules (LCMS REQUIRED lcms) - ENDIF (WIN32) - - include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS}) ---- a/rtengine/imagedata.cc -+++ b/rtengine/imagedata.cc -@@ -19,7 +19,9 @@ - #include - #include - #include -+#ifdef RAWZOR_SUPPORT - #include -+#endif - - using namespace rtengine; - ---- a/rtengine/myfile.cc -+++ b/rtengine/myfile.cc -@@ -19,7 +19,9 @@ - #include - #include - #include -+#ifdef RAWZOR_SUPPORT - #include -+#endif - - IMFILE* fopen (const char* fname) { - ---- a/rtgui/CMakeLists.txt -+++ b/rtgui/CMakeLists.txt -@@ -75,6 +75,7 @@ - if (NOT ZLIB_LIBRARIES) - message(SEND_ERROR "libz was not found!") - endif (NOT ZLIB_LIBRARIES) -+ if (WITH_RAWZOR) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") - SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") -@@ -82,6 +83,7 @@ - SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ endif (WITH_RAWZOR) - - include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} - ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix new file mode 100644 index 00000000000..2455923bbb8 --- /dev/null +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: +let + firmware = gt68xxFirmware { inherit fetchurl; }; +in +assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); + +stdenv.mkDerivation { + name = "sane-backends-1.0.22.482-g071f226"; + + src = fetchgit { + url = "http://git.debian.org/git/sane/sane-backends.git"; + rev = "071f2269cd68d3411cbfa05a3d028b74496db970"; + sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf"; + }; + + udevSupport = hotplugSupport; + + buildInputs = if libusb != null then [libusb] else []; + + postInstall = '' + if test "$udevSupport" = "1"; then + mkdir -p $out/etc/udev/rules.d/ + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ + 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 " + firmware.fw + + " \${out}/share/sane/gt68xx/" + firmware.name + else ""; + + meta = { + homepage = "http://www.sane-project.org/"; + description = "Scanner Access Now Easy"; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/applications/graphics/sane/backends.nix similarity index 74% rename from pkgs/misc/sane-backends/default.nix rename to pkgs/applications/graphics/sane/backends.nix index ac6fed5deb4..0fcfca74741 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null -, pkgconfig ? null -, gt68xxFirmware ? null }: -let - firmware = gt68xxFirmware {inherit fetchurl;}; -in +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }: + assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); +let + firmware = gt68xxFirmware { inherit fetchurl; }; +in stdenv.mkDerivation rec { version = "1.0.23"; name = "sane-backends-${version}"; - + src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz"; sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029"; }; - + udevSupport = hotplugSupport; buildInputs = [] @@ -32,8 +31,17 @@ stdenv.mkDerivation rec { ''; preInstall = - if gt68xxFirmware != null then + if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name else ""; + + meta = { + homepage = "http://www.sane-project.org/"; + description = "Scanner Access Now Easy"; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix new file mode 100644 index 00000000000..1c768e29873 --- /dev/null +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}: + +stdenv.mkDerivation rec { + name = "sane-frontends-1.0.14"; + + src = fetchurl { + url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz"; + md5 = "c63bf7b0bb5f530cf3c08715db721cd3"; + }; + + preConfigure = '' + sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c + ''; + + buildInputs = [saneBackends libX11 gtk pkgconfig] ++ + (if (libusb != null) then [libusb] else []); + + meta = { + homepage = "http://www.sane-project.org/"; + description = "Scanner Access Now Easy"; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/xsane/default.nix b/pkgs/applications/graphics/sane/xsane.nix similarity index 68% rename from pkgs/misc/xsane/default.nix rename to pkgs/applications/graphics/sane/xsane.nix index 8dd99c3c74d..c4fdf3a0044 100644 --- a/pkgs/misc/xsane/default.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, saneBackends, saneFrontends, - libX11, gtk, pkgconfig, libpng, libusb ? null}: -stdenv.mkDerivation { +{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }: + +stdenv.mkDerivation rec { name = "xsane-0.998"; src = fetchurl { - url = http://www.xsane.org/download/xsane-0.998.tar.gz; + url = "http://www.xsane.org/download/${name}.tar.gz"; sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/fetchmail/security-fix.patch b/pkgs/applications/misc/fetchmail/security-fix.patch deleted file mode 100644 index 4d48c7aa055..00000000000 --- a/pkgs/applications/misc/fetchmail/security-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/sink.c (revision 5118) -+++ new/sink.c (revision 5119) -@@ -262,7 +262,7 @@ - const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@"; - - /* don't bounce in reply to undeliverable bounces */ -- if (!msg->return_path[0] || -+ if (!msg || !msg->return_path[0] || - strcmp(msg->return_path, "<>") == 0 || - strcasecmp(msg->return_path, md1) == 0 || - strncasecmp(msg->return_path, md2, strlen(md2)) == 0) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 2fa36b33eb0..73db728b1a6 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.2"; + name = "girara-0.1.4"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix deleted file mode 100644 index 0967ef424bc..00000000000 --- a/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 1f99a02f429..df59145e51f 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20120725"; + version = "3.20121017"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "b600096a77b17e4a9e8a9552c4d36e01ed9217a0f8ff8a4f15110cf80e7adfad"; + sha256 = "c0bb6ef9340ebc7eec40812b091700b2bcfd61e7321a22f41026ce130e877028"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/krusader/krusader-gcc44.patch b/pkgs/applications/misc/krusader/krusader-gcc44.patch deleted file mode 100644 index f8840d5f33c..00000000000 --- a/pkgs/applications/misc/krusader/krusader-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000 -+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - #include "virtualcopyjob.h" diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index bcf0f1aee79..59bd4888e4a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, qt4}: +{ stdenv, fetchurl, qt4, muparser, which}: stdenv.mkDerivation { - name = "librecad-1.0.0"; + name = "librecad-1.0.2"; src = fetchurl { - url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.0; - name = "librecad-1.0.0.tar.gz"; - sha256 = "0s1ikyvy98zz1vw3xf5la73n3sykib6292cmhh2z738ggwigicc9"; + url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2; + name = "librecad-1.0.2.tar.gz"; + sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d"; }; patchPhase = '' sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh + sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp ''; configurePhase = "qmake PREFIX=$out"; - # It builds, but it does not install - installPhase = "exit 1"; + installPhase = '' + ensureDir $out/bin $out/share + cp -R unix/librecad $out/bin + cp -R unix/resources $out/share/librecad + ''; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 muparser which ]; meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix deleted file mode 100644 index ee8876e6b33..00000000000 --- a/pkgs/applications/misc/qcad/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -# translations still misssing - -{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }: - -stdenv.mkDerivation { - name = "qcad-2.0.5.0-1-community"; - - src = fetchurl { - url = http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz; - sha256 = "07aiw7zjf1fc04dhgwwp29adwb2qs165n7v04lh09zy0k2aplcl3"; - }; - - # TODO: add translations - buildPhase = '' - cd scripts - sh build_qcad.sh notrans - cd .. - ''; - - buildInputs = [ qt3 libpng libXext libX11 ]; - - prePatch = '' - sed -i 's/-pedantic//' mkspecs/defs.pro - # patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch } - ''; - patches = [ - /* taken from gentoo, fixes amd64 compilation issue */ - ./qcad-2.0.4.0-1.src-intptr.patch - /* taken from gentoo, fixes gcc 4.3 or above compilation issue */ - ./qcad-2.0.4.0-gcc43.patch - ]; - - # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild) - installPhase = '' - mkdir -p $out/{bin,share} - cp -r qcad $out/share - - # The compilation does not fail with error code. But qcad will not exist - # if it failed. - test -f $out/share/qcad/qcad - - cat >> $out/bin/qcad << EOF - #!/bin/sh - cd $out/share/qcad - ./qcad "\$@" - EOF - chmod +x $out/bin/qcad - ''; - - meta = { - description = "A 2D CAD package based upon Qt"; - homepage = http://www.ribbonsoft.de/qcad.html; - license = "GPLv2"; # community edition - }; -} diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch deleted file mode 100644 index 6d8b6acca5b..00000000000 --- a/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch deleted file mode 100644 index bc68e81c715..00000000000 --- a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp ---- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400 -+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400 -@@ -30,6 +30,7 @@ - #endif // _MSC_VER > 1000 - - #include -+#include - - #include "dl_writer_ascii.h" - #include "dl_exception.h" -diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400 -+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400 -@@ -34,6 +34,7 @@ - - - #include -+#include - - #include "dl_attributes.h" - -diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400 -+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400 -@@ -28,6 +28,7 @@ - #include "rs_snapper.h" - #include "rs_point.h" - -+#include - - RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h ---- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400 -+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400 -@@ -31,7 +31,7 @@ - #include "rs_line.h" - #include "rs_arc.h" - -- -+#include - - /** - * Class for getting information about entities. This includes diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 73eefef2505..0ef9acbcef4 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.15"; - sha256 = "1wa141bf3krzr8qcd9cyix3cflbw1yr1l3299ashjs7skqnjadcl"; + version = "0.16"; + sha256 = "1dx4kwygzp4c5j4jj4lsfgjfvhh863v68s106lmwc86a30h60p8i"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { ]; extraLibraries = [ libXrandr wirelesstools ]; configureFlags = "-fwith_xft -fwith_iwlib"; - patchPhase = '' - sed -i -e 's|mtl ==.*$|mtl,|' xmobar.cabal - ''; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; diff --git a/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch b/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch deleted file mode 100644 index 3ea3cb8c923..00000000000 --- a/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch +++ /dev/null @@ -1,471 +0,0 @@ -diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c -*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005 ---- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006 -*************** -*** 11,16 **** ---- 11,17 ---- - #include - #include - #include -+ #include - #include "gmem.h" - - #ifdef DEBUG_MEM -*************** -*** 63,69 **** - int lst; - unsigned long *trl, *p; - -! if (size == 0) - return NULL; - size1 = gMemDataSize(size); - if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { ---- 64,70 ---- - int lst; - unsigned long *trl, *p; - -! if (size <= 0) - return NULL; - size1 = gMemDataSize(size); - if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { -*************** -*** 86,92 **** - #else - void *p; - -! if (size == 0) - return NULL; - if (!(p = malloc(size))) { - fprintf(stderr, "Out of memory\n"); ---- 87,93 ---- - #else - void *p; - -! if (size <= 0) - return NULL; - if (!(p = malloc(size))) { - fprintf(stderr, "Out of memory\n"); -*************** -*** 102,108 **** - void *q; - int oldSize; - -! if (size == 0) { - if (p) - gfree(p); - return NULL; ---- 103,109 ---- - void *q; - int oldSize; - -! if (size <= 0) { - if (p) - gfree(p); - return NULL; -*************** -*** 120,126 **** - #else - void *q; - -! if (size == 0) { - if (p) - free(p); - return NULL; ---- 121,127 ---- - #else - void *q; - -! if (size <= 0) { - if (p) - free(p); - return NULL; -*************** -*** 140,147 **** - void *gmallocn(int nObjs, int objSize) { - int n; - - n = nObjs * objSize; -! if (objSize == 0 || n / objSize != nObjs) { - fprintf(stderr, "Bogus memory allocation size\n"); - exit(1); - } ---- 141,151 ---- - void *gmallocn(int nObjs, int objSize) { - int n; - -+ if (nObjs == 0) { -+ return NULL; -+ } - n = nObjs * objSize; -! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { - fprintf(stderr, "Bogus memory allocation size\n"); - exit(1); - } -*************** -*** 151,158 **** - void *greallocn(void *p, int nObjs, int objSize) { - int n; - - n = nObjs * objSize; -! if (objSize == 0 || n / objSize != nObjs) { - fprintf(stderr, "Bogus memory allocation size\n"); - exit(1); - } ---- 155,168 ---- - void *greallocn(void *p, int nObjs, int objSize) { - int n; - -+ if (nObjs == 0) { -+ if (p) { -+ gfree(p); -+ } -+ return NULL; -+ } - n = nObjs * objSize; -! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { - fprintf(stderr, "Bogus memory allocation size\n"); - exit(1); - } -diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc -*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006 -*************** -*** 13,18 **** ---- 13,19 ---- - #endif - - #include -+ #include - #include "GList.h" - #include "Error.h" - #include "JArithmeticDecoder.h" -*************** -*** 681,686 **** ---- 682,691 ---- - w = wA; - h = hA; - line = (wA + 7) >> 3; -+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { -+ data = NULL; -+ return; -+ } - // need to allocate one extra guard byte for use in combine() - data = (Guchar *)gmalloc(h * line + 1); - data[h * line] = 0; -*************** -*** 692,697 **** ---- 697,706 ---- - w = bitmap->w; - h = bitmap->h; - line = bitmap->line; -+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { -+ data = NULL; -+ return; -+ } - // need to allocate one extra guard byte for use in combine() - data = (Guchar *)gmalloc(h * line + 1); - memcpy(data, bitmap->data, h * line); -*************** -*** 720,726 **** - } - - void JBIG2Bitmap::expand(int newH, Guint pixel) { -! if (newH <= h) { - return; - } - // need to allocate one extra guard byte for use in combine() ---- 729,735 ---- - } - - void JBIG2Bitmap::expand(int newH, Guint pixel) { -! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { - return; - } - // need to allocate one extra guard byte for use in combine() -*************** -*** 2294,2299 **** ---- 2303,2316 ---- - !readUWord(&stepX) || !readUWord(&stepY)) { - goto eofError; - } -+ if (w == 0 || h == 0 || w >= INT_MAX / h) { -+ error(getPos(), "Bad bitmap size in JBIG2 halftone segment"); -+ return; -+ } -+ if (gridH == 0 || gridW >= INT_MAX / gridH) { -+ error(getPos(), "Bad grid size in JBIG2 halftone segment"); -+ return; -+ } - - // get pattern dictionary - if (nRefSegs != 1) { -diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc -*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006 -*************** -*** 12,17 **** ---- 12,18 ---- - #pragma implementation - #endif - -+ #include - #include "gmem.h" - #include "Error.h" - #include "JArithmeticDecoder.h" -*************** -*** 818,823 **** ---- 819,830 ---- - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -+ // check for overflow before allocating memory -+ if (img.nXTiles <= 0 || img.nYTiles <= 0 || -+ img.nXTiles >= INT_MAX / img.nYTiles) { -+ error(getPos(), "Bad tile count in JPX SIZ marker segment"); -+ return gFalse; -+ } - img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, - sizeof(JPXTile)); - for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { -diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc -*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006 -*************** -*** 15,20 **** ---- 15,21 ---- - #include - #include - #include -+ #include - #ifndef WIN32 - #include - #endif -*************** -*** 406,418 **** ---- 407,432 ---- - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ if (width <= 0 || nComps <= 0 || nBits <= 0 || -+ nComps >= INT_MAX / nBits || -+ width >= INT_MAX / nComps / nBits || -+ nVals * nBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ if (rowBytes <= 0) { -+ return; -+ } - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -*************** -*** 1004,1009 **** ---- 1018,1027 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -*************** -*** 1259,1264 **** ---- 1277,1285 ---- - if (columns < 1) { - columns = 1; - } -+ if (columns + 4 <= 0) { -+ columns = INT_MAX - 4; -+ } - rows = rowsA; - endOfBlock = endOfBlockA; - black = blackA; -*************** -*** 2899,2904 **** ---- 2920,2930 ---- - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ numComps = 0; -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -*************** -*** 2925,2930 **** ---- 2951,2961 ---- - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ numComps = 0; -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -*************** -*** 2947,2952 **** ---- 2978,2988 ---- - - length = read16() - 2; - scanInfo.numComps = str->getChar(); -+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ scanInfo.numComps = 0; -+ return gFalse; -+ } - --length; - if (length != 2 * scanInfo.numComps + 3) { - error(getPos(), "Bad DCT scan info block"); -*************** -*** 3041,3046 **** ---- 3077,3083 ---- - numACHuffTables = index+1; - tbl = &acHuffTables[index]; - } else { -+ index &= 0x0f; - if (index >= numDCHuffTables) - numDCHuffTables = index+1; - tbl = &dcHuffTables[index]; -*************** -*** 3827,3832 **** ---- 3864,3873 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h -*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006 -*************** -*** 232,237 **** ---- 232,239 ---- - - ~StreamPredictor(); - -+ GBool isOk() { return ok; } -+ - int lookChar(); - int getChar(); - -*************** -*** 249,254 **** ---- 251,257 ---- - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ -*************** -*** 527,533 **** - short getWhiteCode(); - short getBlackCode(); - short lookBits(int n); -! void eatBits(int n) { inputBits -= n; } - }; - - //------------------------------------------------------------------------ ---- 530,536 ---- - short getWhiteCode(); - short getBlackCode(); - short lookBits(int n); -! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; } - }; - - //------------------------------------------------------------------------ -diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc -*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006 -*************** -*** 186,192 **** - } - - void SplashXPathScanner::computeIntersections(int y) { -! SplashCoord ySegMin, ySegMax, xx0, xx1; - SplashXPathSeg *seg; - int i, j; - ---- 186,192 ---- - } - - void SplashXPathScanner::computeIntersections(int y) { -! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1; - SplashXPathSeg *seg; - int i, j; - -*************** -*** 236,254 **** - } else if (seg->flags & splashXPathVert) { - xx0 = xx1 = seg->x0; - } else { -! if (ySegMin <= y) { -! // intersection with top edge -! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; - } else { -! // x coord of segment endpoint with min y coord -! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0; - } -! if (ySegMax >= y + 1) { -! // intersection with bottom edge -! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; -! } else { -! // x coord of segment endpoint with max y coord -! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1; - } - } - if (xx0 < xx1) { ---- 236,262 ---- - } else if (seg->flags & splashXPathVert) { - xx0 = xx1 = seg->x0; - } else { -! if (seg->x0 < seg->x1) { -! xSegMin = seg->x0; -! xSegMax = seg->x1; - } else { -! xSegMin = seg->x1; -! xSegMax = seg->x0; - } -! // intersection with top edge -! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; -! // intersection with bottom edge -! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; -! // the segment may not actually extend to the top and/or bottom edges -! if (xx0 < xSegMin) { -! xx0 = xSegMin; -! } else if (xx0 > xSegMax) { -! xx0 = xSegMax; -! } -! if (xx1 < xSegMin) { -! xx1 = xSegMin; -! } else if (xx1 > xSegMax) { -! xx1 = xSegMax; - } - } - if (xx0 < xx1) { diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 0c58965fc19..6c3ff038c74 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.2.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef"; + sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790"; }; buildInputs = [ pkgconfig gtk girara gettext ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index b5ba4f9ada7..5ed445b6984 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -13,7 +13,7 @@ rec { zathuraWrapper = stdenv.mkDerivation rec { - name = "zathura-0.1.2"; + name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ zathura_pdf_poppler diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c4656e73236..bddb3471bfe 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.1.1"; + name = "zathura-djvu-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172"; + sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 17e00b4e622..e0fcb0573a4 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - name = "zathura-pdf-poppler-0.1.1"; + name = "zathura-pdf-poppler-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7"; + sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ae9aeee7715..7f70eb952e1 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.1.0"; + name = "zathura-ps-0.2.0"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789"; + sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414"; }; buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 9b6616ec63c..dae5ab709e5 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s"; }; beta = { - version = "24.0.1312.14"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.14.tar.bz2"; - sha256 = "03w8cg4kqmpj82976ax9x6y275y9gcri4vc11cvfjp6r1issxzk8"; + version = "24.0.1312.25"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.25.tar.bz2"; + sha256 = "1d2wnv0pmvja1vwqmccngajwgf9kwz55bhid43k1db7yczi591fr"; }; stable = { - version = "23.0.1271.64"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2"; - sha256 = "1rzz08sgw07nkmvhhgyrkrcxj3z24lxbx0di6ky6jz3lshibp578"; + version = "23.0.1271.91"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.91.tar.bz2"; + sha256 = "00avyc8bszkb99jq399jr3h1ia7lw68msszvrdhl5rh052z1lp9q"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix deleted file mode 100644 index cb79f4422eb..00000000000 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ /dev/null @@ -1,179 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "15.0.1"; - - xulVersion = "15.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # disabled for the moment because our Cairo is too old - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - preConfigure = - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - #installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - rm xulrunner - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip pysqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - makeFlags = [ - "SYSTEM_LIBXUL=1" - ]; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/17.0.nix similarity index 87% rename from pkgs/applications/networking/browsers/firefox/16.0.nix rename to pkgs/applications/networking/browsers/firefox/17.0.nix index a9a10fbc4ec..9b785bebacb 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/17.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "16.0.2"; + firefoxVersion = "17.0.1"; - xulVersion = "16.0.2"; # this attribute is used by other packages + xulVersion = "17.0.1"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "0ffe96896583e92561b341330ab09ddc50140dd1"; + sha1 = "15c09796a388f0a78996427b7bc2c80f4e0496f3"; }; commonConfigureFlags = @@ -70,7 +70,7 @@ rec { "--disable-javaxpcom" ] ++ commonConfigureFlags; - enableParallelBuilding = true; + enableParallelBuilding = false; preConfigure = '' @@ -94,7 +94,7 @@ rec { for i in $out/lib/$libDir/*; do file $i; if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; chmod a+x "$out/bin/$(basename "$i")"; fi; done @@ -156,18 +156,9 @@ rec { postInstall = '' ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; cd "$out/lib/"firefox-* rm firefox - echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox chmod a+x firefox ''; # */ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 2eb34f68b8b..3496097b86d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -43,9 +43,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.238"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "07d09xjnn2hm877psmv9a6c4cfighxw24p0apq2ykawnrjpjc6zn"; + version = "11.2.202.251"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz"; + sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2"; } else if stdenv.system == "i686-linux" then if debug then { @@ -54,9 +54,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.238"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0p05pr4vmc4536axjyljhxhqizq4ihslar8g638dj24251byp7ca"; + version = "11.2.202.251"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz"; + sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 2ef8e8ae432..63ae2ef86d4 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,6 +1,6 @@ args: with args; stdenv.mkDerivation { - name = "libnsbmp-0.0.1"; + name = "libnsgif-0.0.1"; src = fetchurl { url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz; @@ -10,7 +10,7 @@ stdenv.mkDerivation { installPhase = "make PREFIX=$out install"; buildInputs = []; - meta = { + meta = { description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; license = "MIT"; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d7a8ac51a06..e03f07c1e23 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { postFixup = '' oldRPATH=`patchelf --print-rpath $out/lib/opera/opera` patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera + + # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command + # It have no reasons to exist in a redistribuable package + rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index dd5a3dc8b9e..cae0213c6be 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: stdenv.mkDerivation { - name = "mcabber-0.9.9"; + name = "mcabber-0.10.1"; src = fetchurl { - url = http://mirror.mcabber.com/files/mcabber-0.9.9.tar.bz2; - sha256 = "2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1"; + url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2"; + sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; }; - meta = { homepage = "http://mirror.mcabber.com/"; + meta = { homepage = "http://mcabber.com/"; description = "Small Jabber console client"; }; - buildInputs = [openssl ncurses pkgconfig glib]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth]; configureFlags = "--with-openssl=${openssl}"; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix deleted file mode 100644 index 73eda93f7e8..00000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";} -{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";} -{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";} -{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";} -{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";} -{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";} -{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";} -{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";} -{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";} -] diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c518f0430ff..9d7126452c9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9"; + sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1d5bcfa5b9b..a1fc52337ed 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "16.0.2"; in +let version = "17.0"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; + sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8"; }; enableParallelBuilding = true; @@ -50,6 +50,7 @@ stdenv.mkDerivation { "--disable-webm" "--disable-tests" "--enable-calendar" + "--disable-ogg" ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index 5b9aefa182e..e66166f4713 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-interest"; - version = "1.4.1"; - sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8"; + version = "1.4.2"; + sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal hledgerLib mtl time ]; diff --git a/pkgs/applications/office/ledger/const.patch b/pkgs/applications/office/ledger/const.patch deleted file mode 100644 index 8565fbfd0d4..00000000000 --- a/pkgs/applications/office/ledger/const.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/gnucash.cc b/gnucash.cc -index 7d31526..c4edd77 100644 ---- a/gnucash.cc -+++ b/gnucash.cc -@@ -201,7 +201,7 @@ static amount_t convert_number(const std::string& number, - { - const char * num = number.c_str(); - -- if (char * p = std::strchr(num, '/')) { -+ if (const char * p = std::strchr(num, '/')) { - std::string numer_str(num, p - num); - std::string denom_str(p + 1); - -diff --git a/option.cc b/option.cc -index 10c23a7..8f2fead 100644 ---- a/option.cc -+++ b/option.cc -@@ -892,7 +892,7 @@ OPT_BEGIN(market, "V") { - namespace { - void parse_price_setting(const char * optarg) - { -- char * equals = std::strchr(optarg, '='); -+ const char * equals = std::strchr(optarg, '='); - if (! equals) - return; - -diff --git a/textual.cc b/textual.cc -index 2033106..d897368 100644 ---- a/textual.cc -+++ b/textual.cc -@@ -298,8 +298,8 @@ transaction_t * parse_transaction(char * line, account_t * account, - DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " << - "Parsed a note '" << xact->note << "'"); - -- if (char * b = std::strchr(xact->note.c_str(), '[')) -- if (char * e = std::strchr(xact->note.c_str(), ']')) { -+ if (const char * b = std::strchr(xact->note.c_str(), '[')) -+ if (const char * e = std::strchr(xact->note.c_str(), ']')) { - char buf[256]; - std::strncpy(buf, b + 1, e - b - 1); - buf[e - b - 1] = '\0'; diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix deleted file mode 100644 index 7111d1a854e..00000000000 --- a/pkgs/applications/science/biology/slr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, liblapack}: - -stdenv.mkDerivation { - name = "slr-1.4.2"; - - src = fetchurl { - url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz; - sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp"; - }; - - buildInputs = [ liblapack ]; - preConfigure = "mkdir bin; cd src"; - makeFlags = "-f Makefile.linux"; - - meta = { - description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; - longDescription = '' -SLR is a program to detect sites in coding DNA that are unusually conserved and/or unusually variable (that is, evolving under purify or positive selection) by analysing the pattern of changes for an alignment of sequences on an evolutionary tree. -''; - license = "GPL3"; - homepage = http://www.ebi.ac.uk/goldman/SLR/; - }; -} diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 61fb615b84d..54aae9e7d3b 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk pkgconfig ]; + # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 + patches = [ ./gtkdepre.diff ]; + meta = { description = "Oscilloscope through the sound card"; homepage = http://xoscope.sourceforge.net; diff --git a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff new file mode 100644 index 00000000000..993df9cb550 --- /dev/null +++ b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff @@ -0,0 +1,58 @@ +diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c +--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200 ++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200 +@@ -661,7 +661,7 @@ + static void + gtk_databox_calculate_hcanvas (GtkDatabox *box) + { +- if (!GTK_WIDGET_VISIBLE (box)) ++ if (!gtk_widget_get_visible (box)) + return; + + if (box->priv->adjX->page_size == 1.0) +@@ -698,7 +698,7 @@ + static void + gtk_databox_calculate_vcanvas (GtkDatabox *box) + { +- if (!GTK_WIDGET_VISIBLE (box)) ++ if (!gtk_widget_get_visible (box)) + return; + + if (box->priv->adjY->page_size == 1.0) +@@ -780,7 +780,7 @@ + gtk_databox_draw (box, event); + + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], ++ widget->style->fg_gc[gtk_widget_get_state (widget)], + box->priv->canvas.pixmap, event->area.x, event->area.y, + event->area.x, event->area.y, event->area.width, + event->area.height); +@@ -940,7 +940,7 @@ + GtkWidget *widget = GTK_WIDGET (box); + + g_return_if_fail (GTK_IS_DATABOX (box)); +- g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); ++ g_return_if_fail (gtk_widget_get_visible (widget)); + + gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], + TRUE, 0, 0, +@@ -1150,7 +1150,7 @@ + /* Copy a part of the pixmap to the screen */ + if (pixmapCopyRect) + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (box)], ++ widget->style->fg_gc[gtk_widget_get_state (box)], + box->priv->canvas.pixmap, + pixmapCopyRect->x, + pixmapCopyRect->y, +--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200 ++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200 +@@ -196,7 +196,6 @@ + -DG_DISABLE_DEPRECATED\ + -DGDK_DISABLE_DEPRECATED\ + -DGDK_PIXBUF_DISABLE_DEPRECATED\ +- -DGTK_DISABLE_DEPRECATED\ + `pkg-config gtk+-2.0 --cflags` + + all: all-am diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index bf0d9ddada4..00038373d56 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.3-src"; - name="golly-2.3-src"; - hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1"; - url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz"; - advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz"; + version="2.4-src"; + name="golly-2.4-src"; + hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w"; + url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; + advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix new file mode 100644 index 00000000000..c687fd5908c --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -0,0 +1,46 @@ + +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + meta = { + homepage = "http://www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: http://www.gromacs.org/About_Gromacs for details. + ''; + }; +} diff --git a/pkgs/applications/version-management/darcs/bash-completion.patch b/pkgs/applications/version-management/darcs/bash-completion.patch deleted file mode 100644 index 8944ebeb9cb..00000000000 --- a/pkgs/applications/version-management/darcs/bash-completion.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/darcs-2.0.0/tools/darcs_completion b/darcs-2.0.0/tools/darcs_completion -index 10628db..e36476e 100644 ---- a/tools/darcs_completion -+++ b/tools/darcs_completion -@@ -3,7 +3,6 @@ - # darcs command line completion. - # Copyright 2002 "David Roundy" - # --have darcs && - _darcs() - { - local cur -@@ -48,5 +47,5 @@ _darcs() - return 0 - - } --[ "$have" ] && complete -F _darcs -o default darcs -+complete -F _darcs -o default darcs - diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9f52871547a..fe4f101e27c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,7 +44,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 713cf0d62a6..0e9c14dc48b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -12,14 +12,14 @@ }: let - version = "3.20121112-161-gb27d9eb"; + version = "3.20121127"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { - url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz"; - sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a"; + url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; + sha256 = "bec0c2c236daf10f0ed5de1097cb31f6c2725aa856d900f782a5a07d6db1d508"; name = "git-annex-${version}.tar.gz"; }; @@ -36,7 +36,6 @@ stdenv.mkDerivation { checkTarget = "test"; doCheck = true; - # The 'add_url' test fails because it attempts to use the network. preConfigure = '' makeFlagsArray=( PREFIX=$out ) sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b3229909212..857b7de3486 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ let - version = "1.8.0"; + version = "1.8.0.1"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha1 = "a03afc33f8f0723ad12649d79f1e8968526b4bf7"; + sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1"; }; patches = [ ./docbook2texi.patch ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch deleted file mode 100644 index 25a76ea3dd2..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch +++ /dev/null @@ -1,28 +0,0 @@ - -make sure `gitman.info' isn't produced since it's broken (duplicate -node names). - -diff --git a/Documentation/Makefile b/Documentation/Makefile ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -84,7 +84,7 @@ man1: $(DOC_MAN1) - man5: $(DOC_MAN5) - man7: $(DOC_MAN7) - --info: git.info gitman.info -+info: git.info - - install: man - $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) -@@ -96,10 +96,9 @@ install: man - - install-info: info - $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) -- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) -+ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir) - if test -r $(DESTDIR)$(infodir)/dir; then \ - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ -- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ - else \ - echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ - fi diff --git a/pkgs/applications/version-management/git-and-tools/git/glob-path.patch b/pkgs/applications/version-management/git-and-tools/git/glob-path.patch deleted file mode 100644 index 7515ade5787..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git/glob-path.patch +++ /dev/null @@ -1,529 +0,0 @@ -diff --git a/builtin-add.c b/builtin-add.c -index bf13aa3..02c6751 100644 ---- a/builtin-add.c -+++ b/builtin-add.c -@@ -123,6 +123,7 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags) - init_revisions(&rev, prefix); - setup_revisions(0, NULL, &rev, NULL); - rev.prune_data = pathspec; -+ rev.glob_paths = 0; /* git-add has its own filename matching machinery */ - rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; - rev.diffopt.format_callback = update_callback; - data.flags = flags; -diff --git a/builtin-blame.c b/builtin-blame.c -index 9bced3b..237d1fe 100644 ---- a/builtin-blame.c -+++ b/builtin-blame.c -@@ -343,7 +343,7 @@ static struct origin *find_origin(struct scoreboard *sb, - paths[0] = origin->path; - paths[1] = NULL; - -- diff_tree_setup_paths(paths, &diff_opts); -+ diff_tree_setup_paths(paths, &diff_opts, 0); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); - -@@ -417,7 +417,7 @@ static struct origin *find_rename(struct scoreboard *sb, - diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; - diff_opts.single_follow = origin->path; - paths[0] = NULL; -- diff_tree_setup_paths(paths, &diff_opts); -+ diff_tree_setup_paths(paths, &diff_opts, 0); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); - -@@ -1099,7 +1099,7 @@ static int find_copy_in_parent(struct scoreboard *sb, - diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; - - paths[0] = NULL; -- diff_tree_setup_paths(paths, &diff_opts); -+ diff_tree_setup_paths(paths, &diff_opts, 0); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); - -@@ -2346,6 +2346,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix) - parse_done: - argc = parse_options_end(&ctx); - -+ if (revs.glob_paths) { -+ error("git blame does not support `--glob-paths'"); -+ usage_with_options(blame_opt_usage, options); -+ } -+ - if (!blame_move_score) - blame_move_score = BLAME_DEFAULT_MOVE_SCORE; - if (!blame_copy_score) -diff --git a/builtin-reset.c b/builtin-reset.c -index 2e5a886..6026b34 100644 ---- a/builtin-reset.c -+++ b/builtin-reset.c -@@ -128,14 +128,15 @@ static void update_index_from_diff(struct diff_queue_struct *q, - } - - static int read_from_tree(const char *prefix, const char **argv, -- unsigned char *tree_sha1) -+ unsigned char *tree_sha1, int glob_paths) - { - struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); - int index_fd, index_was_discarded = 0; - struct diff_options opt; - - memset(&opt, 0, sizeof(opt)); -- diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt); -+ diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), -+ &opt, glob_paths); - opt.output_format = DIFF_FORMAT_CALLBACK; - opt.format_callback = update_index_from_diff; - opt.format_callback_data = &index_was_discarded; -@@ -171,6 +172,7 @@ static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL }; - int cmd_reset(int argc, const char **argv, const char *prefix) - { - int i = 0, reset_type = NONE, update_ref_status = 0, quiet = 0; -+ int glob_paths = 0; - const char *rev = "HEAD"; - unsigned char sha1[20], *orig = NULL, sha1_orig[20], - *old_orig = NULL, sha1_old_orig[20]; -@@ -182,6 +184,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix) - OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT), - OPT_SET_INT(0, "hard", &reset_type, - "reset HEAD, index and working tree", HARD), -+ OPT_BOOLEAN(0, "glob-paths", &glob_paths, -+ "match paths with fnmatch"), - OPT_BOOLEAN('q', NULL, &quiet, - "disable showing new HEAD in hard reset and progress message"), - OPT_END() -@@ -246,7 +250,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) - else if (reset_type != NONE) - die("Cannot do %s reset with paths.", - reset_type_names[reset_type]); -- return read_from_tree(prefix, argv + i, sha1); -+ return read_from_tree(prefix, argv + i, sha1, glob_paths); - } - if (reset_type == NONE) - reset_type = MIXED; /* by default */ -diff --git a/builtin-update-index.c b/builtin-update-index.c -index 38eb53c..28b09a3 100644 ---- a/builtin-update-index.c -+++ b/builtin-update-index.c -@@ -23,6 +23,7 @@ static int allow_replace; - static int info_only; - static int force_remove; - static int verbose; -+static int glob_paths; - static int mark_valid_only; - #define MARK_VALID 1 - #define UNMARK_VALID 2 -@@ -534,7 +535,7 @@ static int do_reupdate(int ac, const char **av, - struct cache_entry *old = NULL; - int save_nr; - -- if (ce_stage(ce) || !ce_path_match(ce, pathspec)) -+ if (ce_stage(ce) || !ce_path_match(ce, pathspec, glob_paths)) - continue; - if (has_head) - old = read_one_ent(NULL, head_sha1, -@@ -659,6 +660,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) - force_remove = 1; - continue; - } -+ if (!strcmp(path, "--glob-paths")) { -+ glob_paths = 1; -+ continue; -+ } - if (!strcmp(path, "-z")) { - line_termination = 0; - continue; -@@ -702,6 +707,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) - usage(update_index_usage); - die("unknown option %s", path); - } -+ if (glob_paths) -+ die("--glob-paths without -g"); - p = prefix_path(prefix, prefix_length, path); - update_one(p, NULL, 0); - if (set_executable_bit) -@@ -712,6 +719,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) - if (read_from_stdin) { - struct strbuf buf, nbuf; - -+ if (glob_paths) -+ die("--glob-paths without -g"); - strbuf_init(&buf, 0); - strbuf_init(&nbuf, 0); - while (strbuf_getline(&buf, stdin, line_termination) != EOF) { -diff --git a/cache.h b/cache.h -index a779d92..5560195 100644 ---- a/cache.h -+++ b/cache.h -@@ -387,7 +387,8 @@ extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); - extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); - extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); - --extern int ce_path_match(const struct cache_entry *ce, const char **pathspec); -+extern int ce_path_match(const struct cache_entry *ce, const char **pathspec, -+ int glob_paths); - extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path); - extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object); - extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); -diff --git a/diff-lib.c b/diff-lib.c -index e7eaff9..87925a2 100644 ---- a/diff-lib.c -+++ b/diff-lib.c -@@ -77,7 +77,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) - DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) - break; - -- if (!ce_path_match(ce, revs->prune_data)) -+ if (!ce_path_match(ce, revs->prune_data, revs->glob_paths)) - continue; - - if (ce_stage(ce)) { -@@ -431,7 +431,7 @@ static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o) - if (tree == o->df_conflict_entry) - tree = NULL; - -- if (ce_path_match(idx ? idx : tree, revs->prune_data)) -+ if (ce_path_match(idx ? idx : tree, revs->prune_data, revs->glob_paths)) - do_oneway_diff(o, idx, tree); - - return 0; -@@ -508,6 +508,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt) - - init_revisions(&revs, NULL); - revs.prune_data = opt->paths; -+ revs.glob_paths = opt->glob_paths; - tree = parse_tree_indirect(tree_sha1); - if (!tree) - die("bad tree object %s", sha1_to_hex(tree_sha1)); -diff --git a/diff-no-index.c b/diff-no-index.c -index f6994cf..ec549a7 100644 ---- a/diff-no-index.c -+++ b/diff-no-index.c -@@ -240,6 +240,7 @@ void diff_no_index(struct rev_info *revs, - } - else - revs->diffopt.paths = argv + argc - 2; -+ revs->diffopt.glob_paths = 0; - revs->diffopt.nr_paths = 2; - - DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); -diff --git a/diff.h b/diff.h -index 50fb5dd..56f0857 100644 ---- a/diff.h -+++ b/diff.h -@@ -102,6 +102,7 @@ struct diff_options { - FILE *file; - int close_file; - -+ int glob_paths; - int nr_paths; - const char **paths; - int *pathlens; -@@ -128,7 +129,8 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix); - - extern const char mime_boundary_leader[]; - --extern void diff_tree_setup_paths(const char **paths, struct diff_options *); -+extern void diff_tree_setup_paths(const char **paths, struct diff_options *opt, -+ int glob_paths); - extern void diff_tree_release_paths(struct diff_options *); - extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, - const char *base, struct diff_options *opt); -diff --git a/gitk-git/gitk b/gitk-git/gitk -index fddcb45..18c5cbc 100644 ---- a/gitk-git/gitk -+++ b/gitk-git/gitk -@@ -1866,6 +1866,7 @@ proc makewindow {} { - set gm [tk_optionMenu .tf.lbar.gdttype gdttype \ - [mc "containing:"] \ - [mc "touching paths:"] \ -+ [mc "touching paths (glob):"] \ - [mc "adding/removing string:"]] - trace add variable gdttype write gdttype_change - pack .tf.lbar.gdttype -side left -fill y -@@ -3588,6 +3589,11 @@ proc do_file_hl {serial} { - set highlight_paths [makepatterns $paths] - highlight_filelist - set gdtargs [concat -- $paths] -+ } elseif {$gdttype eq [mc "touching paths (glob):"]} { -+ if {[catch {set paths [shellsplit $highlight_files]}]} return -+ set highlight_paths $paths -+ highlight_filelist -+ set gdtargs [concat --glob-paths -- $paths] - } elseif {$gdttype eq [mc "adding/removing string:"]} { - set gdtargs [list "-S$highlight_files"] - } else { -diff --git a/read-cache.c b/read-cache.c -index 1648428..c11ded9 100644 ---- a/read-cache.c -+++ b/read-cache.c -@@ -582,7 +582,8 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b) - return ce_namelen(b) == len && !memcmp(a->name, b->name, len); - } - --int ce_path_match(const struct cache_entry *ce, const char **pathspec) -+static int ce_path_match_standard(const struct cache_entry *ce, -+ const char **pathspec) - { - const char *match, *name; - int len; -@@ -608,6 +609,31 @@ int ce_path_match(const struct cache_entry *ce, const char **pathspec) - return 0; - } - -+static int ce_path_match_globbed(const struct cache_entry *ce, -+ const char **pathspec) -+{ -+ const char *match, *name; -+ -+ if (!pathspec) -+ return 1; -+ -+ name = ce->name; -+ while ((match = *pathspec++) != NULL) { -+ if (!fnmatch(match, name, 0)) -+ return 1; -+ } -+ return 0; -+} -+ -+int ce_path_match(const struct cache_entry *ce, -+ const char **pathspec, int glob_paths) -+{ -+ if (glob_paths) -+ return ce_path_match_globbed(ce, pathspec); -+ else -+ return ce_path_match_standard(ce, pathspec); -+} -+ - /* - * We fundamentally don't like some paths: we don't want - * dot or dot-dot anywhere, and for obvious reasons don't -diff --git a/revision.c b/revision.c -index 3897fec..0dd1091 100644 ---- a/revision.c -+++ b/revision.c -@@ -519,6 +519,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) - if (revs->diffopt.nr_paths) { - ids.diffopts.nr_paths = revs->diffopt.nr_paths; - ids.diffopts.paths = revs->diffopt.paths; -+ ids.diffopts.glob_paths = revs->diffopt.glob_paths; /* CHECKME */ - ids.diffopts.pathlens = revs->diffopt.pathlens; - } - -@@ -826,7 +827,7 @@ static void prepare_show_merge(struct rev_info *revs) - struct cache_entry *ce = active_cache[i]; - if (!ce_stage(ce)) - continue; -- if (ce_path_match(ce, revs->prune_data)) { -+ if (ce_path_match(ce, revs->prune_data, revs->glob_paths)) { - prune_num++; - prune = xrealloc(prune, sizeof(*prune) * prune_num); - prune[prune_num-2] = ce->name; -@@ -837,6 +838,7 @@ static void prepare_show_merge(struct rev_info *revs) - i++; - } - revs->prune_data = prune; -+ revs->glob_paths = 0; - revs->limited = 1; - } - -@@ -1033,6 +1035,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg - revs->min_age = approxidate(arg + 8); - } else if (!strcmp(arg, "--first-parent")) { - revs->first_parent_only = 1; -+ } else if (!strcmp(arg, "--glob-paths")) { -+ revs->glob_paths = 1; - } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) { - init_reflog_walk(&revs->reflog_info); - } else if (!strcmp(arg, "--default")) { -@@ -1220,6 +1224,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, - int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def) - { - int i, flags, left, seen_dashdash; -+ const char **paths = NULL; - - /* First, search for "--" */ - seen_dashdash = 0; -@@ -1230,7 +1235,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch - argv[i] = NULL; - argc = i; - if (argv[i + 1]) -- revs->prune_data = get_pathspec(revs->prefix, argv + i + 1); -+ paths = argv + i + 1; - seen_dashdash = 1; - break; - } -@@ -1290,6 +1295,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch - if (seen_dashdash || *arg == '^') - die("bad revision '%s'", arg); - -+ if (revs->glob_paths) -+ die("--glob-paths without --"); -+ - /* If we didn't have a "--": - * (1) all filenames must exist; - * (2) all rev-args must not be interpretable -@@ -1301,10 +1309,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch - - revs->prune_data = get_pathspec(revs->prefix, - argv + i); -+ revs->glob_paths = 0; - break; - } - } - -+ /* Third, handle paths listed after -- */ -+ if (paths != NULL) { -+ if (revs->glob_paths) -+ revs->prune_data = paths; -+ else -+ revs->prune_data = get_pathspec(revs->prefix, paths); -+ } -+ - if (revs->def == NULL) - revs->def = def; - if (revs->show_merge) -@@ -1333,12 +1350,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch - revs->limited = 1; - - if (revs->prune_data) { -- diff_tree_setup_paths(revs->prune_data, &revs->pruning); -+ diff_tree_setup_paths(revs->prune_data, &revs->pruning, -+ revs->glob_paths); - /* Can't prune commits with rename following: the paths change.. */ - if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) - revs->prune = 1; - if (!revs->full_diff) -- diff_tree_setup_paths(revs->prune_data, &revs->diffopt); -+ diff_tree_setup_paths(revs->prune_data, &revs->diffopt, -+ revs->glob_paths); - } - if (revs->combine_merges) { - revs->ignore_merges = 0; -diff --git a/revision.h b/revision.h -index fa68c65..a68cdb8 100644 ---- a/revision.h -+++ b/revision.h -@@ -32,6 +32,9 @@ struct rev_info { - void *prune_data; - unsigned int early_output; - -+ /* whether prune_data contains fnmatch() patterns */ -+ unsigned int glob_paths:1; -+ - /* Traversal flags */ - unsigned int dense:1, - prune:1, -diff --git a/tree-diff.c b/tree-diff.c -index bbb126f..0aa1e9b 100644 ---- a/tree-diff.c -+++ b/tree-diff.c -@@ -82,6 +82,11 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const - return 0; - } - -+static int tree_entry_interesting_globbed(struct tree_desc *, const char *, -+ int, struct diff_options *); -+static int tree_entry_interesting_standard(struct tree_desc *, const char *, -+ int, struct diff_options *); -+ - /* - * Is a tree entry interesting given the pathspec we have? - * -@@ -91,7 +96,19 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const - * - zero for no - * - negative for "no, and no subsequent entries will be either" - */ --static int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt) -+static int tree_entry_interesting(struct tree_desc *desc, -+ const char *base, int baselen, struct diff_options *opt) -+{ -+ if (opt->glob_paths) -+ return tree_entry_interesting_globbed(desc, base, -+ baselen, opt); -+ else -+ return tree_entry_interesting_standard(desc, base, -+ baselen, opt); -+} -+ -+static int tree_entry_interesting_standard(struct tree_desc *desc, -+ const char *base, int baselen, struct diff_options *opt) - { - const char *path; - const unsigned char *sha1; -@@ -190,6 +207,41 @@ static int tree_entry_interesting(struct tree_desc *desc, const char *base, int - return never_interesting; /* No matches */ - } - -+static int tree_entry_interesting_globbed(struct tree_desc *desc, -+ const char *base, int baselen, struct diff_options *opt) -+{ -+ const char *path; -+ char *fullpath; -+ const unsigned char *sha1; -+ unsigned mode; -+ int i; -+ int pathlen; -+ int result; -+ -+ if (!opt->nr_paths) -+ return 1; -+ sha1 = tree_entry_extract(desc, &path, &mode); -+ if (S_ISDIR(mode)) -+ return 1; -+ pathlen = tree_entry_len(path, sha1); -+ -+ fullpath = xmalloc(pathlen + baselen + 1); -+ memcpy(fullpath, base, baselen); -+ memcpy(fullpath + baselen, path, pathlen + 1); -+ -+ result = 0; -+ for (i = 0; i < opt->nr_paths; i++) { -+ const char *match = opt->paths[i]; -+ if (!fnmatch(match, fullpath, 0)) { -+ result = 1; -+ break; -+ } -+ } -+ -+ free(fullpath); -+ return result; -+} -+ - /* A whole sub-tree went away or appeared */ - static void show_tree(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base, int baselen) - { -@@ -338,7 +390,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co - diff_opts.single_follow = opt->paths[0]; - diff_opts.break_opt = opt->break_opt; - paths[0] = NULL; -- diff_tree_setup_paths(paths, &diff_opts); -+ diff_tree_setup_paths(paths, &diff_opts, 0); - if (diff_setup_done(&diff_opts) < 0) - die("unable to set up diff options to follow renames"); - diff_tree(t1, t2, base, &diff_opts); -@@ -362,7 +414,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co - /* Update the path we use from now on.. */ - diff_tree_release_paths(opt); - opt->paths[0] = xstrdup(p->one->path); -- diff_tree_setup_paths(opt->paths, opt); -+ diff_tree_setup_paths(opt->paths, opt, 0); - break; - } - } -@@ -440,11 +492,13 @@ void diff_tree_release_paths(struct diff_options *opt) - free(opt->pathlens); - } - --void diff_tree_setup_paths(const char **p, struct diff_options *opt) -+void diff_tree_setup_paths(const char **p, struct diff_options *opt, -+ int glob_paths) - { - opt->nr_paths = 0; - opt->pathlens = NULL; - opt->paths = NULL; -+ opt->glob_paths = glob_paths; - - if (p) { - int i; diff --git a/pkgs/applications/version-management/monotone-viz/1.0.1.nix b/pkgs/applications/version-management/monotone-viz/1.0.1.nix deleted file mode 100644 index dc4816cee51..00000000000 --- a/pkgs/applications/version-management/monotone-viz/1.0.1.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; -rec { - src = fetchurl { - name = "monotone-viz-1.0.1-nolablgtk.tar.gz"; - urls = [ - http://ftp.debian.org/debian/pool/main/m/monotone-viz/monotone-viz_1.0.1.orig.tar.gz - #http://oandrieu.nerim.net/monotone-viz/monotone-viz-1.0.1-nolablgtk.tar.gz - ]; - sha256 = "066qwrknjk5hwk9jblnf0bzvbmfbabq0zhsxkd3nzk469zkpvhl2"; - }; - - buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib pkgconfig]; - configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"]; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "monotone-viz-" + version; - meta = { - description = "Monotone commit tree visualizer"; - }; -} - diff --git a/pkgs/applications/version-management/monotone-viz/graphviz.patch b/pkgs/applications/version-management/monotone-viz/graphviz.patch deleted file mode 100644 index e1f9bfc5f7f..00000000000 --- a/pkgs/applications/version-management/monotone-viz/graphviz.patch +++ /dev/null @@ -1,34 +0,0 @@ -# patch "agraph.ml" -# from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e] -# to [05aa88921481ac9bfe238daeb4374fbc9993caaa] -# -============================================================ ---- a/agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e -+++ b/agraph.ml 05aa88921481ac9bfe238daeb4374fbc9993caaa -@@ -50,8 +50,9 @@ let dot_format params agraph = - agraph.nodes in - - !+ "digraph \"monotone-viz\"\n{\n" ; -- if params.lr_layout then -- !+ " graph [rankdir=LR] ;\n" ; -+ if params.lr_layout -+ then !+ " graph [rankdir=LR] ;\n" -+ else !+ " graph [rankdir=BT] ;\n" ; - !+ " graph [ranksep=\"0.25\"] ;\n" ; - !+ " node [label=\"\"] ;\n" ; - -@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb = - let dot_prg = graph.layout_params.dot_program in - let cmd = - if Viz_misc.debug "dot" -- then [ "/bin/sh" ; "-c" ; -+ then [ "/bin/sh" ; "-c" ; - Printf.sprintf - "set -o pipefail ; \ -- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ] -- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in -+ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ] -+ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in - let error fmt = - Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in - try diff --git a/pkgs/applications/version-management/rcs/no-root.patch b/pkgs/applications/version-management/rcs/no-root.patch deleted file mode 100644 index 2fbfc86ff45..00000000000 --- a/pkgs/applications/version-management/rcs/no-root.patch +++ /dev/null @@ -1,23 +0,0 @@ -In NixOS chroot builds, there is no root account. So configure should -not rely on its existence in deciding whether to use getpwuid(). - -diff -rc -x '*~' rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh -*** rcs-5.7-orig/src/conf.sh 1995-06-16 08:19:24.000000000 +0200 ---- rcs-5.7/src/conf.sh 2010-02-12 15:22:37.000000000 +0100 -*************** -*** 821,827 **** - a= z= - cat >a.c <&2 ---- 821,827 ---- - a= z= - cat >a.c <&2 diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 50a5ae8f6c3..8e454ad9f8f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.5"; + version = "1.7.7"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "05c079762690d5ac1ccd2549742e7ef70fa45cf1"; + sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 395dda240b8..5a514e8728d 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.0.0.10822"; - name="veracity-2.0.0.10822"; - hash="0zgvrsjxfd1p9pflx1kxggmk953jhjk02h1hili9h1vdasvn2188"; - url="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-2.0.0.10822.tar.gz"; + version="2.1.0.10979"; + name="veracity-2.1.0.10979"; + hash="15x3cwwjv9b0cbjx6insqk190wpnhwcm1z4b570hvw3lix3xnxhl"; + url="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-2.1.0.10979.tar.gz"; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix new file mode 100644 index 00000000000..292010a3717 --- /dev/null +++ b/pkgs/applications/video/gpac/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchsvn, pkgconfig, zlib }: + +stdenv.mkDerivation rec { + name = "gpac-0.5.0-svn"; + + src = fetchsvn { + url = "https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"; + rev = "4253"; + sha256 = "0z4bd63c805q53hpb09gq0m0apy12z5a90zxx4jjx3ln64xq0pnn"; + }; + + # this is the bare minimum configuration, as I'm only interested in MP4Box + # For most other functionality, this should probably be extended + buildNativeInputs = [ pkgconfig zlib ]; + + meta = { + description = "Open Source multimedia framework for research and academic purposes"; + longDescription = '' + GPAC is an Open Source multimedia framework for research and academic purposes. + The project covers different aspects of multimedia, with a focus on presentation + technologies (graphics, animation and interactivity) and on multimedia packaging + formats such as MP4. + + GPAC provides three sets of tools based on a core library called libgpac: + + A multimedia player, called Osmo4 / MP4Client, + A multimedia packager, called MP4Box, + And some server tools included in MP4Box and MP42TS applications. + ''; + homepage = http://gpac.wp.mines-telecom.fr; + license = stdenv.lib.licenses.lgpl21; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 812826d7ec2..ca278884b70 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-5.6.0"; + name = "mkvtoolnix-5.8.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2"; - sha256 = "1hzwf4zaamny3qzmd6hyhy4hy9l67s3fjvznbi0avw0ad7g05i89"; + sha256 = "0q294zk5cpfh1s89n70d9b2fs14rlacdlnhchlsjmf1mq3jcg7iw"; }; buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch deleted file mode 100644 index b1cfd49f1ba..00000000000 --- a/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: tvtime-1.0.2/src/videoinput.c -=================================================================== ---- tvtime-1.0.2.orig/src/videoinput.c -+++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,8 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif --#include "videodev.h" --#include "videodev2.h" -+#include -+#include - #include "videoinput.h" - #include "mixer.h" - diff --git a/pkgs/applications/virtualization/qemu/0.11.0.nix b/pkgs/applications/virtualization/qemu/0.11.0.nix deleted file mode 100644 index bbcf1806452..00000000000 --- a/pkgs/applications/virtualization/qemu/0.11.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, SDL, zlib, which}: - -stdenv.mkDerivation { - name = "qemu-0.11.0"; - - src = fetchurl { - url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz; - sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw"; - }; - - patchFlags = "-p2"; - - buildInputs = [SDL zlib which]; - - meta = { - description = "QEmu processor emulator"; - }; -} diff --git a/pkgs/applications/virtualization/qemu/0.13.nix b/pkgs/applications/virtualization/qemu/0.13.nix deleted file mode 100644 index e1b63674969..00000000000 --- a/pkgs/applications/virtualization/qemu/0.13.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, SDL, zlib, which, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-0.13.0"; - - src = fetchurl { - url = "mirror://savannah/releases/qemu/${name}.tar.gz"; - sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy"; - }; - - buildInputs = [ SDL zlib which ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/svn-6642.nix b/pkgs/applications/virtualization/qemu/svn-6642.nix deleted file mode 100644 index 32d67234ba7..00000000000 --- a/pkgs/applications/virtualization/qemu/svn-6642.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchsvn, SDL, zlib, which}: - -stdenv.mkDerivation { - name = "qemu-svn-6642"; - - src = fetchsvn { - url = "svn://svn.sv.gnu.org/qemu/trunk"; - rev = "6642"; - sha256 = "12445ad91feb72eecd1db0d4319a8fa5d7dc971b89228bd0e121b49c5da9705e"; - }; - - patchFlags = "-p2"; - - buildInputs = [SDL zlib which]; - - meta = { - description = "QEmu processor emulator"; - }; -} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a8594c4ba16..01943908cdd 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - version = "4.2.2"; + version = "4.2.4"; forEachModule = action: '' for mod in \ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700"; + sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index c4c7a9f2708..219f8531787 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.2.2"; in +let version = "4.2.4"; in stdenv.mkDerivation { - name = "VirtualBox-GuestAdditions-${version}"; + name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1"; + sha256 = "3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix deleted file mode 100644 index 254393d4c7f..00000000000 --- a/pkgs/applications/window-managers/compiz/bcop.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxslt }: - -stdenv.mkDerivation rec { - name = "compiz-bcop-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; - sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; - }; - - buildInputs = [ pkgconfig libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Code generator for Compiz plugins"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix deleted file mode 100644 index 0406a170d19..00000000000 --- a/pkgs/applications/window-managers/compiz/ccsm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, intltool, gtk -, python, pygtk, pygobject, pycairo, compizconfig_python }: - -stdenv.mkDerivation rec { - name = "ccsm-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; - sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; - }; - - buildInputs = [ makeWrapper python intltool gtk ]; - - buildPhase = "python setup.py build --prefix=$out"; - - pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; - - installPhase = - '' - python setup.py install --prefix=$out - - wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ - "$(toPythonPath "$pythonDeps $out")" - ''; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz settings manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix deleted file mode 100644 index 4de7fb41a48..00000000000 --- a/pkgs/applications/window-managers/compiz/config-python.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib -, python, pyrex }: - -stdenv.mkDerivation rec { - name = "compizconfig-python-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; - sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; - }; - - buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; - - NIX_LDFLAGS = "-lcompizconfig"; - - meta = { - homepage = http://www.compiz.org/; - description = "Python interface to the Compiz configuration"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix deleted file mode 100644 index d4a5b79b7fb..00000000000 --- a/pkgs/applications/window-managers/compiz/core.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt -, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: - -let version = "0.8.6"; in - -stdenv.mkDerivation { - name = "compiz-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; - sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; - }; - - patches = - [ # Allow the path to the Compiz plugin library and metadata - # directories to be overriden through $COMPIZ_PLUGINDIR and - # $COMPIZ_METADATADIR, respectively. - ./plugindir-core.patch - - # Fix compilation with recent GTK versions. - ./gdk-deprecated.patch - ]; - - buildInputs = - [ intltool pkgconfig libpng glib - gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 - ]; - - propagatedBuildInputs = - [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender - xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama - libstartup_notification mesa libxml2 libxslt - ]; - - meta = { - homepage = http://www.compiz.org/; - description = "A compositing window manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix new file mode 100644 index 00000000000..ba9d9574366 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -0,0 +1,58 @@ +{stdenv, fetchurl, cmake, pkgconfig +, libXrender, renderproto, gtk, libwnck, pango, cairo +, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm +, libstartup_notification, libpthreadstubs, libxcb, intltool +, ORBit2, libXau +, dbus, dbus_glib, librsvg, mesa +, libXdmcp, libnotify, python +, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus +, xdg_utils +, gettext, boost, pyrex +, makeWrapper +}: +let + s = # Generated upstream information + rec { + baseName="compiz"; + version="0.9.8.6"; + name="compiz-0.9.8.6"; + hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; + sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + }; + buildInputs = [cmake pkgconfig + libXrender renderproto gtk libwnck pango cairo + GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification + libpthreadstubs libxcb intltool + ORBit2 libXau + dbus dbus_glib librsvg mesa + libXdmcp libnotify python + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus + xdg_utils + gettext boost pyrex + makeWrapper + ]; + in +stdenv.mkDerivation rec { + inherit (s) name version; + src = fetchurl { + inherit (s) url sha256; + }; + inherit buildInputs; + + NIX_CFLAGS_COMPILE=" -Wno-error "; + postInstall = '' + wrapProgram "$out/bin/ccsm" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + ''; + + meta = { + description = "Compoziting window manager"; + homepage = "http://launchpad.net/compiz/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + inherit (s) version; + }; +} diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream new file mode 100644 index 00000000000..b7fc98bd126 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.upstream @@ -0,0 +1 @@ +url https://launchpad.net/compiz/+download diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch deleted file mode 100644 index d80a5514ee9..00000000000 --- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 -@@ -31,10 +31,6 @@ - #include - #include - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- - #ifndef GTK_DISABLE_DEPRECATED - #define GTK_DISABLE_DEPRECATED - #endif diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix deleted file mode 100644 index 51d459e7a36..00000000000 --- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: - -stdenv.mkDerivation rec { - name = "libcompizconfig-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; - sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; - }; - - patches = - [ # See ./core.nix. - ./plugindir-libcompizconfig.patch - ]; - - buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz configuration library"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch deleted file mode 100644 index 5a242e66088..00000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-core.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c ---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 -@@ -146,7 +146,7 @@ - compAddMetadataFromFile (CompMetadata *metadata, - const char *file) - { -- char *home; -+ char *home, *metadatadir; - Bool status = FALSE; - - home = getenv ("HOME"); -@@ -163,7 +163,10 @@ - } - } - -- status |= addMetadataFromFilename (metadata, METADATADIR, file); -+ metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ status |= addMetadataFromFilename (metadata, metadatadir, file); - if (!status) - { - compLogMessage ("core", CompLogLevelWarn, -diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c ---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 -@@ -579,7 +579,10 @@ - } - } - -- status = (*loaderLoadPlugin) (p, PLUGINDIR, name); -+ plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ -+ status = (*loaderLoadPlugin) (p, plugindir, name); - if (status) - return p; - diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch deleted file mode 100644 index 207816a3c51..00000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp ---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 -+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 -@@ -3004,7 +3004,10 @@ - } - } - -- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ loadPluginFromXMLFile (context, xmlName, metadatadir); - free (xmlName); - } - -@@ -3031,7 +3034,10 @@ - free (homeplugins); - } - } -- loadPluginsFromXMLFiles (context, (char *)METADATADIR); -+ -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ loadPluginsFromXMLFiles (context, metadatadir); - - if (home && strlen (home)) - { -@@ -3043,7 +3049,10 @@ - free (homeplugins); - } - } -- loadPluginsFromName (context, (char *)PLUGINDIR); -+ -+ char *plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ loadPluginsFromName (context, plugindir); - } - - static void diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix deleted file mode 100644 index 8852ebd474e..00000000000 --- a/pkgs/applications/window-managers/compiz/plugins-extra.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-extra-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; - }; - - patches = - [ # Support scaling wallpapers to the maximum size while still - # respecting the aspect ratio. - ./wallpaper-maxpect.patch - ]; - - NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Extra plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix deleted file mode 100644 index ea1c01e7414..00000000000 --- a/pkgs/applications/window-managers/compiz/plugins-main.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-main-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; - }; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Main plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch deleted file mode 100644 index 8130dff1dba..00000000000 --- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in ---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 -+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 -@@ -24,7 +24,7 @@ - <_long>Image position. - int - 0 -- 4 -+ 5 - - 0 - <_name>Scale and Crop -@@ -45,6 +45,10 @@ - 4 - <_name>Center Tiled - -+ -+ 5 -+ <_name>Centered Maxpect -+ - -