Merge remote-tracking branch 'upstream/master'

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 ];
+  };
+}

pkgs/applications/editors/emacs-modes/nxml/builder.sh

@@ -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-*

pkgs/applications/editors/emacs-modes/nxml/default.nix

@@ -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";
-  };
-}

pkgs/applications/editors/gobby/default.nix

@@ -9,10 +9,10 @@ let
   
 in stdenv.mkDerivation rec {
 
-  name = "gobby-0.4.93";
+  name = "gobby-0.4.94";
   src = fetchurl {
     url = "http://releases.0x539.de/gobby/${name}.tar.gz";
-    sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4";
+    sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00";
   };
 
   buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]

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/;

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;
+    url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz";
-    sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
+    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 ];
   };
 }

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;
+  };
+}

pkgs/applications/graphics/sane/backends.nix

@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }:
-, pkgconfig ? null
+
-, gt68xxFirmware ? null }:
-let
-  firmware = gt68xxFirmware {inherit fetchurl;};
-in
 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;
+  };
 }

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;
+  };
+}

pkgs/applications/graphics/sane/xsane.nix

@@ -1,10 +1,10 @@
-{stdenv, fetchurl, saneBackends, saneFrontends,
+{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }:
-	libX11, gtk, pkgconfig, libpng, libusb ? null}:
+
-stdenv.mkDerivation {
+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;
   };
 }

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 ];

pkgs/applications/misc/st/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libX11, ncurses}:
+{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }:
 
 stdenv.mkDerivation rec {
-  name = "st-0.2.1";
+  name = "st-0.3";
   
   src = fetchurl {
-    url = http://hg.suckless.org/st/archive/0.2.1.tar.gz;
+    url = http://hg.suckless.org/st/archive/0.3.tar.gz;
-    sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab";
+    sha256 = "12ypldjjpsq3nvhszgjsk4wgqkwcvz06qiqw8k5npv3rd1nbx9cl";
   };
   
-  buildInputs = [ libX11 ncurses ];
+  buildInputs = [ libX11 ncurses libXext libXft ];
 
   installPhase = ''
     TERMINFO=$out/share/terminfo make install PREFIX=$out

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 ];

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

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 ];

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 ];

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 ];

pkgs/applications/networking/browsers/firefox/17.0.nix

@@ -15,18 +15,24 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "15.0.1";
+  firefoxVersion = "17.0";
 
-  xulVersion = "15.0.1"; # this attribute is used by other packages
+  xulVersion = "17.0"; # 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";
+    urls = [
-    sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641";
+        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
+        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+        # 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 = "4f5f175c1662d67f70e78403607d8eda600efd8b";
   };
 
   commonConfigureFlags =
     [ "--enable-optimize"
+      #"--enable-profiling"
       "--disable-debug"
       "--enable-strip"
       "--with-system-jpeg"
@@ -64,7 +70,7 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
-    enableParallelBuilding = true;
+    enableParallelBuilding = false;
 
     preConfigure =
       ''
@@ -88,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
@@ -150,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
       ''; # */
 

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;
+    url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2";
-    sha256 = "2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1";
+    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}";
 }

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 ];

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";
 

pkgs/applications/office/hledger-interest/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
-  version = "1.4.1";
+  version = "1.4.2";
-  sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8";
+  sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal hledgerLib mtl time ];

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;

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

pkgs/applications/version-management/git-and-tools/default.nix

@@ -44,12 +44,12 @@ 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
       transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
-      SafeSemaphore networkPprotocolXmpp async dns;
+      SafeSemaphore networkPprotocolXmpp async dns DAV;
   };
 
   qgit = import ./qgit {

pkgs/applications/version-management/git-and-tools/git-annex/default.nix

@@ -8,18 +8,18 @@
 , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
 , transformers, transformersBase, utf8String, wai, waiLogger, warp
 , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
-, networkPprotocolXmpp, async, dns
+, networkPprotocolXmpp, async, dns, DAV
 }:
 
 let
-  version = "3.20121112";
+  version = "3.20121112-161-gb27d9eb";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
-    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
+    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz";
-    sha256 = "1ch91jvzm3di5p024kwx0ikgf588lk7bp36hlgj4ar9aa2fdl7yr";
+    sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a";
     name = "git-annex-${version}.tar.gz";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
     transformers transformersBase utf8String wai waiLogger warp yesod
     yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
-    async dns ];
+    async dns DAV ];
 
   checkTarget = "test";
   doCheck = true;

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 ]

pkgs/applications/window-managers/compiz/bcop.nix

@@ -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";
-  };
-}

pkgs/applications/window-managers/compiz/ccsm.nix

@@ -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;
-  };
-}

pkgs/applications/window-managers/compiz/config-python.nix

@@ -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";
-  };
-}

pkgs/applications/window-managers/compiz/core.nix

@@ -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;
-  };
-}

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;
+  };
+}

pkgs/applications/window-managers/compiz/default.upstream

@@ -0,0 +1 @@
+url https://launchpad.net/compiz/+download

pkgs/applications/window-managers/compiz/gdk-deprecated.patch

@@ -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 <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
- 
--#ifndef GDK_DISABLE_DEPRECATED
--#define GDK_DISABLE_DEPRECATED
--#endif
--
- #ifndef GTK_DISABLE_DEPRECATED
- #define GTK_DISABLE_DEPRECATED
- #endif

pkgs/applications/window-managers/compiz/libcompizconfig.nix

@@ -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";
-  };
-}

pkgs/applications/window-managers/compiz/plugindir-core.patch

@@ -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;
- 

pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch

@@ -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

pkgs/applications/window-managers/compiz/plugins-extra.nix

@@ -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;
-  };
-}

pkgs/applications/window-managers/compiz/plugins-main.nix

@@ -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;
-  };
-}

pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch

@@ -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.</_long>
- 					<type>int</type>
- 					<min>0</min>
--					<max>4</max>
-+					<max>5</max>
- 					<desc>
- 						<value>0</value>
- 						<_name>Scale and Crop</_name>
-@@ -45,6 +45,10 @@
- 						<value>4</value>
- 						<_name>Center Tiled</_name>
- 					</desc>
-+					<desc>
-+						<value>5</value>
-+						<_name>Centered Maxpect</_name>
-+					</desc>
- 				</option>
- 				<option name="bg_fill_type" type="list">
- 					<_short>Fill type</_short>
-diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c
---- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c	2010-03-29 16:09:18.000000000 +0200
-+++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c	2010-10-21 01:09:10.000000000 +0200
-@@ -697,12 +697,12 @@
- 	    tmpMatrix = back->imgTex.matrix;
- 
- 
--	    if (back->imagePos == BgImagePosScaleAndCrop)
-+	    if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect))
- 	    {
- 		s1 = (float) s->width / back->width;
- 		s2 = (float) s->height / back->height;
- 		
--		s1 = MAX (s1, s2);
-+		s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2);
- 
- 		tmpMatrix.xx /= s1;
- 		tmpMatrix.yy /= s1;
-@@ -711,6 +711,16 @@
- 		tmpMatrix.x0 -= x * tmpMatrix.xx;
- 		y = (s->height - ((int)back->height * s1)) / 2.0;
- 		tmpMatrix.y0 -= y * tmpMatrix.yy;
-+
-+                if (back->imagePos == BgImagePosCenteredMaxpect)
-+                {
-+                    reg = &tmpRegion;
-+		
-+                    tmpRegion.extents.x1 = MAX (0, x);
-+                    tmpRegion.extents.y1 = MAX (0, y);
-+                    tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1));
-+                    tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1));
-+                }
- 	    }
- 	    else if (back->imagePos == BgImagePosScaled)
- 	    {

pkgs/build-support/upstream-updater/update-walker.sh

@@ -3,6 +3,7 @@
 own_dir="$(cd "$(dirname "$0")"; pwd)"
 
 CURRENT_URL=
+NEED_TO_CHOOSE_URL=1
 
 url () {
   CURRENT_URL="$1"
@@ -45,12 +46,14 @@ matching_links () {
 
 link () {
   CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")"
+  unset NEED_TO_CHOOSE_URL
   echo "Linked by: $*"
   echo "URL: $CURRENT_URL" >&2
 }
 
 version_link () {
   CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")"
+  unset NEED_TO_CHOOSE_URL
   echo "Linked version by: $*"
   echo "URL: $CURRENT_URL" >&2
 }
@@ -86,6 +89,23 @@ ensure_target () {
   [ -z "$CURRENT_TARGET" ] && target default.nix
 }
 
+ensure_name () {
+  [ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")"
+  echo "Resulting name: $CURRENT_NAME"
+}
+
+ensure_choice () {
+  [ -n "NEED_TO_CHOOSE_URL" ] && {
+    version_link '[.]tar[.]([^./])+$'
+    unset NEED_TO_CHOOSE_URL
+  }
+  [ -z "$CURRENT_URL" ] && {
+    echo "Error: empty CURRENT_URL"
+    echo "Error: empty CURRENT_URL" >&2
+    exit 1
+  }
+}
+
 hash () {
   CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")"
 }
@@ -183,9 +203,11 @@ do_overwrite () {
 
 process_config () {
   CONFIG_DIR="$(directory_of "$1")"
-  source "$CONFIG_DIR/$(basename "$1")"
   BEGIN_EXPRESSION='# Generated upstream information';
+  source "$CONFIG_DIR/$(basename "$1")"
+  ensure_name
   retrieve_version
+  ensure_choice
   ensure_version
   ensure_target
   update_found && do_overwrite "$CURRENT_TARGET"

pkgs/development/compilers/jdk/jdk6-construct.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 # construct.sh
 # example construction of JRE and JDK directories from the DLJ bundles
-# 
+#
 # Copyright © 2006 Sun Microsystems, Inc.
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -11,10 +11,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -22,7 +22,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
+#
 # Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot,
 # and JVM  trademarks or registered trademarks of Sun Microsystems,
 # Inc. in the U.S. and other countries.
@@ -43,13 +43,13 @@ getargs() {
     exit 2
   fi
   # make sure javahome is the JDK
-  javahome=`echo $undir/*/demo`
+  javahome=`echo $undir/*/db/demo`
   if [ ! -d $javahome ]; then
     echo "${program}: unbundle directory incorrect: $undir"
     echo "  expecting $undir/jdk1.5.0_xx"
     exit 2
   else
-    javahome=`dirname $javahome`
+    javahome=$(dirname $(dirname $javahome))
   fi
   # verify JDK dir
   jdkdirp=`dirname $jdkdir`
@@ -106,7 +106,7 @@ linkrel() {
   if [ $m -lt $c ]; then
     (( c = m ))
   fi
-  for (( i = 0 ; i < c ; i++ )); do 
+  for (( i = 0 ; i < c ; i++ )); do
     if [ ${targetb[$i]} != ${linkb[$i]} ]; then
       # echo components differ, stopping
       break

pkgs/development/compilers/jdk/jdk6-linux.nix

@@ -28,18 +28,18 @@ in
 
 stdenv.mkDerivation {
   name =
-    if installjdk then "jdk-1.6.0_32b03" else "jre-1.6.0_32b03";
+    if installjdk then "jdk-1.6.0_38b04" else "jre-1.6.0_38b04";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-i586-29_feb_2012.bin;
+        url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-i586-31_oct_2012.bin;
-        md5 = "7c009afa399476c7d2791386235b8e3b";
+        md5 = "0595473ad371981c7faa709798a5f78e";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-amd64-29_feb_2012.bin;
+        url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-amd64-31_oct_2012.bin;
-        md5 = "7f1a45531a04c372e5660a55c2dfdad8";
+        md5 = "b98c80a963915de32b1abe02c50385de";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";

pkgs/development/compilers/julia/default.nix

@@ -1,13 +1,14 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
  , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , tcl, tk
  } :
 let
   realGcc = stdenv.gcc.gcc;
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20121106";
+  date = "20121122";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1.1";
@@ -54,8 +55,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "8f4d073881beb42c9f272b9327efa0a5715bd31c";
+    rev = "51076ef4c1b269de738b6185865b389601627eb7";
-    sha256 = "2df2ba800bd4fd9b0297a0b8cff53174a7c05ffbc889a7df5830a014fed8c433";
+    sha256 = "1hbhxdiymkv0pd4dhr9wbvh1566ivfffhmafsjh8jcwh2f9fz90b";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
@@ -84,17 +85,19 @@ stdenv.mkDerivation rec {
 
     sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
 
-    export LDFLAGS="-L${suitesparse}/lib"
+    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
     export GLPK_PREFIX="${glpk}/include"
 
     mkdir -p "$out/lib"
     sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
     sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
-    
+
     export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}"
 
     export dontPatchELF=1
+
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
   '';
 
   preBuild = ''
@@ -104,14 +107,11 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
    ld -E --whole-archive --shared ${suitesparse}/lib/lib*[a-z].a -o "$out"/lib/libsuitesparse-shared.so
-   for i in umfpack cholmod amd camd colamd ; do
+   for i in umfpack cholmod amd camd colamd btf cxsparse ldl rbio spqr suitesparseconfig; do
      ln -s "libsuitesparse-shared.so" "$out/lib/lib$i.so"
    done
    ln -s "${lighttpd}/sbin/lighttpd" "$out/sbin/"
    ln -s "${lighttpd}/lib/"* "$out/lib/"
-
-   cp -r test examples "$out/lib/julia"
-   ls -R > "$out/ls-R"
   '';
 
   meta = {

pkgs/development/libraries/boost/1.52-headers.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost
+    tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost
   '';
 
   meta = {

pkgs/development/libraries/haskell/DAV/default.nix

@@ -0,0 +1,22 @@
+{ cabal, caseInsensitive, cmdargs, httpConduit, httpTypes, lens
+, liftedBase, mtl, network, resourcet, transformers, xmlConduit
+, xmlHamlet
+}:
+
+cabal.mkDerivation (self: {
+  pname = "DAV";
+  version = "0.2";
+  sha256 = "0g9b72ia4h85ykbng6103wc8f218fj9fdvm1896yx999vr95kxw4";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl
+    network resourcet transformers xmlConduit xmlHamlet
+  ];
+  meta = {
+    homepage = "http://floss.scru.org/hDAV";
+    description = "RFC 4918 WebDAV support";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/SHA/default.nix

@@ -1,16 +1,12 @@
-{ cabal, binary, QuickCheck, testFramework
+{ cabal, binary }:
-, testFrameworkQuickcheck2
-}:
 
 cabal.mkDerivation (self: {
   pname = "SHA";
-  version = "1.6.0";
+  version = "1.6.1";
-  sha256 = "0i5x2irk08yr4p428wyqvdysz22jqc3q5qn08wc38pw2xhmc0zzk";
+  sha256 = "1v3a2skkbr64y7x1aqpq1qz03isc42l9hd1viqcsv4qlld595fgx";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [
+  buildDepends = [ binary ];
-    binary QuickCheck testFramework testFrameworkQuickcheck2
-  ];
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/binary/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "binary";
-  version = "0.6.2.0";
+  version = "0.6.4.0";
-  sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab";
+  sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh";
   meta = {
     homepage = "https://github.com/kolmodin/binary";
     description = "Binary serialisation for Haskell values using lazy ByteStrings";

pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.5.0.2";
+  version = "0.5.0.3";
-  sha256 = "0ynkz822zxp1m02fp9l572d8j8xi5r9j1bg6zs2671m81h22d4in";
+  sha256 = "0dbymh29zg0bvhlmai5s6qiqypx46hmlg375jpcq1597vzaanwnw";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

pkgs/development/libraries/haskell/blaze-html/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.5.1.0";
+  version = "0.5.1.1";
-  sha256 = "1f256z68pbm1h6wsk33p94byxwfp01i4pbdrch32jdi1q35cmqxh";
+  sha256 = "1z1lnfph4spy9vx2nfhbykkfcdnw14fars5aydrgi70spaq5ial2";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

pkgs/development/libraries/haskell/blaze-markup/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-markup";
-  version = "0.5.1.1";
+  version = "0.5.1.2";
-  sha256 = "14va7db8icf2xj7v4i5z0srgv74pf8z6w7046lxs3cyj5pcjl2r9";
+  sha256 = "1iqwcmb35793drkvnxx8z3zkyyzd6b84x9b8cp2aza2n0qw7sihm";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

pkgs/development/libraries/haskell/bytestring-nums/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-nums";
-  version = "0.3.5";
+  version = "0.3.6";
-  sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
+  sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
   isLibrary = true;
   isExecutable = true;
   meta = {

pkgs/development/libraries/haskell/comonads-fd/default.nix

@@ -0,0 +1,18 @@
+{ cabal, comonad, comonadTransformers, mtl, semigroups
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "comonads-fd";
+  version = "3.0";
+  sha256 = "1j5ymj711c49fsk2ilxfpzqr0jr117z8kb5ggyh5nlwjy16m32in";
+  buildDepends = [
+    comonad comonadTransformers mtl semigroups transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonads-fd/";
+    description = "Comonad transformers using functional dependencies";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/crypto-conduit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.4.0.1";
+  version = "0.4.1";
-  sha256 = "1afkn9kp5y1qsgd2l2q85d2bh0wbvn07x0ddi72sr8g7daw8zrs8";
+  sha256 = "1gdznwcq3fb9ls68lgpwna6k1k612j241c8441z7r2kx3a64dqwv";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";

pkgs/development/libraries/haskell/cryptohash/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.8";
+  version = "0.7.9";
-  sha256 = "0n9m5gl3hfkx0p0mg05k7317vjqqx5aynandg428pcgcjkpbfv9g";
+  sha256 = "1prbc65klr93mvqj4hass5yyxv353fral70mj379jrf4m93429hz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];

pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process-simplelocalnet";
-  version = "0.2.0.7";
+  version = "0.2.0.8";
-  sha256 = "0jxbxacvdg4pf65s6r48nck45g8dfsarks3m2pdn73gjn4cd81c7";
+  sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/distributed-process/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process";
-  version = "0.4.0.2";
+  version = "0.4.1";
-  sha256 = "0wjxai5z6m84blrgic1pd0jgivqcc8ymjya3m0dhqbmsljwh6ynw";
+  sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/distributed-static/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-static";
-  version = "0.2.1";
+  version = "0.2.1.1";
-  sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc";
+  sha256 = "08y9554x6avjwdmbf33fw1pw1wl8qmgfngmgb6vgad88krnixq1h";
   buildDepends = [ binary rank1dynamic ];
   meta = {
     homepage = "http://www.github.com/haskell-distributed/distributed-process";

pkgs/development/libraries/haskell/editline/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "editline";
-  version = "0.2.1.0";
+  version = "0.2.1.1";
-  sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1";
+  sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
   extraLibraries = [ libedit ];
   meta = {
     homepage = "http://code.haskell.org/editline";

pkgs/development/libraries/haskell/email-validate/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "email-validate";
-  version = "0.2.8";
+  version = "0.3.2";
-  sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd";
+  sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq";
   buildDepends = [ parsec ranges ];
   meta = {
     homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";

pkgs/development/libraries/haskell/graphviz/default.nix

@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     colour dlist fgl filepath polyparse text transformers wlPprintText
   ];
+  patchPhase = "sed -i -e 's|bytestring.*,|bytestring,|' graphviz.cabal";
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";
     description = "Bindings to Graphviz for graph visualisation";

pkgs/development/libraries/haskell/hledger-lib/default.nix

@@ -1,14 +1,14 @@
 { cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe
-, shakespeareText, split, time, transformers, utf8String
+, split, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.19.1";
+  version = "0.19.3";
-  sha256 = "19ccbf9g1garwg56ig4qckz1zky89g1z71nwfbwi4v57bjw53ab4";
+  sha256 = "1wn72ycy1hvcn2ikaplq446hggpkbabyj1d8201vajwn862waxra";
   buildDepends = [
-    cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
+    cmdargs csv filepath HUnit mtl parsec regexpr safe split time
-    split time transformers utf8String
+    transformers utf8String
   ];
   meta = {
     homepage = "http://hledger.org";

pkgs/development/libraries/haskell/hledger-web/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.19";
+  version = "0.19.3";
-  sha256 = "0p820pwx4javzfvzhz02930adx6w7246hdk802wz1g4937rlq8p3";
+  sha256 = "1kx5mn6drm90clz132vrd2lkssm73hlwvxb9cxg6z82i5qa9jqn9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/hledger/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.19.1";
+  version = "0.19.3";
-  sha256 = "0ad7wmcpwi7a9nag4j27rhffhai6a5zgzaafss7sfr7yia00cpgg";
+  sha256 = "1kxkv2dwl5ir2vqvbi1ppbwns8mw1lkg5lkfdkdwwbjj7dq0ysr6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/http-conduit/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.8.4";
+  version = "1.8.4.3";
-  sha256 = "1gs4ac5qhrx8xdz4zbhwalkycspl28lkk23m16pdpf2gkmbhh58a";
+  sha256 = "1g8cpi2mmsrdfh54ik4xlxnf1sf1r1bhnvp5b0rvhbwphcr4z93r";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie

pkgs/development/libraries/haskell/http-date/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-date";
-  version = "0.0.2";
+  version = "0.0.3";
-  sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj";
+  sha256 = "12iylfzz1d0v0gl4cf31dxcmlg0x7bq5f7acacy2pb0ilrxmzsnn";
   buildDepends = [ attoparsec ];
   meta = {
     description = "HTTP Date parser/formatter";

pkgs/development/libraries/haskell/http-reverse-proxy/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.0.5";
+  version = "0.1.0.6";
-  sha256 = "1x1m9vklgg6x8niry8c5fxcjpmsmrpxv7j2i5h38hp1hbka3mpr0";
+  sha256 = "0ybhzyim8b2k1kv5bz0qbignj5lwf8pbpqmrp1vrvyz8a2iy71c8";
   buildDepends = [
     blazeBuilder caseInsensitive classyPreludeConduit conduit
     httpConduit httpTypes liftedBase monadControl network

pkgs/development/libraries/haskell/lens/default.nix

@@ -0,0 +1,21 @@
+{ cabal, comonad, comonadsFd, comonadTransformers, filepath
+, hashable, mtl, parallel, semigroups, split, text, transformers
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens";
+  version = "3.6";
+  sha256 = "1zl52hj0ccx21qwlqrscfjmc7i0g2prikmd3lgbfbgjqlh7wnqdq";
+  buildDepends = [
+    comonad comonadsFd comonadTransformers filepath hashable mtl
+    parallel semigroups split text transformers unorderedContainers
+    vector
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/lens/";
+    description = "Lenses, Folds and Traversals";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/liblastfm/default.nix

@@ -1,15 +1,14 @@
-{ cabal, aeson, curl, mtl, pureMD5, urlencoded, utf8String, xml }:
+{ cabal, aeson, attoparsec, curl, mtl, pureMD5, urlencoded
+, utf8String, xml
+}:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.0.3.6";
+  version = "0.0.3.8";
-  sha256 = "0xmrciv489dvksgpg9g83kna34x1amsx45wvpngcpnx4m44fcp4w";
+  sha256 = "0icx86x3w85z0pqdxcch583j6jk5id5aw9gf24266mgfg5k6iwdy";
   buildDepends = [
-    aeson curl mtl pureMD5 urlencoded utf8String xml
+    aeson attoparsec curl mtl pureMD5 urlencoded utf8String xml
   ];
-  patchPhase = ''
-    sed -i -e 's|curl == .*,|curl,|' -e 's|urlencoded .*,|urlencoded,|' liblastfm.cabal
-  '';
   meta = {
     description = "Wrapper to Lastfm API";
     license = self.stdenv.lib.licenses.mit;

pkgs/development/libraries/haskell/monad-peel/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-peel";
-  version = "0.1";
+  version = "0.1.1";
-  sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys";
+  sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l";
   buildDepends = [ extensibleExceptions transformers ];
   meta = {
     homepage = "http://andersk.mit.edu/haskell/monad-peel/";

pkgs/development/libraries/haskell/network-transport/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-transport";
-  version = "0.3.0";
+  version = "0.3.0.1";
-  sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm";
+  sha256 = "1iijcd864znik83smk1bjidinm199wri5fdyrhnffj0n35knrvas";
   buildDepends = [ binary transformers ];
   meta = {
     homepage = "http://github.com/haskell-distributed/distributed-process";

pkgs/development/libraries/haskell/optparse-applicative/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.4.1";
+  version = "0.4.2";
-  sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38";
+  sha256 = "0hxl4hhh24hz1fc23mbsx83ccnv2fkxbar37d9c5cmiaalsrfb19";
   buildDepends = [ transformers ];
   meta = {
     homepage = "https://github.com/pcapriotti/optparse-applicative";

pkgs/development/libraries/haskell/persistent-postgresql/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.0.0";
+  version = "1.0.2";
-  sha256 = "149vv6wd0a85gphwrqcyd66ivdzyy7yc37c99ngq7377fdnszzhn";
+  sha256 = "1ry9g382ihd4b3y1sqng06k5pmj0vh00dzf4abdaph26xnncp7s6";
   buildDepends = [
     aeson conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers

pkgs/development/libraries/haskell/persistent-sqlite/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.0.0";
+  version = "1.0.1";
-  sha256 = "0ak9x6w9566mjc0ggsqxr69x4w5w7igdxkq6wwm6ysy5cvs8fwc8";
+  sha256 = "1qvyxvmy37iy3q0frmy3zcklhms2rpjplw0fhk37cmgmw0bj2b7m";
   buildDepends = [
     aeson conduit monadControl persistent text transformers
   ];

pkgs/development/libraries/haskell/persistent/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.0.1.3";
+  version = "1.0.2.2";
-  sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
+  sha256 = "0sas9jv00c01sx593applajcfjdjz24yrncx001kj6mfm7pmm86n";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit

pkgs/development/libraries/haskell/rank1dynamic/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rank1dynamic";
-  version = "0.1.0.1";
+  version = "0.1.0.2";
-  sha256 = "18rlih5bndlm5v4nnv8g2rgvab5n22vd8mcjd0m4wq8fmqkb3x9d";
+  sha256 = "1341hhbdm6y0mj0qjda0ckqsla51fxiy1yfpbwfvsmpi2bkzgxn6";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://github.com/haskell-distributed/distributed-process";

pkgs/development/libraries/haskell/resourcet/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.3";
+  version = "0.4.4";
-  sha256 = "0j3sr4xl30nszy79akzzn8aws40bmhd2dyw8ispirnx004i6ay3b";
+  sha256 = "0ad1hl7bl9qid4brchb95gvnylfchmxncgdvgljb5lci7gy9r31z";
   buildDepends = [
     liftedBase monadControl mtl transformers transformersBase
   ];

pkgs/development/libraries/haskell/skein/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.9";
+  version = "0.1.0.10";
-  sha256 = "06hx064cpfcd397rmrmfbm7ph38pnxcsn6wij8fcfsx9wq5yq1k1";
+  sha256 = "0qyiy2yx4qmazz744hyq51v2as51zd9r623bhhk21yzsgh7rl9kc";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     homepage = "https://github.com/meteficha/skein";

pkgs/development/libraries/haskell/testpack/default.nix

@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "2.1.2";
   sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif";
   buildDepends = [ HUnit mtl QuickCheck random ];
+  patches = [ ./support-recent-quickcheck.patch ];
   meta = {
     homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
     description = "Test Utililty Pack for HUnit and QuickCheck";

pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch

@@ -0,0 +1,22 @@
+diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
+index 01fac30..0de5526 100644
+--- a/src/Test/HUnit/Tools.hs
++++ b/src/Test/HUnit/Tools.hs
+@@ -128,7 +128,7 @@ Often used like this:
+ >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
+ -}
+ qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
+-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
++qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest})
+ 
+ {- | Run verbose tests.  Example:
+ 
+@@ -174,7 +174,7 @@ localquickCheckWithResult args p =
+               Just (rnd,_) -> return rnd
+      test MkState{ terminal          = tm
+                  , maxSuccessTests   = maxSuccess args
+-                 , maxDiscardedTests = maxDiscard args
++                 , maxDiscardedTests = 20000
+                  , computeSize       = case replay args of
+                                          Nothing    -> \n d -> (n * maxSize args)
+                                                          `div` maxSuccess args

pkgs/development/libraries/haskell/time/1.1.3.nix

@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.1.3";
-  sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})

pkgs/development/libraries/haskell/time/1.2.0.3.nix

@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.2.0.3";
-  sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})

pkgs/development/libraries/haskell/time/1.2.0.5.nix

@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.2.0.5";
-  sha256 = "0y4plv9qvpmzzzb5855zngm6lmd38m0vr2mzwm94xhz2xsqhdh2z";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})

pkgs/development/libraries/haskell/time/1.4.0.2.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4.0.1";
+  version = "1.4.0.2";
-  sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws";
+  sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8";
   buildDepends = [ deepseq ];
   meta = {
     homepage = "http://semantic.org/TimeLib/";

pkgs/development/libraries/haskell/type-equality/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "type-equality";
-  version = "0.1.0.2";
+  version = "0.1.1";
-  sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q";
+  sha256 = "0sgb7aki0ns3547y3abv1xh9rlmwhjm1c370pf3jjssysayh2wzv";
   meta = {
     homepage = "http://github.com/hesselink/type-equality/";
     description = "Type equality, coercion/cast and other operations";

pkgs/development/libraries/haskell/warp/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.4.4";
+  version = "1.3.5";
-  sha256 = "0i6mjadw87f9c949wg9lcbld0yfvnrxn7bhapf71gk36sh7llxaj";
+  sha256 = "0hxipvdp0nwziijzmcnf0kdb3cz1m2w6xwszq2zqpjb7fvcy2acl";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile

pkgs/development/libraries/haskell/xml-hamlet/default.nix

@@ -0,0 +1,14 @@
+{ cabal, parsec, shakespeare, text, xmlConduit }:
+
+cabal.mkDerivation (self: {
+  pname = "xml-hamlet";
+  version = "0.4.0.3";
+  sha256 = "1923c2jg162jab01mcbpy52xs1pzxkrgny6sq8v0p758n8hjazwc";
+  buildDepends = [ parsec shakespeare text xmlConduit ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Hamlet-style quasiquoter for XML content";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/yesod-auth/default.nix

@@ -1,19 +1,20 @@
 { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet
-, httpConduit, liftedBase, mimeMail, persistent, persistentTemplate
+, httpConduit, liftedBase, mimeMail, network, persistent
-, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
+, persistentTemplate, pureMD5, pwstoreFast, random, SHA
-, transformers, unorderedContainers, wai, yesodCore, yesodForm
+, shakespeareCss, shakespeareJs, text, transformers
-, yesodJson, yesodPersistent
+, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
+, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.1.1.6";
+  version = "1.1.1.7";
-  sha256 = "0xbr8q7rv73hsh90pdb5cl00pd4mx3q74q0dqampha0y2lpq6124";
+  sha256 = "09d999sqsm6v59l9q2gh09ar2vl601csr6w8mkcmgax5bdb26waz";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
-    liftedBase mimeMail persistent persistentTemplate pureMD5
+    liftedBase mimeMail network persistent persistentTemplate pureMD5
-    pwstoreFast random SHA shakespeareCss text transformers
+    pwstoreFast random SHA shakespeareCss shakespeareJs text
-    unorderedContainers wai yesodCore yesodForm yesodJson
+    transformers unorderedContainers wai yesodCore yesodForm yesodJson
     yesodPersistent
   ];
   meta = {

pkgs/development/libraries/haskell/yesod-core/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.1.5";
+  version = "1.1.6";
-  sha256 = "1mnmszka6fy5gps1y4bwpn0aq5vzxdxqyh2vrl7vii1lfl51yly7";
+  sha256 = "1y7bw0wzi52mnvs0zf93q8aiq87mnn2j4f2ry4y2f859xfdzbvsi";
   buildDepends = [
     aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
     clientsession conduit cookie failure fastLogger hamlet httpTypes

pkgs/development/libraries/haskell/yesod-form/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.2.0";
+  version = "1.2.0.1";
-  sha256 = "1p5c75dcbhcc90chwzhsk5sk86x3i2ipz6krrqrkx0zx7ykbf94m";
+  sha256 = "13zfai1r8wvs2gxh6adp5pcnrk0480fx7kp8gwarv68x4hmf0jph";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent shakespeareCss

pkgs/development/libraries/haskell/zlib-conduit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.5.0.2";
+  version = "0.5.0.3";
-  sha256 = "1jgj3x4z1901bm1618753hqyrjragzrpyhy9h02qj9kplqswh878";
+  sha256 = "05rlbyxcwq952psbfp94irmygabqxyf1kkm80pwdanlaaky03nsb";
   buildDepends = [ conduit transformers void zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

pkgs/development/libraries/libinfinity/default.nix

@@ -3,7 +3,7 @@
 , documentation ? false # build documentation
 , avahiSupport ? false # build support for Avahi in libinfinity
 , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
-, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null }:
+, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }:
 
 let
   edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
@@ -11,13 +11,13 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "libinfinity-0.4.1";
+  name = "libinfinity-0.5.3";
   src = fetchurl {
     url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
-    sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6";
+    sha256 = "04qa3ky2skhc9b5f9i9sc8hci3ykklqznmgy616yzs3n22bmax9j";
   };
 
-  buildInputs = [ pkgconfig glib libxml2 gsasl ]
+  buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]
     ++ optional gtkWidgets gtk
     ++ optional documentation gtkdoc
     ++ optional avahiSupport avahi

pkgs/development/libraries/libshout/default.nix

@@ -0,0 +1,30 @@
+{stdenv, fetchurl, pkgconfig 
+, libvorbis, libtheora, speex}:
+
+# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
+
+stdenv.mkDerivation rec {
+	name = "libshout-2.3.1";
+
+	src = fetchurl {
+		url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
+		sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e";
+	};
+
+  buildInputs = [ libvorbis libtheora speex pkgconfig ];
+
+  meta = {
+    description = "icecast 'c' language bindings";
+
+    longDescription = ''
+      Libshout is a library for communicating with and sending data to an icecast
+      server.  It handles the socket connection, the timing of the data, and prevents
+      bad data from getting to the icecast server.
+    '';
+
+    homepage = http://www.icecast.org;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ 
+  };
+}

pkgs/development/libraries/nspr/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.9.3"; in
+let version = "4.9.4"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1igkfb7dm3fd59swa5m961rgc53z98l3jadk42c4yy76b85z78ww";
+    sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l";
   };
 
   preConfigure = "cd mozilla/nsprpub";

pkgs/development/tools/analysis/valgrind/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation (rec {
-  name = "valgrind-3.8.0";
+  name = "valgrind-3.8.1";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px";
+    sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7";
   };
 
   # Perl is needed for `cg_annotate'.

pkgs/development/tools/misc/intltool/default.nix

@@ -0,0 +1,30 @@
+{stdenv, fetchurl, perl, perlXMLParser}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="intltool";
+    version="0.50.2";
+    name="intltool-0.50.2";
+    hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
+    url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz";
+    sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
+  };
+  propagatedBuildInputs = [perl perlXMLParser];
+  buildInputs = [];
+  in
+stdenv.mkDerivation rec {
+  inherit (s) name version;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  inherit propagatedBuildInputs buildInputs;
+
+  meta = {
+    description = "Translation helper tool";
+    homepage = "http://launchpad.net/intltool/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    inherit (s) version;
+  };
+}

pkgs/development/tools/misc/intltool/default.upstream

@@ -0,0 +1 @@
+url https://launchpad.net/intltool/+download

pkgs/development/tools/neoload/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextFile, oraclejre, makeWrapper, licenseAccepted ? false }:
+{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }:
 
 # If you happen to use this software on the XMonad window manager, you will have issues with
 # grey windows, no resizing, menus not showing and other glitches.
@@ -12,10 +12,10 @@ if !licenseAccepted then throw ''
   ''
 else assert licenseAccepted;
 
-# the installer is very picky and demands 1.6.0.29
+# the installer is very picky and demands 1.7.0.07
 let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
-      JRE_VERSION	${oraclejre}	1	6	0	29
+      JRE_VERSION	${jre}	1	7	0	7
-      JRE_INFO	${oraclejre}	0
+      JRE_INFO	${jre}	94
     ''; };
 
     responseVarfile = writeTextFile { name = "response.varfile"; text = ''
@@ -31,15 +31,15 @@ let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
     ''; };
 
 in stdenv.mkDerivation rec {
-  name = "neoload-4.0.4";
+  name = "neoload-4.1.0";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then
-      { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x64.sh;
+      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x64.sh;
-        sha256 = "1w5pqik1998irpamx6y4rf2v5v34nm8xm6cwa1a8j0agawv992w2"; }
+        sha256 = "07r2pkspdylwi1ba36mqswxsz0xadkw6qn59ljkyw2hsvazd2824"; }
     else
-      { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x86.sh;
+      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x86.sh;
-        sha256 = "0k49kcwnimax9q7d2kychcbhh4zlixlx4ak9jgrm901zpkhw2f3b"; } );
+        sha256 = "1sd6fc35881dqr8m8qsgbblsfx97agam50w9iasd9hxmws7n6pfs"; } );
 
   buildInputs = [ makeWrapper ];
   phases = [ "installPhase" ];
@@ -47,6 +47,9 @@ in stdenv.mkDerivation rec {
   # TODO: load generator / monitoring agent only builds
 
   installPhase = ''
+    mkdir -p $out/lib/neoload
+    ln -s ${jre} $out/lib/neoload/jre
+
     # the installer wants to use its internal JRE
     # disable this. The extra spaces are needed because the installer carries
     # a binary payload, so should not change in size
@@ -59,8 +62,8 @@ in stdenv.mkDerivation rec {
     sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile
 
     export HOME=`pwd`
-    export INSTALL4J_JAVA_HOME=${oraclejre}
+    export INSTALL4J_JAVA_HOME=${jre}
-    ./installer -q -varfile response.varfile
+    bash -ic './installer -q -varfile response.varfile'
 
     for i in $out/bin/*; do
       wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \
@@ -73,6 +76,7 @@ in stdenv.mkDerivation rec {
       sed -e 's|/lib/neoload/bin|/bin|' "$i" > "$out/share/applications/$name"
     done
     rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall
+
   '';
 
   meta = {

pkgs/development/tools/ocaml/findlib/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [m4 ncurses ocaml];
 
-  patches = [ ./ldconf.patch ];
+  patches = [ ./ldconf.patch ./install_topfind.patch ];
 
   dontAddPrefix=true;
 
@@ -24,7 +24,6 @@ stdenv.mkDerivation {
       -mandir $out/share/man
       -sitelib $out/lib/ocaml/${ocaml_version}/site-lib
       -config $out/etc/findlib.conf
-      -no-topfind
     )
   '';
 

pkgs/development/tools/ocaml/findlib/install_topfind.patch

@@ -0,0 +1,12 @@
+--- findlib-1.3.3/src/findlib/Makefile
++++ findlib-1.3.3/src/findlib/Makefile
+@@ -82,7 +82,7 @@ clean:
+ install: all
+ 	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ 	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
+-	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
++	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
+ 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
+ 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+