Merge branch 'master' into staging

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing

lib/maintainers.nix

@@ -46,6 +46,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
+  davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
@@ -53,9 +54,11 @@
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  eikek = "Eike Kettner <eike.kettner@posteo.de>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   emery = "Emery Hemingway <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
+  exlevan = "Alexey Levan <exlevan@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
@@ -132,6 +135,7 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
+  sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";

nixos/doc/manual/release-notes/rl-1411.xml

@@ -11,6 +11,19 @@ following incompatible changes:
 
 <itemizedlist>
 
+  <listitem><para>The default version of Apache httpd is now 2.4. If
+  you use the <option>extraConfig</option> option to pass literal
+  Apache configuration text, you may need to update it — see <link
+  xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
+  documentation</link> for details. If you wish to continue to use
+  httpd 2.2, add the following line to your NixOS configuration:
+
+<programlisting>
+services.httpd.package = pkgs.apacheHttpd_2_2;
+</programlisting>
+
+  </para></listitem>
+
   <listitem><para>The host side of a container virtual Ethernet pair
   is now called <literal>ve-<replaceable>container-name</replaceable></literal>
   rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>

nixos/lib/make-iso9660-image.nix

@@ -1,4 +1,4 @@
-{ stdenv, perl, pathsFromGraph, xorriso, syslinux
+{ stdenv, perl, cdrkit, pathsFromGraph
 
 , # The file name of the resulting ISO image.
   isoName ? "cd.iso"
@@ -22,18 +22,12 @@
 , # Whether this should be an efi-bootable El-Torito CD.
   efiBootable ? false
 
-, # Wheter this should be an hybrid CD (bootable from USB as well as CD).
-  usbBootable ? false
-
 , # The path (in the ISO file system) of the boot image.
   bootImage ? ""
 
 , # The path (in the ISO file system) of the efi boot image.
   efiBootImage ? ""
 
-, # The path (outside the ISO file system) of the isohybrid-mbr image.
-  isohybridMbrImage ? ""
-
 , # Whether to compress the resulting ISO image with bzip2.
   compressImage ? false
 
@@ -44,14 +38,13 @@
 
 assert bootable -> bootImage != "";
 assert efiBootable -> efiBootImage != "";
-assert usbBootable -> isohybridMbrImage != "";
 
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [perl xorriso syslinux];
+  buildInputs = [perl cdrkit];
 
-  inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable;
+  inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;

nixos/lib/make-iso9660-image.sh

@@ -31,20 +31,11 @@ if test -n "$bootable"; then
         fi
     done
 
-    isoBootFlags="-eltorito-boot ${bootImage}
+    bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
-                  -eltorito-catalog .boot.cat
-                  -no-emul-boot -boot-load-size 4 -boot-info-table"
-fi
-
-if test -n "$usbBootable"; then
-    usbBootFlags="-isohybrid-mbr ${isohybridMbrImage}"
 fi
 
 if test -n "$efiBootable"; then
-    efiBootFlags="-eltorito-alt-boot
+    bootFlags="$bootFlags -eltorito-alt-boot -e $efiBootImage -no-emul-boot"
-                  -e $efiBootImage
-                  -no-emul-boot
-                  -isohybrid-gpt-basdat"
 fi
 
 touch pathlist
@@ -83,41 +74,18 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     fi
 done
 
-# Escape filenames that contain '='.
+# !!! what does this do?
-# TODO: Handle this properly. This fails for filenames
-#       that contain multiple '=' symbols.
 cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
 
 mkdir -p $out/iso
-
+genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}"
-xorriso="xorriso
+if test -z "$compressImage"; then
- -as mkisofs
+    $genCommand -o $out/iso/$isoName
- -iso-level 3
+else
- -volid ${volumeID}
+    $genCommand | bzip2 > $out/iso/$isoName.bz2
- -appid nixos
- -publisher nixos
- -graft-points
- -full-iso9660-filenames
- ${isoBootFlags}
- ${usbBootFlags}
- ${efiBootFlags}
- -r
- -path-list pathlist.safer
- --sort-weight 0 /
- --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
-
-$xorriso -output $out/iso/$isoName
-
-if test -n "$usbBootable"; then
-    echo "Making image hybrid..."
-    isohybrid --uefi $out/iso/$isoName
 fi
 
-if test -n "$compressImage"; then
-    echo "Compressing image..."
-    bzip2 $out/iso/$isoName
-fi
 
 mkdir -p $out/nix-support
 echo $system > $out/nix-support/system

nixos/modules/installer/cd-dvd/installation-cd-base.nix

@@ -36,9 +36,6 @@ with lib;
   # EFI booting
   isoImage.makeEfiBootable = true;
 
-  # USB booting
-  isoImage.makeUsbBootable = true;
-
   # Add Memtest86+ to the CD.
   boot.loader.grub.memtest86.enable = true;
 

nixos/modules/installer/cd-dvd/iso-image.nix

@@ -8,37 +8,45 @@ with lib;
 
 let
 
-  # The configuration file for syslinux.
+  # The Grub image.
-  isolinuxCfg =
+  grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-    SERIAL 0 38400
+      ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
-    UI vesamenu.c32
+      cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
-    MENU TITLE NixOS
+    ''; # */
-    MENU BACKGROUND /isolinux/background.png
 
-    LABEL boot
-    MENU LABEL Boot NixOS
-    LINUX /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
-    INITRD /boot/initrd
 
-    LABEL chain
+  # The configuration file for Grub.
-    MENU LABEL Boot existing OS
+  grubCfg =
-    COM32 chain.c32
+    ''
-    APPEND hd0 0
+      set default=${builtins.toString config.boot.loader.grub.default}
+      set timeout=${builtins.toString config.boot.loader.grub.timeout}
 
-    LABEL reboot
+      if loadfont /boot/grub/unicode.pf2; then
-    MENU LABEL Reboot
+        set gfxmode=640x480
-    COM32 reboot.c32
+        insmod gfxterm
+        insmod vbe
+        terminal_output gfxterm
 
-    LABEL poweroff
+        insmod png
-    MENU LABEL Power Off
+        if background_image /boot/grub/splash.png; then
-    COM32 poweroff.c32
+          set color_normal=white/black
+          set color_highlight=black/white
+        else
+          set menu_color_normal=cyan/blue
+          set menu_color_highlight=white/blue
+        fi
+
+      fi
+
+      ${config.boot.loader.grub.extraEntries}
     '';
 
+
   # The efi boot image
   efiDir = pkgs.runCommand "efi-directory" {} ''
-    mkdir -p $out/EFI/boot
+    mkdir -p $out/efi/boot
-    cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
+    cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/efi/boot/boot${targetArch}.efi
     mkdir -p $out/loader/entries
     echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf
     echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
@@ -144,22 +152,6 @@ in
       '';
     };
 
-    isoImage.makeUsbBootable = mkOption {
-      default = false;
-      description = ''
-        Whether the ISO image should be bootable from CD as well as USB.
-      '';
-    };
-
-    isoImage.splashImage = mkOption {
-      default = pkgs.fetchurl {
-          url = https://raw.githubusercontent.com/NixOS/nixos-artwork/5729ab16c6a5793c10a2913b5a1b3f59b91c36ee/ideas/grub-splash/grub-nixos-1.png;
-          sha256 = "43fd8ad5decf6c23c87e9026170a13588c2eba249d9013cb9f888da5e2002217";
-        };
-      description = ''
-        The splash image to use in the bootloader.
-      '';
-    };
 
   };
 
@@ -174,7 +166,7 @@ in
 
     # !!! Hack - attributes expected by other modules.
     system.boot.loader.kernelFile = "bzImage";
-    environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ];
+    environment.systemPackages = [ pkgs.grub2 ];
 
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the
@@ -221,7 +213,7 @@ in
         options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro";
       };
 
-    boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
+    boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
 
     boot.initrd.kernelModules = [ "loop" ];
 
@@ -241,12 +233,15 @@ in
     # Individual files to be included on the CD, outside of the Nix
     # store on the CD.
     isoImage.contents =
-      [ { source = pkgs.substituteAll  {
+      [ { source = grubImage;
-            name = "isolinux.cfg";
+          target = "/boot/grub/grub_eltorito";
-            src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
+        }
+        { source = pkgs.substituteAll  {
+            name = "grub.cfg";
+            src = pkgs.writeText "grub.cfg-in" grubCfg;
             bootRoot = "/boot";
           };
-          target = "/isolinux/isolinux.cfg";
+          target = "/boot/grub/grub.cfg";
         }
         { source = config.boot.kernelPackages.kernel + "/bzImage";
           target = "/boot/bzImage";
@@ -254,38 +249,51 @@ in
         { source = config.system.build.initialRamdisk + "/initrd";
           target = "/boot/initrd";
         }
+        { source = "${pkgs.grub2}/share/grub/unicode.pf2";
+          target = "/boot/grub/unicode.pf2";
+        }
+        { source = config.boot.loader.grub.splashImage;
+          target = "/boot/grub/splash.png";
+        }
         { source = config.system.build.squashfsStore;
           target = "/nix-store.squashfs";
         }
-        { source = "${pkgs.syslinux}/share/syslinux";
-          target = "/isolinux";
-        }
-        { source = config.isoImage.splashImage;
-          target = "/isolinux/background.png";
-        }
       ] ++ optionals config.isoImage.makeEfiBootable [
         { source = efiImg;
           target = "/boot/efi.img";
         }
-        { source = "${efiDir}/EFI";
+        { source = "${efiDir}/efi";
-          target = "/EFI";
+          target = "/efi";
         }
         { source = "${efiDir}/loader";
           target = "/loader";
         }
-      ];
+      ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles;
+
+    # The Grub menu.
+    boot.loader.grub.extraEntries =
+      ''
+        menuentry "NixOS ${config.system.nixosVersion} Installer" {
+          linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+          initrd /boot/initrd
+        }
+
+        menuentry "Boot from hard disk" {
+          set root=(hd0)
+          chainloader +1
+        }
+      '';
+
+    boot.loader.grub.timeout = 10;
 
     # Create the ISO image.
     system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({
-      inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux;
+      inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
 
       inherit (config.isoImage) isoName compressImage volumeID contents;
 
       bootable = true;
-      bootImage = "/isolinux/isolinux.bin";
+      bootImage = "/boot/grub/grub_eltorito";
-    } // optionalAttrs config.isoImage.makeUsbBootable {
-      usbBootable = true;
-      isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin";
     } // optionalAttrs config.isoImage.makeEfiBootable {
       efiBootable = true;
       efiBootImage = "boot/efi.img";

nixos/modules/rename.nix

@@ -131,5 +131,6 @@ in zipModules ([]
 ++ obsolete' [ "programs" "bash" "enable" ]
 ++ obsolete' [ "services" "samba" "defaultShare" ]
 ++ obsolete' [ "services" "syslog-ng" "serviceName" ]
+++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
 
 )

nixos/modules/services/hardware/thermald.nix

@@ -19,6 +19,8 @@ in {
 
   ###### implementation
   config = mkIf cfg.enable {
+    services.dbus.packages = [ pkgs.thermald ];
+
     systemd.services.thermald = {
       description = "Thermal Daemon Service";
       wantedBy = [ "multi-user.target" ];

nixos/modules/services/logging/syslog-ng.nix

@@ -43,15 +43,6 @@ in {
           The package providing syslog-ng binaries.
         '';
       };
-      listenToJournal = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether syslog-ng should listen to the syslog socket used
-          by journald, and therefore receive all logs that journald
-          produces.
-        '';
-      };
       extraModulePaths = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -74,7 +65,7 @@ in {
       configHeader = mkOption {
         type = types.lines;
         default = ''
-          @version: 3.5
+          @version: 3.6
           @include "scl.conf"
         '';
         description = ''
@@ -86,18 +77,13 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.sockets.syslog = mkIf cfg.listenToJournal {
-      wantedBy = [ "sockets.target" ];
-      socketConfig.Service = "syslog-ng.service";
-    };
     systemd.services.syslog-ng = {
       description = "syslog-ng daemon";
       preStart = "mkdir -p /{var,run}/syslog-ng";
-      wantedBy = optional (!cfg.listenToJournal) "multi-user.target";
+      wantedBy = [ "multi-user.target" ];
       after = [ "multi-user.target" ]; # makes sure hostname etc is set
       serviceConfig = {
         Type = "notify";
-        Sockets = if cfg.listenToJournal then "syslog.socket" else null;
         StandardOutput = "null";
         Restart = "on-failure";
         ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}";

nixos/modules/services/networking/quassel.nix

@@ -74,21 +74,23 @@ in
         gid = config.ids.gids.quassel;
       }];
 
-    jobs.quassel =
+    systemd.services.quassel =
       { description = "Quassel IRC client daemon";
 
-        startOn = "ip-up";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
         preStart = ''
-            mkdir -p ${cfg.dataDir}
+          mkdir -p ${cfg.dataDir}
-            chown ${user} ${cfg.dataDir}
+          chown ${user} ${cfg.dataDir}
         '';
 
-        exec = ''
+        serviceConfig =
-            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
+        {
-                -c '${quassel}/bin/quasselcore --listen=${cfg.interface}\
+          ExecStart = "${quassel}/bin/quasselcore --listen=${cfg.interface} --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}";
-                    --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}'
+          User = user;
-        '';
+          PermissionsStartOnly = true;
+        };
       };
 
   };

nixos/modules/services/web-servers/apache-httpd/default.nix

@@ -109,6 +109,9 @@ let
       "mpm_${mainCfg.multiProcessingModule}"
       "authz_core"
       "unixd"
+      "cache" "cache_disk"
+      "slotmem_shm"
+      "socache_shmcb"
     ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
@@ -160,9 +163,9 @@ let
 
 
   sslConf = ''
-    SSLSessionCache shm:${mainCfg.stateDir}/ssl_scache(512000)
+    SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000)
 
-    SSLMutex posixsem
+    ${if version24 then "Mutex" else "SSLMutex"} posixsem
 
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin
@@ -420,8 +423,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
+        default = pkgs.apacheHttpd;
-        example = literalExample "pkgs.apacheHttpd_2_4";
         description = ''
           Overridable attribute of the Apache HTTP Server package to use.
         '';
@@ -593,11 +595,11 @@ in
   ###### implementation
 
   config = mkIf config.services.httpd.enable {
-  
+
     assertions = [ { assertion = mainCfg.enableSSL == true
                                -> mainCfg.sslServerCert != null
                                     && mainCfg.sslServerKey != null;
-                     message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
+                     message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
                  ];
 
     users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton

nixos/modules/virtualisation/docker.nix

@@ -7,6 +7,8 @@ with lib;
 let
 
   cfg = config.virtualisation.docker;
+  pro = config.nix.proxy;
+  proxy_env = optionalAttrs (pro != "") { Environment = "\"http_proxy=${pro}\""; };
 
 in
 
@@ -73,7 +75,7 @@ in
           #  goes in config bundled with docker itself
           LimitNOFILE = 1048576;
           LimitNPROC = 1048576;
-        };
+        } // proxy_env;
       };
 
       systemd.sockets.docker = {
@@ -99,7 +101,7 @@ in
           #  goes in config bundled with docker itself
           LimitNOFILE = 1048576;
           LimitNPROC = 1048576;
-        };
+        } // proxy_env;
 
         # Presumably some containers are running we don't want to interrupt
         restartIfChanged = false;

nixos/tests/proxy.nix

@@ -22,20 +22,19 @@ in
 
         { services.httpd.enable = true;
           services.httpd.adminAddr = "bar@example.org";
-          services.httpd.extraModules = ["proxy_balancer"];
+          services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
 
           services.httpd.extraConfig =
             ''
               ExtendedStatus on
 
               <Location /server-status>
-                Order deny,allow
+                Require all granted
-                Allow from all
                 SetHandler server-status
               </Location>
 
               <Proxy balancer://cluster>
-                Allow from all
+                Require all granted
                 BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
                 BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
               </Proxy>

pkgs/applications/audio/gmpc/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE
+, libSM, libICE, sqlite
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
-    libunique libmpd gob2 vala libSM libICE
+    libunique libmpd gob2 vala libSM libICE sqlite
   ];
 
   meta = with stdenv.lib; {

pkgs/applications/audio/morituri/default.nix

@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao
+, pygobject, gst_python, gst_plugins_base, gst_plugins_good
+, setuptools, utillinux, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "morituri-${version}";
+  version = "0.2.3";
+
+  src = fetchurl {
+    url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2";
+    sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210";
+  };
+
+  pythonPath = [
+    pygobject gst_python pythonPackages.musicbrainzngs
+    pythonPackages.pycdio pythonPackages.pyxdg setuptools
+  ];
+
+  buildInputs = [
+    python cdparanoia cdrdao utillinux makeWrapper
+    gst_plugins_base gst_plugins_good
+  ] ++ pythonPath;
+
+  patches = [ ./paths.patch ];
+
+  postPatch =  ''
+    substituteInPlace morituri/extern/python-command/scripts/help2man \
+      --replace /usr/bin/python ${python}/bin/python
+
+    substituteInPlace morituri/common/program.py \
+      --replace umount ${utillinux}/bin/umount \
+      --replace \'eject \'${utillinux}/bin/eject
+
+    substituteInPlace morituri/program/cdparanoia.py \
+      --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"'
+
+    substituteInPlace morituri/program/cdrdao.py \
+      --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \
+      --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"'
+  '';
+
+  # This package contains no binaries to patch or strip.
+  dontPatchELF = true;
+  dontStrip = true;
+
+  postInstall = ''
+    wrapProgram "$out/bin/rip" \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://thomas.apestaart.org/morituri/trac/;
+    description = "A CD ripper aiming for accuracy over speed";
+    maintainers = [ maintainers.rycee ];
+    license = licenses.gpl3Plus;
+  };
+}

pkgs/applications/audio/morituri/paths.patch

@@ -0,0 +1,12 @@
+diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in
+--- morituri-0.2.3-orig/doc/Makefile.in	2014-11-01 00:13:01.231364181 +0100
++++ morituri-0.2.3/doc/Makefile.in	2014-11-01 00:13:56.691812229 +0100
+@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa
+ 	-moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
+ 
+ rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
+-	PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
++	PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
+ 
+ clean-local:
+ 	@rm -rf reference

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

@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, emacs }:
+
+let
+  modules = [
+    { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; }
+    { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; }
+    { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; }
+    { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; }
+    { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; }
+    { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; }
+    { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; }
+    { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; }
+    { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; }
+    { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; }
+    { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; }
+    { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; }
+    { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; }
+  ];
+
+  forAll = f: map f modules;
+in
+stdenv.mkDerivation {
+  name = "icicles-2014-11-06";
+
+  srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; });
+
+  buildInputs = [ emacs ];
+
+  unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done";
+
+  buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
+
+  installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
+
+  meta = {
+    homepage = "http://www.emacswiki.org/emacs/Icicles";
+    description = "Enhance Emacs minibuffer input with cycling and powerful completion.";
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ simons ];
+  };
+}

pkgs/applications/editors/idea/default.nix

@@ -233,25 +233,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14pre";
+    version = "14";
-    build = "IC-139.222.5";
+    build = "IC-139.224";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
-      url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz";
+      url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "e2c696f465da36b77148a61b45f35f8f08ceae3b624904de8f7cccf0e7c20ce2";
+      sha256 = "72e1e7659aa90c0b520eed8190fa96899e26bde7448a9fe4ed43929ef25c508a";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14pre";
+    version = "14";
-    build = "IU-139.222.5";
+    build = "IU-139.224";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "http://download-ln.jetbrains.com/idea/idea${build}.tar.gz";
+      url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "d8e8927adebdc4d2e5f1f5bfb0ecc97c3e561b74d56391898dd36abe89a4f170";
+      sha256 = "e1c86f0b39e74b3468f7512d299ad9e0ca0c492316e996e65089368aff5446c6";
     };
   };
 

pkgs/applications/editors/yi/yi.nix

@@ -1,27 +1,27 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist
-, dynamicState, dyre, filepath, glib, gtk, hashable, hint, HUnit
+, dynamicState, dyre, exceptions, filepath, glib, gtk, hashable
-, lens, mtl, ooPrototypes, pango, parsec, pointedlist, QuickCheck
+, hint, HUnit, lens, mtl, ooPrototypes, pango, parsec, pointedlist
-, random, regexBase, regexTdfa, safe, semigroups, split, tagged
+, QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split
-, tasty, tastyHunit, tastyQuickcheck, text, time, transformersBase
+, tagged, tasty, tastyHunit, tastyQuickcheck, text, time
-, unixCompat, unorderedContainers, utf8String, vty, wordTrie
+, transformersBase, unixCompat, unorderedContainers, utf8String
-, xdgBasedir, yiLanguage, yiRope
+, vty, wordTrie, xdgBasedir, yiLanguage, yiRope
 }:
 
 cabal.mkDerivation (self: {
   pname = "yi";
-  version = "0.11.0";
+  version = "0.11.1";
-  sha256 = "1da5wnqx1z8d809dydqr97jh8n5g9phh06lvkgc32hib2rybh5yx";
+  sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary Cabal cautiousFile dataDefault derive dlist dynamicState
-    dyre filepath glib gtk hashable hint lens mtl ooPrototypes pango
+    dyre exceptions filepath glib gtk hashable hint lens mtl
-    parsec pointedlist QuickCheck random regexBase regexTdfa safe
+    ooPrototypes pango parsec pointedlist QuickCheck random regexBase
-    semigroups split tagged text time transformersBase unixCompat
+    regexTdfa safe semigroups split tagged text time transformersBase
-    unorderedContainers utf8String vty wordTrie xdgBasedir yiLanguage
+    unixCompat unorderedContainers utf8String vty wordTrie xdgBasedir
-    yiRope
+    yiLanguage yiRope
   ];
   testDepends = [
     filepath HUnit lens QuickCheck semigroups tasty tastyHunit

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchurl
 , pkgconfig
 , bzip2
@@ -18,8 +19,16 @@
 }:
 
 let
+
   version = "6.8.9-8";
+
+  arch =
+    if stdenv.system == "i686-linux" then "i686"
+    else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
+    else throw "ImageMagick is not supported on this platform.";
+
 in
+
 stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
@@ -35,18 +44,19 @@ stdenv.mkDerivation rec {
       export DVIDecodeDelegate=${tetex}/bin/dvips
     '' else "";
 
-  configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") ''
+  configureFlags =
-    --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
+    [ "--with-frozenpaths" ]
-    --with-gslib
+    ++ [ "--with-gcc-arch=${arch}" ]
-  '' + ''
+    ++ lib.optional (librsvg != null) "--with-rsvg"
-    --with-frozenpaths
+    ++ lib.optionals (stdenv.system != "x86_64-darwin")
-    ${if librsvg != null then "--with-rsvg" else ""}
+      [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
-  '';
+        "--with-gslib"
+      ];
 
   propagatedBuildInputs =
     [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
       libtool jasper libX11
-    ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript;
+    ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript;
 
   buildInputs = [ tetex pkgconfig ];
 

pkgs/applications/misc/calibre/default.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.8.0";
+  name = "calibre-2.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0wjkcgv7y4ll4lh5av6zs0q3k9y6p36sndw3864zhgwqwff00k12";
+    sha256 = "0g6vhah736ps88maw3ggn7pcvnmani2mp8b29ksasv0683q7lldw";
   };
 
   inherit python;

pkgs/applications/networking/browsers/firefox-bin/sources.nix

@@ -4,189 +4,189 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "33.0.2";
+  version = "33.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "84289121c49e9472972f04cafa707abef6d40ab4"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "1921293ebe2f6ed8b26fb543c2d9673f617551bd"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "b048883f61a09b3a4d46b5b35dfa44df108c013d"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "cf19672cc4f69d049f072cc3739deff77385652b"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2a8bf42955842920044a119b5da480dd40fd99f0"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "65382d7fcf53b28447c99eea6a1b1d5bccfc390c"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "c5cd176dc69eea6d3a933b58661704c8c381ca70"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "af0c9cf1517e51f92a5c83c2621722cf3fff2c0f"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "8aab040e91770e347bd89a77d6cc3e2f822f1b01"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "10426df065b812a600c817e0567b1adea6148aba"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "fba44ab169b11a78b3616a4bcfa9a813626306a5"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "ef8411a2a00eeab85ac9d7c6793bbd61302e2589"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "3ca9bee8dfe329198669c27a7743504767e4311c"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "cdb9040dbd00599bf8490cb51c1a22ea27d57559"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "4420c6974845d5b036ca8465fd530ff477302b6e"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "6a65730cadd941c8352ab4b28b5d051f387f7d3f"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "85d3f501184ed7bf4fbf2328d7797dc7656c60ea"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "1bbcf263c7e211a101957d936f801f47dffd3a43"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "7b79e41bbecb87df2b79c41fd6f4efe5fc5a62f1"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "b6abce1b67f168adcfa6f50312407c42ea987895"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "65dc73669af6965ef7cc3e937070a629a91d27c0"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "82e66bbd01efa26862826cb785c228fe710edc1a"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "5ba415acaf6aaf00ef9603b1bd7c28067a38c06f"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "e7b65e099dda3ed9928cf0769e87702e68c8457d"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "161ffff8bba5bd7e3fdfff2cbbe06788a75a1786"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "c6313210c17be8eb34657cd929cae28d46d4ac95"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "305c54bf69d82270beaf9268d4936c04465efc19"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "5395709e0336bb79d1cc711b52353bd8c7b00005"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "a4677e7a0013390c99dc117e70f7be344487b9fa"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "69c5d38974cd23a3b42d6cc2e647b3d51e68f902"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "9d2a5a92c74dcb4ecc960fda83cda4d6a6a333e7"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "a9db15df6bca0bca8079181b9dff9149ddcdb36f"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "06cd3eeb03646b2301f779859b6121e33946b9f9"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "7487ede4bed190cc0cd94973e8219ca8c1da76df"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "f352868b172f54d007b72b6364ecd9a073a086e3"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "f85f2992b7a1820a2d328bed7dbec42d461ba478"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "b487c35201063e0b3b1751361973e86bbb6d3646"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "2fca93f2f697249012e61bbb42b1ff135602787d"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e5d827177cc3bb9adcb74f01e4937ba77982c2d8"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "68498facf3cfb2f01f4c6c632b858555f2dca915"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edb44f171a1d70a7e4c8a0eddceb603b511210f8"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f867da3ea71fbece79d48897af3c264756050dea"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "dcc2e0ac1c5bb8b06e6daeb8a98d8598664864f9"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "483faa6cae8fbddc1a1dc70344ee9b8f140da2b7"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "eb21581ed2c552383e868cf2d689517642b66f47"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "843a9831bf65d6ace18e77fa12798e30a69e1bd8"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "bfedb09a7ad5998b90fc3471115be0a607b0f6ca"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "6571768ba5c6648fc74c857ef193d214b057c9ff"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "23507b237d3968ceb1a987326ac62d94f9df65ea"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "649ac72cd49b1f12f0c5e65c51251ea459bba46f"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "47f485cd621bd892994292ed564b90269e2a2754"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "e98aa76e2b0d482316f1497ef02fdc55911e7358"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "e69ae2cf47575cca8403e9d8273161c9f23b28d7"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "bdc2dabc89e77f8e3ffc0e1e1eef54d86da4e915"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "fbe9546b99ffadd68c05783fa14eb56465eda3cc"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "683573c54c29b3952df02414eb8c08ed72a175c0"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "dd523103288e93513fa366a2ddbeaa554fdbb176"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "e109d9c8a18021d95c6dd9b024a9ef3098ad2002"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "55c0db80a935cecce7551008fcc389f4fb742748"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "70571f4b8de2f6ecd78a0d993a92ba50ebfe88f5"; }
-    { locale = "csb"; arch = "linux-i686"; sha1 = "66704c774f8aa5b6ed08b5ad418474e39092ec6d"; }
+    { locale = "csb"; arch = "linux-i686"; sha1 = "e257c5462caa7a2cc911b2fd98c2b0c1b8295c3d"; }
-    { locale = "csb"; arch = "linux-x86_64"; sha1 = "01f72eafcf9b16ba9030956c147fd0198bbc7920"; }
+    { locale = "csb"; arch = "linux-x86_64"; sha1 = "72ec3481d6d8f222954e74097de8f81353229476"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "900d37825d69a9ac26f1876b6967f5b7499bbd85"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "a37c821b0e5b011928256fd2f1ba5bef904ea115"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "52da4de76b59a234b933c49ed760f223c7c4c15d"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "09f149d1a0298b86956278c7785ac1e463fbe966"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "a750e76cd0c9a0f9188642a14339d7c9173cd720"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "3e9ecdbb95a47bc268b670944d8aad093468d300"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "59e5293f5862f583b9dccc4c33441773e024f90f"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "d9f1c143820bb55b87d47c09fb8bd8e8806cc6bd"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "d83b88f086bfc5cfedf15c02ed4b5359abaec1e3"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "a3a0bc4e13191c298ded627f72905234764a3ddc"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "a8d3c09b24c9554205d0f7b09b3281ae55e3a7ef"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "119b106774414fa5befffd7a1b9d33e932e8968f"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "123923553c828e8190c265ffbfc423a1744ae031"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "783b4721e6c39bd10ab8adca64a9688ed46561d4"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "51cd2a899d18239e653460eff4b5fb9a3c792cad"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "22ad1c92851fae97ecb6c73207e98eafed2ffe68"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "280719149af0cbc2ed3216d2f7217e60bfdfa2d1"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "241cf6cfefd7148d594c97847bd5a38b1cb3d503"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "854c5243738cd462465b38fe09da05bcf336fd8e"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "0557b84b189eaf4e40a1e7c6f1b50e25565abec9"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "1db81b7381b6217b2d041b2faaca83a90be48640"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b5ff1db0a6b0d757b600096f3f42681044806aa0"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0de6a9f1ae3f7db8d30cb1b38da6bc928a56a373"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6aca6f3184ffd1548f696988d3c020ccbd42ae39"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "2a92e782d140055690ce9ac89be46ef2e0664260"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "446f501eac8c8f89c04bf27e43a6c5345b5c9672"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "dd511606189c45f830e196b396ee62682ef4116b"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "550b8c17dabc55442fa3b64875ce7eabbc54624e"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "89e0abd4a56ad8d7cfa750e8c1c44e70320ebdbd"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "1021a7038bdb337c27b46a601f545a949f148b0c"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "873a055caa419904a1c82c29407f7f5d2b6baf70"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0dccd437651d9c58b0c7a7b9d6f406ce4949aa2"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "369dda2004fadc6d6f58c8f5eb86515eb0fc1c4a"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "f4b15872c28238b5715a6462f95dc3b41f67e2bd"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "c25e885800ee5a84e05919aee38f29608e878b9f"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "770a8387e74fa9dc5e35524d4b9b761e590b4cdc"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "d334207e5b0456ad90b12b9a713e446b6d0a59e6"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "7d8c56fdfbe441b4fefa3cb9cf86d23031bfd8b4"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d6938e9c0e150fcb468301dd12d657e44a6fd216"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "855659d84f4a2f9568f2328cc325875f1d8d1278"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "8a3e3f6302e260857ff09a737e8272d59c3490be"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "8b6fd782fb2c402beadbac8455e06c3c39b44a41"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "5eb5e282d60f97bc723a362dad92d7d14a0ee9e2"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "26887448078121ba67f9aa1595b3ef177c7eaba8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "69149b7d4309b51ae87deb834d5ab1836dcfb7d4"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "315fc00607a0c926ff5c8ce5f702036159b8cf5c"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "840c817433ec950a0284b4ff59e0634111cff3ae"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "86f0474583db54add265b13d28bc5d96656d6e9f"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "0a2ddb4b2b92264372b1bdf5ad957147610c5383"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8b848b83291d70f870d5bbb5bf6e4c2324224c71"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "aab30300c0062f0b3839201cecda6fdd974638ff"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0b29b6e966099c686195c1de7c2fde7b1150338d"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "a09b9a0c58afbb1a19e841a4f72cca699d0f14e4"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "c64f5ac533b9afc8851abc9cc27aecc62e1896b2"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "2c23762407edee338a53f50e9c9f5a884bc2c479"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "90762975828e0003f41c8b91918cfa26385016b2"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "2b118062f5c8f93cb2be5aa298d4e2caae0302f8"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "131fba3c72658418c2d33b727b97db94a9edf043"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ae2841ec555a74d129052f6af9931d1927bdcccb"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "1c4cc0c11eff48db085cdc90e29c8d0a82ee1580"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "604a2be7317416e31ba2d1705c587a29b9dcfc57"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "eda6dbfbdcc12e2b1f41e05847494f4fb186f86b"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3c53a30d4383d05a12631feb72be8aac88b4ad9e"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "1753b8f6999ec79595d8220149c2f366dd53d50f"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "7229ddd990a18eddafe2478db0e082b108a18972"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "e4b4269db2ed0e70883b68b09c9de4944d7322e6"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "0555b251a17ff1fb700e891676987f98a110ec1a"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "e84f1ef0a5af55eb455e8aea277c7915eba6c7fc"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "e04a02fcffab0db1e85b4cee754d5ba8006cf387"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "56112c07a35aa309975c177c63835d7084573091"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d85c3448d2b685fb69cb7f567ee50c21a4d66345"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "68619b9f4e2a0d4d1fcfb125c3afe69ab7e4b888"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "7be35c9e5bca6b83b3123468333d05360cb212ff"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "b7e576d28cf1d9321d20e13fe06a75a420c9d266"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "01a9900d207f44456f55499b5c8074983001a896"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "b7a88881f9cd88861f2c1475ff651021215dc10f"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "aab9b751d299d6ea3b5914b33b6ba22d45a1a800"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a4d32f2eef796da72906f17e3b3fefdbbeefff2"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "146f82bc19217b2736e82f6cdf8c367dfe546b0e"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "73ce69c69382e8928ba75bfee039484a89a954b7"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "21420623f201278b788f3ebf8ea075d5cd2720cc"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c6cd2c29d52f6d41e57a6a6c6920a1b81d3d9ad2"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "888112fc030689f48889227765377dab969e07db"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "704b3f20af6eb5ba8fff11df2b61d165da0c704f"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "528b236cb8553576adceb5ffe73a52f07a2bbab7"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "b44f19060ad05f90e8a4610ee31742fcf0a1887d"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "41d5a5cd74e61d5274774842f224daf22ad9751a"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "4cfe19b446023b477603986f8ebce10760116556"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "36397364384b61a083e9cfb4535749b08fd35d68"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "0ef95ffc60b27db15175c35c4c67d03e7d4ab187"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "08a80c6088abf0b970e1bbce1370de24ba3e50bf"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "7a4aeda8ebd3f8e84c5eaa41fe654002fa972cf9"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "cecf38096e029453ffbaf5ce14333836754f05dc"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "ad61a487a2fa61c0a59df2a49ad66ffbea6c3d58"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "87515724726efd12eab5018d6062ef8a4bec19c6"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be8cb3124bed4de2c75f4121e8fba51fd924d9c9"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "ca162ce8e0d33883489923f714cb6880eed4ddf6"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "a8f61990571b1e82c92e3aa5d04e0634ba845868"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "bdc063b683ccdc26e8d3314aac9a89beffb855dc"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "21e9e92ac2e1b5d401db087e42cfb8e7b70dbb76"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "6054818606b0e004f16d503f6772897bc556cea5"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f9dad0de082bbe79ac3a4d65a7e230ef7573615d"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b52d98d4bc6825e923ad438b0a4e7989e8cabe3a"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "4d63ae66cd5c4f5f2136074f25a12a8d7afdf414"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "d75988c20d86068523dc2bfbf6f1b6a9fdf50ea2"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "9fb6741ad66d4518da42f8fd01808cb7225cb179"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "0eb0eb3bcf947a5df91552a520c3dae502e8ca12"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "95ab75701daab063c349affd2f64bb78c08c4372"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "6a7af0b5e6f9e7673c41b69c0b20b619657670e1"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "3fcf4edabb1214959cb317c87712d93e2b528322"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "eba91ab9ce2c8b4951c201f8ca0247c8810991ce"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "378c162773d8fa98bfd4c65a3318da6fd62d9e09"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "0277e06231e406fca6594489d0629a2df28b099a"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "f14bbb59e17aa7f2e618acd7bada59f572969da0"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "1049f9deef387f7e51d5b1b87677a236ecd8e8bc"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "9d3ed9567343e309d07e33bdd6bf12e342558b83"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "da5b737c60c95df82a464e3028869892ac083f22"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "42ee6763c5583cb2a81e165a3594f5225478d341"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "e9bcab47f9870b0dce22f764d78acdb9c8fdc3a2"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6b68651f66f01b2ca6809688208f58d962185334"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "c76ff5c58977afcedf88ea354596329d83dbfcd4"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "af9764798b22a45700d6a8af4fa6fc4fa42057b0"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "9cd4cfa700f96654608956932cc16d0b60d3de72"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "1599eb91d24958067fbda8610baba4032906a80e"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "b79c4c2131e8ba15d6f31f0609616476b91b739b"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "ddf37bd5da00481956cb5da8e5c7a4746eac89a2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "feaa1616f97e1145554fdd93f1f5310dbf35c30a"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "771b15c19b66b9f9dabe2a21cdebdd1a038b1944"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "e3c1658e92f1ef6ec98c2dce0269eba3c64a4312"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "64eb88bbdb9684c985a0b370eebc231f8b7f541c"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "608298dad85daa4ca08996cfe20a1602a951dcba"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "462256d8390173a8b3a4494f71a33882cfff2b05"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "eacc6251f1fca09b41e84d43f84ae49c87619c55"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "042510095ba9d7d3c07f0fe2d8961ac5a66b3485"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "110e1ad59d404aa4bcbf5ed6781a93a27d9756d0"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "f5d831366bf57b383f941600b70ab8322207eba4"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "772ad939e83fb889ac24cafba5006395757d73b8"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "24dd935b408f9d02743dac81ff472f71a54c5652"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "2d0e1909f76f9007a63afd1aadd3175a3dc5bade"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "43482c8dde95698306ad6bd21e19471c067cf8c1"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "284d52d38a58c392dfa4deac506b26c8dcc8a8d7"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "7ab99490f590b2b6e7113c0e9e710db7c64ed3d3"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "acf596620f0de73eb51b2ff1687ee5723e1939bd"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "e9c23eb7fc81c1afc3d242f6a74fcadeed1e8625"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "b4e3aa3ca7dbad47db42dc10e486d38b4515decc"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "7d1b892e88e01ea4eaf403036814096530cc96ad"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "b24aedb7ed569666e979ef71c54b99c5f0fdecc5"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "1b72a40aa32456bfe7066e3953a38dd476b936d7"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "29e54578a74203613e084a5ef36e05a7fff0e0c7"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "315bfc8bf6b9de2f949bc414205ad2e732e6b86a"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "858fb59b17acbc8027ab5962ed4a4c45b0e3afd7"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "b0276581252154e92757e5497b1f72afcc70a88d"; }
-    { locale = "ku"; arch = "linux-i686"; sha1 = "ee5b0d2fa065d4f488f9871cb034db27ef02580c"; }
+    { locale = "ku"; arch = "linux-i686"; sha1 = "e723b3c993a32147d96ccd30fc49c38781e7b2e7"; }
-    { locale = "ku"; arch = "linux-x86_64"; sha1 = "31bbfb80de63d24022c7779ded2e31a32dbdca0e"; }
+    { locale = "ku"; arch = "linux-x86_64"; sha1 = "f32b109fa8cc29aeba8efe88ce860b0d8cd31272"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "4e82e29fbf6485ea16ce0766764ac62ed848b94d"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "772d796a7c23c0a19570371ed975d9ce2a28152d"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "cbe98fdf2eb3001968d0df0769e0cd0902b06fbc"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "06b981f4f3d4ce531abd62cb5266326820f03032"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "d12ae187d164616e89cf4eed77e5927e575128d2"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "48de585882d3f43c7482788ea53861ecdfe47feb"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "518a384b8ad40ea9efe659a896b0512948e1e987"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "b15f167b0c02b18c87657aed28914b5bb8c9ae8c"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "88c90db1b921a76cb85632e0f362b122d4da411c"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "f99e7c29d74e8c71ab3a75030785a796cb2fb7cd"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "3c2a1c0b507c486b709c1010343a97bc8f7c3e77"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "cd0c6a7a6cb760daa95fb3f8512ceb59d02d9561"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "5b73e8d4a01826f3b27664b9289953ad3784793b"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "e14ef6323bc419c8ea9cc3a5377f81783ceacfe6"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "d988bee839d38d09b990cc93107cc2f53e236928"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "72b85394e96ea8427c87e305249db32d777679a1"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "dce5f05792e19ae41352b33a15721e91b1ec51d8"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "f074172c4823d6460084ad035fdf125c7604fcfd"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "92025b929fceecefc7bc120a3bf7cbd4374dadb0"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "a9cb300a95e6209e0960cd4c442927f99685c157"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "073aee45ae60efb142514353125f8f73d07cb41b"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "ce1e3a7648aa414a036e8e8fedcda1625531a896"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "0aa10e353aacc98de2799c42fb1a767a2db073df"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "0ccdea5606e7bd153220986028b08adf9d110489"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "96f72aa8dbde2c807d314dffe7b17d9ef8cd4cbb"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "dd2cfce96f63c596d92fc41bf7b0cbb4d3910c75"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "0153e84af4ee51cfe046b7419471788becae94bb"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "e3132b39198a4d1102e91d5b128aff59a90749fb"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "a5a9a008006830b903aff077dd4ecbd88f56e065"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "ef75a6e8ff561505e156143e79732db4e6e7463f"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "d62254d76c09c6e7ecf5b8fce5f16c19f6778f95"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "d5f9910e8b9c99b6b2a0b02a8d235679bf91e3f9"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "23552008764881e8132ad918f7fee319d8663665"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "a8a25e635595a463b278d3cad6fe0f3270dde5d4"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eb42bdb42d0e51b1c68dc50b8da066682afa6a68"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "bbaccfa625940ee0cea4bc80b890de12261a2975"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "88fea28ecd7f8257fac516183e48f6a23599850b"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "300906dc853308d56f9be18efbe013ad84b842ed"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "9f5002532f94726b53de4c2ea9e0099a2b88e4cc"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "0b3a2dc384b23bf5080514111af1eaddd8b08fdd"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "005f55140ced2888691c3695f491063874c083e0"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "7ab5b40e63eec97e6340cc47027f3e1dde4bfd33"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "9e8c4103fe98a591ca62f8bf3b73dd91ff8e6973"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "521efadf61693655cd55eff03f5c1b7c74531ede"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "20f94f1c14cfcd95825cbf0613e94b4bf4db8e55"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "56f2c698815def24af986fa5843bd421915f6f55"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "9a31112abecd538e1b9489b16a89fd5c8bb10d25"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "f6062ab71bad05de678f12eb7795786955b2729a"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fa6d6e65d14f7b771c65465b67f1ceca83402051"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "2a7390e40308487854ab73af5941936d72907fef"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "9268ffeb1982f08044ab882224aad93da4064340"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "1d7ce2a4c0b5c2e1e469a2fd80ac1dd5efa6d5af"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "97b6e4700c6cd35a40e9256dc558cc0f01198c75"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "8aa59c2cbb548fbd3e770d8d149807eaf55d97dc"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "46c721a5c778a7dbc51f6a89ef29ee00203a64f9"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "504a1ec25f4c7ec9bfaf171eee8388710ee74952"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "11f6f7868a6733a2459d3e36e106526eb0a2b44f"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "13175cb113c74407ed7014b4d63617e5ad94806b"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d276a761068f662b59c7d832f24bd756eda5a37a"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "eb3f3ea67b365b1f7d02eddc1edd1631530ecaed"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3eeb28a4a01d13111a2214ee64647f332d476088"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "17932f6836ab2eb476e53bf0de0ec71cca43cf91"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a55faf0846dbf8e964402e75f7c213968afd4568"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "d9842d99f3bf39b19f704d1d1037a2653845690f"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "471757165eeeeb2e97f3a2e71fc942ad7f7719e4"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "75b6738fad63af2374ab1e68f762887b125951df"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "3583eaf02e502d1346de9ef769a9df236a78599d"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "5e5463aa6c65f883f0b5256fa39d5674ce25af55"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "1b93473d549e639b9e3f29e31387fb79ae373d94"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "d31da8f672922c92646a99448204447ff4299fa0"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "dc0255b15ff129cb38eaa0a52d61a2f74bbcf7bc"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "8f70168006e90f722b3ce0374728ff25a99e7499"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "43ba7700c44d26b6433678d7dd6e0a0c14d93f45"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "a030523200e2fb2423e4961d227c3adfa913d5f4"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "46bc5736bbfcfb948e9980dbc63b901753e16862"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "5d696249b6732a8a4d8806ac8032bfd86c49ad36"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "d445f110df79720b14fd6f445167a706b116488b"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "ce48e3f09e5a5473d568ed2004e3fef69479f8e0"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "b4b3db391ae6e2d503633245878a00f4e33e0d43"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "be68d12ab8c5a23f4daf0f6ab024a0a2e43aa8cb"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "3080a0fb40da4e96943114d20f1f72529d0667bf"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "e22dd3e46ee4029aadcc6bbb1b7cd0cd2393583c"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "7158353b5310e77ca0497c288f0662e1f922fb7a"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "e731b4cb099ef5768861e50320eea79095b40883"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "24260e9b0fcb7313a3eebe5070e0a94b27bf81a2"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "54066600ccc2ab644dd37467deb4b316b9cc1054"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "9a5add8d7300ddc64089e02404825514ff17647a"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "79ea8f6eb4319e883b25ca3eb34d2e9baab210ac"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "600913614d41258cc77cf506cc13d1ddab40625d"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "bbf18f281de6083acabc9b94175a959edbedbf0d"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "b278970e4ca2ccb2dd3491a905bbdbbf0d70490e"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "0e73ef32446ef1b1bf78a748aa33e352dead9415"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "5f15a63b1648e44ae9551aba26e81ec48a6bdfae"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "a9f07225212e4e76ea085fc959dd1e5b9ae4cf9e"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "cbb9ed192d45f6acaaa27ecfa41b618053c6d7d6"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "6bfb8ac480c1959e5413ff2c0705bb3f33bc30e4"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "6ef381a41653bdaeb86315c090fcbc31b9dc606b"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "aabbce39a67c3124de70d44b7a0f9d6ee236317b"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "0c0957b8bf14789c1d535044ab4c23c6da7b7fb0"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "f1ee3384548fd5f42e0cf9562cb640082d370ea4"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "1e1aff3b58c5545d4fca293e36392d1bfa94ad84"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "9657f9cd1b898b08d1318fc671ce049254ef179a"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6af5115d5c998f01fc47a632a2043d1796dc0e48"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "380ff2e58890a604235a32cdfd1ade91742cd1d0"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "69b0da1959ebe1216042b7e9eb50ce35c1d32dd6"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "2a888f529c1fd427de4d2c9192c6c34d382beb66"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "423f5eee83bedcc10aaf43ba78fe8eda221f7225"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "931d046374efe0cc02dae0481e71dd62a7ffbcda"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "05c078b8532236c8807366058fa56d86f7d9f202"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "a3ae25c1cad81e5c46917b537467de3a3f4df494"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "36edfcbe5eee5700b99285d4be56d812f8d6126c"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "846b559dd6f1c09b7f362cc18948df73ef85b417"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "f1dbcb989ab807dde9c718564f2a6666e541fb08"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "e4d9098a89300fcb91a8c9c832a932143b999cc6"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "6b97dc0cfb18c168b909e80a0cf6944197fcf971"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "152c26901be43baefba0acc268667a234b19c102"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "a5311e7bbece416d44659fb6a026d1c4b7e559ad"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e860e4e718c9185683417cbe624797b0839740ba"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "75c876fc07f088b4909cc07892e15b9cda8d7d57"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "30fb6171a38dee24f67ac0eb9d27f73d240927db"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "24bcdf22c9887b6272289fc74ec9b7c5ca210fd6"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "f35e3874fc5be4fe09af9562ba1ba10cb2d1adf8"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4d334079f0314f3ec7ad201b3ff3a47c096820c7"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "961b37b14ffcb9d627c82b39b7c62d75986e6476"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "31a06884815086e2c2e5f2e346b645e7831bbe0f"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "06cc7e7827a7426ce5dfb067475ff3bf7ba7abd2"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "f842a69f2b9ac552227fc70c9f83851d6e493111"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e17faa31f58ece35cc00b28b3c94e4b2ce302a51"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "feab880c09ad8b7cda7cae61886da651c21e54e6"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "b67854a2dbe447cca7b367916c11acccb17e56d3"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "b30851acdbaba53791698277d4285da3229707ae"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "398bcfbec858de749c6f8e4a7361ed97962653e9"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "27166890fc8b804fe092fad68b04c59ee9705b70"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "542d2872ef5ca6d9e61dd632f1f4c00d9e1b63c8"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e7f8aac338aa457bc8de8dc68e7d8f0af6303420"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ffe67b7988f74e557ce83f62eaa692a86b5e8dc2"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "e9ea70c45439fd09a8b36694a9e59d7161aa6341"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "7cae4e75d12f484799569bbfba2a534e5d0b2ab1"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c907e3c10dddfb313c7570fe8232c74673d2fc93"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "53c9cb92486c5b166e6e93fa688b82e0c4e39af1"; }
-    { locale = "zu"; arch = "linux-i686"; sha1 = "d1aad06eeebd135c65092f78d50f2b9c64705320"; }
+    { locale = "zu"; arch = "linux-i686"; sha1 = "1c5dfd0b0ed74bbbc70f005e82f3715463ac36ac"; }
-    { locale = "zu"; arch = "linux-x86_64"; sha1 = "2fbb2d086c8260dda2485c430143a53c4f1383f0"; }
+    { locale = "zu"; arch = "linux-x86_64"; sha1 = "44cdce366e31abb691676f9effc8f6bfb6b3b9f4"; }
   ];
 }

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

@@ -15,14 +15,14 @@
 
 assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
-let version = "33.0.2"; in
+let version = "33.0.3"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "60657ba123df85a632822974d8f914cc8c35a738";
+    sha1 = "88b8380f0c0929a8beb892e6169e8e5d4bf5f62f";
   };
 
   buildInputs =

pkgs/applications/office/ledger/default.nix

@@ -2,16 +2,18 @@
 , texinfo, gnused }:
 
 let
-  rev = "5961384";
+  version = "3.1";
 in
 
 stdenv.mkDerivation {
-  name = "ledger-3.0.4.${rev}";
+  name = "ledger-${version}";
 
+  # NOTE: fetchgit because ledger has submodules not included in the
+  # default github tarball.
   src = fetchgit {
-    url = "git://github.com/ledger/ledger.git";
+    url = "https://github.com/ledger/ledger.git";
-    inherit rev;
+    rev = "refs/tags/v${version}";
-    sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q";
+    sha256 = "1l5y4k830jyw7n1nnhssci3qahq091fj5cxcr77znk20nclz851s";
   };
 
   buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ];

pkgs/applications/office/libreoffice/default.nix

@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
     tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../
-    ln -sv ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
+    ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
     tar xf $sourceRoot/src/${srcs.translations.name} -C $sourceRoot/../
   '';
 

pkgs/applications/office/pinpoint/default.nix

@@ -0,0 +1,19 @@
+{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst
+, gdk_pixbuf, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "pinpoint-${version}";
+  version = "0.1.4";
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.bz2";
+    sha256 = "26df7ba171d13f697c30c272460989b0f1b45e70c797310878a589ed5a6a47de";
+  };
+  buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf
+                  cairo ];
+
+  meta = {
+    homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint;
+    description = "A tool for making hackers do excellent presentations";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}

pkgs/applications/science/logic/alt-ergo/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ocaml, ocamlPackages, gmp }:
+{ fetchurl, stdenv, ocaml, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   name = "alt-ergo-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with ocamlPackages;
-    [ ocaml findlib ocamlgraph zarith lablgtk gmp ];
+    [ ocaml findlib ocamlgraph zarith lablgtk ];
 
   meta = {
     description = "High-performance theorem prover and SMT solver";

pkgs/applications/science/logic/coq/8.3.nix

@@ -64,6 +64,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://coq.inria.fr";
     license = licenses.lgpl21;
+    branch = "8.3";
     maintainers = with maintainers; [ roconnor vbgl ];
   };
 }

pkgs/applications/science/logic/coq/HEAD.nix

@@ -64,6 +64,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://coq.inria.fr";
     license = licenses.lgpl21;
+    branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
     platforms = platforms.unix;
   };

pkgs/applications/science/logic/coq/default.nix

@@ -64,6 +64,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://coq.inria.fr";
     license = licenses.lgpl21;
+    branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
     platforms = platforms.unix;
   };

pkgs/applications/version-management/subversion/default.nix

@@ -6,12 +6,12 @@
 , javahlBindings ? false
 , saslSupport ? false
 , stdenv, fetchurl, apr, aprutil, zlib, sqlite
-, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
+, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
 , sasl ? null, serf ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
-assert httpServer -> httpd != null;
+assert httpServer -> apacheHttpd != null;
 assert pythonBindings -> swig != null && python != null;
 assert javahlBindings -> jdk != null && perl != null;
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
-    ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
+    ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
     ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}

pkgs/build-support/cabal/default.nix

@@ -194,7 +194,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
                 test -f $i && break
               done
-              ghc --make -o Setup -odir $TMPDIR $i
+              ghc --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
               for p in $extraBuildInputs $propagatedNativeBuildInputs; do
                 if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
@@ -217,6 +217,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
                 configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
               ''}
+              ${optionalString (versionOlder "7.8" ghc.version && !self.isLibrary) ''
+                configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
+              ''}
 
               ${optionalString self.stdenv.isDarwin ''
                 configureFlags+=" --with-gcc=clang"

pkgs/data/fonts/hasklig/default.nix

@@ -0,0 +1,29 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "hasklig-0.4";
+
+  src = fetchurl {
+    url = "https://github.com/i-tu/Hasklig/releases/download/0.4/Hasklig-0.4.zip";
+    sha256 = "14j0zfapw6s6x5psp1rvx2i59rxdwb1jgwfgfhzhypr22qy40xi8";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp *.otf $out/share/fonts/opentype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/i-tu/Hasklig";
+    description = "A font with ligatures for Haskell code based off Source Code Pro";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ davidrusu ];
+  };
+}

pkgs/data/fonts/redhat-liberation-fonts/default.nix

@@ -1,19 +1,21 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, fontforge, pythonPackages, python}:
 
 stdenv.mkDerivation rec {
-  name = "liberation-fonts-1.04";
+  name = "liberation-fonts-2.00.1";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
-    sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f";
+    sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
   };
 
+  buildInputs = [ fontforge pythonPackages.fonttools python ];
+
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
 
     mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
+    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
   '';
 
   meta = {

pkgs/development/compilers/fpc/lazarus.nix

@@ -1,45 +1,55 @@
-args : with args; 
+{
-rec {
+stdenv, fetchurl
-  version = "1.2.6";
+, fpc
-  versionSuffix = "-0";
+, gtk, glib, pango, atk, gdk_pixbuf
-  src = fetchurl {
+, libXi, inputproto, libX11, xproto, libXext, xextproto
+, makeWrapper
+}:
+let
+  s =
+  rec {
+    version = "1.2.6";
+    versionSuffix = "-0";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
     sha256 = "1sjyc2l46hyd5ic5hr6vscy4qr9kazyhiyddy7bfs9vgf54fdiy0";
+    name = "lazarus-${version}";
   };
-
+  buildInputs = [
-  buildInputs = [fpc gtk glib libXi inputproto 
+    fpc gtk glib libXi inputproto
     libX11 xproto libXext xextproto pango atk
-    stdenv.gcc makeWrapper gdk_pixbuf];
+    stdenv.gcc makeWrapper gdk_pixbuf
-  configureFlags = [];
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
   makeFlags = [
-    "LAZARUS_INSTALL_DIR=$out/lazarus/"
-    "INSTALL_PREFIX=$out/"
     "FPC=fpc"
     "PP=fpc"
+    "REQUIRE_PACKAGES+=tachartlazaruspkg"
+    "bigide"
   ];
-
+  preBuild = ''
-  /* doConfigure should be specified separately */
+    export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/lazarus/ INSTALL_PREFIX=$out/"
-  phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s"
-
-  preBuild = fullDepEntry (''
-    export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo'
     export LCL_PLATFORM=gtk2
     mkdir -p $out/share "$out/lazarus"
     tar xf ${fpc.src} --strip-components=1 -C $out/share -m
     sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc
-  '') 
+  '';
-  ["minInit" "defEnsureDir" "doUnpack"];
+  postInstall = ''
-
-  postInstall = fullDepEntry (''
     wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \
     	--prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'"
-  '') ["doMakeInstall" "minInit" "defEnsureDir"];
+  '';
-
-  name = "lazarus-${version}";
   meta = {
+    inherit (s) version;
+    license = stdenv.lib.licenses.gpl2Plus ;
+    platforms = stdenv.lib.platforms.linux;
     description = "Lazarus graphical IDE for FreePascal language";
     homepage = http://www.lazarus.freepascal.org;
-    maintainers = [args.lib.maintainers.raskin];
+    maintainers = [stdenv.lib.maintainers.raskin];
-    #platforms = args.lib.platforms.linux;
   };
 }

pkgs/development/compilers/ghc/head.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
 
 stdenv.mkDerivation rec {
-  version = "7.9.20140814";
+  version = "7.9.20141106";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2";
+    url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2";
-    sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3";
+    sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz";
   };
 
   buildInputs = [ ghc perl gmp ncurses happy alex ];

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
+    branch = "3.12";
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Most popular variant of the Caml language";
 

pkgs/development/compilers/ocaml/4.00.1.nix

@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
+    branch = "4.00";
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Most popular variant of the Caml language";
 

pkgs/development/compilers/ocaml/4.01.0.nix

@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
+    branch = "4.01";
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Most popular variant of the Caml language";
 

pkgs/development/compilers/ocaml/4.02.0.nix

@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
+    branch = "4.02";
     license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Most popular variant of the Caml language";
 

pkgs/development/libraries/boost-process/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "boost-process-0.5";
+
+  src = fetchurl {
+    url = "http://www.highscore.de/boost/process0.5/process.zip";
+    sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
+  };
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    mkdir $name
+    cd $name
+    unzip $src
+  '';
+
+  installPhase = ''
+    mkdir -p $out/include
+    cp -r boost $out/include
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.highscore.de/boost/process0.5/";
+    description = "Library to manage system processes";
+    license = "boost-license";
+    platforms = platforms.unix;
+    maintainers = maintainers.abbradar;
+  };
+}

pkgs/development/libraries/ccnx/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, openssl, expat, libpcap }:
+let
+  version = "0.8.2";
+in
+stdenv.mkDerivation {
+  name = "ccnx-${version}";
+  src = fetchurl {
+    url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz";
+    sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00";
+  };
+  buildInputs = [ openssl expat libpcap ];
+  preConfigure = ''
+    mkdir -p $out/include
+    mkdir -p $out/lib
+    mkdir -p $out/bin
+    substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh"
+  '';
+  meta = with stdenv.lib; {
+    homepage = "http://www.ccnx.org/";
+    description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
+    longDescription = ''
+      To address the Internet’s modern-day requirements with a better
+      fitting model, PARC has created a new networking architecture
+      called Content-Centric Networking (CCN), which operates by addressing
+      and delivering Content Objects directly by Name instead of merely
+      addressing network end-points. In addition, the CCN security model
+      explicitly secures individual Content Objects rather than securing
+      the connection or “pipe”. Named and secured content resides in
+      distributed caches automatically populated on demand or selectively
+      pre-populated. When requested by name, CCN delivers named content to
+      the user from the nearest cache, thereby traversing fewer network hops,
+      eliminating redundant requests, and consuming less resources overall.
+    '';
+    license = licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.sjmackenzie ];
+  };
+}

pkgs/development/libraries/cppzmq/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "cppzmq";
+
+  src = fetchgit {
+    url = "https://github.com/zeromq/cppzmq";
+    rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819";
+    sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da";
+  };
+
+  installPhase = ''
+    install -Dm644 zmq.hpp $out/include/zmq.hpp
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/zeromq/cppzmq;
+    license = licenses.bsd2;
+    description = "C++ binding for 0MQ";
+    maintainers = maintainers.abbradar;
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/double-conversion/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "double-conversion-1.1.5";
+
+  src = fetchurl {
+    url = "https://double-conversion.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0hnlyn9r8vd9b3dafnk01ykz4k7bk6xvmvslv93as1cswf7vdvqv";
+  };
+
+  unpackPhase = ''
+    mkdir $name
+    cd $name
+    tar xzf $src
+  '';
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Binary-decimal and decimal-binary routines for IEEE doubles";
+    homepage = https://code.google.com/p/double-conversion/;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = maintainers.abbradar;
+  };
+}

pkgs/development/libraries/folly/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog
+, google-gflags, python, libiberty }:
+
+stdenv.mkDerivation rec {
+  name = "folly-12";
+
+  src = fetchgit {
+    url = "https://github.com/facebook/folly";
+    rev = "8d3b079a75fe1a8cf5811f290642b4f494f13822";
+    sha256 = "005fa202aca29c3a6757ae3bb050a6e4e5e773a1439f5803257a5f9e3cc9bdb6";
+  };
+
+  buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags ];
+
+  nativeBuildInputs = [ autoreconfHook python boost ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/folly";
+  preBuild = ''
+    patchShebangs build
+  '';
+
+  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A YAML parser and emitter for C++";
+    homepage = https://code.google.com/p/yaml-cpp/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = maintainers.abbradar;
+  };
+}

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

@@ -1,22 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck
+{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5
-, random, regexCompat, time, Unixutils, zlib
+, QuickCheck, random, regexCompat, time, Unixutils, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "Extra";
-  version = "1.46.1";
+  version = "1.46.3";
-  sha256 = "0dgj72s60mhc36x7hpfdcdvxydq5d5aj006gxma9zz3hqzy5nnz9";
+  sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
   buildDepends = [
-    bzlib filepath HUnit mtl network pureMD5 QuickCheck random
+    bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random
     regexCompat time Unixutils zlib
   ];
   meta = {
-    homepage = "http://src.seereason.com/haskell-extra";
+    homepage = "https://github.com/ddssff/haskell-extra";
     description = "A grab bag of modules";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    broken = true;
   };
 })

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

@@ -6,14 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "HaTeX";
-  version = "3.14.0.0";
+  version = "3.15.0.0";
-  sha256 = "0vbwhj031ny2vkp5hjxihlmpxaqy1far2nmxfzl1bv6rx0sqfjbg";
+  sha256 = "1rhxml458d8y0vxns2rp76yvfk66496mvab81i71km653n6g5kky";
   buildDepends = [
     matrix parsec QuickCheck text transformers wlPprintExtras
   ];
   testDepends = [ QuickCheck tasty tastyQuickcheck text ];
   meta = {
-    homepage = "http://daniel-diaz.github.io/projects/hatex";
+    homepage = "http://wrongurl.net/haskell/HaTeX";
     description = "The Haskell LaTeX library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/atomic-primops/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.6.0.6";
+  version = "0.6.1";
-  sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb";
+  sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7";
   buildDepends = [ primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "4.1.1.1";
+  version = "4.2";
-  sha256 = "0b31q6ypndaj6fa9cnkld5k0x3lncp9i28vfkkh6vv4jnnjd6pqi";
+  sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6";
   buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";

pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "0q6x0mb24yslgqjazg443v9w15x3j4xn32m6p9iwbmafyfbp9vs4";
+  sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void

pkgs/development/libraries/haskell/classy-prelude/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "1x22kq808ncgbi32idwn2232fy0hji3a7p9l9ardpg7hb6q1w76g";
+  sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k";
   buildDepends = [
     basicPrelude bifunctors chunkedData enclosedExceptions exceptions
     hashable liftedBase monoTraversable mtl primitive semigroups stm

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

@@ -1,15 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
-, conduitExtra, hspec, monadControl, monoTraversable, mwcRandom
+, conduitExtra, hspec, monadControl, monoTraversable, mtl
-, primitive, resourcet, silently, systemFileio, systemFilepath
+, mwcRandom, primitive, QuickCheck, resourcet, safe, silently
-, text, transformers, transformersBase, unixCompat, vector, void
+, systemFileio, systemFilepath, text, transformers
+, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.8.3";
+  version = "0.3.0";
-  sha256 = "1a3dysrxg7mhm9naqj6vq45k0vxihar7pn650rb8aw22k85ifmkz";
+  sha256 = "1ggdzll71a05743x3a8y1n43ais85simlqsng9da2z3qa42a9dz9";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet
@@ -17,8 +18,9 @@ cabal.mkDerivation (self: {
     unixCompat vector void
   ];
   testDepends = [
-    base16Bytestring base64Bytestring chunkedData hspec monoTraversable
+    base16Bytestring base64Bytestring chunkedData conduit hspec
-    mwcRandom silently systemFilepath text transformers vector
+    monoTraversable mtl mwcRandom QuickCheck safe silently
+    systemFilepath text transformers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/conduit-combinators";

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

@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, QuickCheck, resourcet, transformers, transformersBase, void
+, QuickCheck, resourcet, safe, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.2.1";
+  version = "1.2.2";
-  sha256 = "0pcnaqvavy289cmsp6mfapc350p9sq2fq8aq9lv5a256nxq2qffa";
+  sha256 = "04wx9c7lybqmrvhw8h6zb9vp5qyqfs9p7a9a2m2yicf1p3p0q4n8";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void
   ];
   testDepends = [
-    exceptions hspec mtl QuickCheck resourcet transformers void
+    exceptions hspec mtl QuickCheck resourcet safe transformers void
   ];
   doCheck = false;
   meta = {

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

@@ -0,0 +1,37 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiTerminal, binary, dataAccessor, deepseq
+, distributedProcess, distributedStatic, fingertree, hashable
+, HUnit, mtl, network, networkTransport, networkTransportTcp
+, QuickCheck, rematch, stm, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-platform";
+  version = "0.1.0";
+  sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary dataAccessor deepseq distributedProcess fingertree hashable
+    mtl stm time transformers unorderedContainers
+  ];
+  testDepends = [
+    ansiTerminal binary dataAccessor deepseq distributedProcess
+    distributedStatic fingertree hashable HUnit mtl network
+    networkTransport networkTransportTcp QuickCheck rematch stm
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 time
+    transformers unorderedContainers
+  ];
+  hyperlinkSource = false;
+  jailbreak = true;
+  doCheck = false;
+  patchPhase = "mv Setup.hs Setup.lhs";
+  meta = {
+    homepage = "http://github.com/haskell-distributed/distributed-process-platform";
+    description = "The Cloud Haskell Application Platform";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "2.1.1";
+  version = "2.1.2";
-  sha256 = "0nr18wjih1rbkprr7cvacgnk0m05m79l0sd25fihy5fy7sqqh3yw";
+  sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "extra";
-  version = "0.6";
+  version = "0.7";
-  sha256 = "1mayrzlk6kycdwcag60pzas5cmbhlxid1bkfsaqa371bfjs79zpn";
+  sha256 = "11839h4915xjgmz8av60pn8qaw3b0ckbpw4l9nq5a77qb9rgpbfs";
   buildDepends = [ filepath time ];
   testDepends = [ filepath QuickCheck time ];
   meta = {

pkgs/development/libraries/haskell/fixed-vector/default.nix

@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, doctest, filemanip, primitive }:
+
+cabal.mkDerivation (self: {
+  pname = "fixed-vector";
+  version = "0.7.0.0";
+  sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf";
+  buildDepends = [ primitive ];
+  testDepends = [ doctest filemanip primitive ];
+  meta = {
+    description = "Generic vectors with statically known size";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/generic-aeson/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-aeson";
-  version = "0.2.0.1";
+  version = "0.2.0.2";
-  sha256 = "0k5zkfmwffdv4q0c9zgysq4654gjwnz1nbl37y8aq7g3rsfzfbf5";
+  sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh";
   buildDepends = [
     aeson attoparsec genericDeriving mtl tagged text
     unorderedContainers vector

pkgs/development/libraries/haskell/generic-deriving/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.6.3";
+  version = "1.7.0";
-  sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67";
+  sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hindent";
-  version = "3.9";
+  version = "3.9.1";
-  sha256 = "0x8qm39rmaw1s0fbljr9zp6vnqxfcs1w6a3ylrknwqgwbzzr5hbn";
+  sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ];

pkgs/development/libraries/haskell/hspec-meta/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.12.2";
+  version = "1.12.3";
-  sha256 = "1gx62pqii2y29wxk6krzrwj18xp15y3qxyvnkkgcq9j984146zfs";
+  sha256 = "106wzvramjw18a2wvmfik3z47zshq7yalgax389gx340g3wnrfp7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.12.2";
+  version = "1.12.3";
-  sha256 = "1ika9qqw8y9j95db9xgjsfj9s9jb56hq962mwbpx1pl5d15m5262";
+  sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/json-schema/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json-schema";
-  version = "0.7.0.2";
+  version = "0.7.1.1";
-  sha256 = "1yh5zq10d0lyn67p5n3q445rcm18rdagj6pi2ic7fpyh9bks2r12";
+  sha256 = "1fzlavgx60gzqvk5h1wb0igz5qjb52zcxnmm48pwmbcjl9d6j57v";
   buildDepends = [
     aeson genericAeson genericDeriving mtl scientific tagged text time
     unorderedContainers vector

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json";
-  version = "0.7";
+  version = "0.8";
-  sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk";
+  sha256 = "0ddwgp54drnv4d6jss1fp1khg0d463fz7lasx75fc0bxzjq6ln2w";
   buildDepends = [ mtl parsec syb text ];
   meta = {
     description = "Support for serialising Haskell to and from JSON";

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.7.2";
+  version = "0.3.8";
-  sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda";
+  sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text

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

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "2.1.0.2";
+  version = "2.1.1";
-  sha256 = "15g0y7vmzihg6cxym5drzbk8jzpp8cqkfvnvmd395fa2ki2acxm7";
+  sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     exceptions fastLogger liftedBase monadControl monadLogger mtl

pkgs/development/libraries/haskell/pipes-shell/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-shell";
-  version = "0.1.2";
+  version = "0.1.3";
-  sha256 = "18ikjkppds7k9fgjn39qvdp8avj8vv3csiqcrhgrpfqy1d0hgrlw";
+  sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
   buildDepends = [
     async pipes pipesBytestring pipesSafe stm stmChans text
   ];

pkgs/development/libraries/haskell/pipes-text/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-text";
-  version = "0.0.0.12";
+  version = "0.0.0.13";
-  sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m";
+  sha256 = "1sqwrs5y9s16zikwb5w21fvrqf06ld0915kc065ikdcrd6z4sk43";
   buildDepends = [
     pipes pipesBytestring pipesGroup pipesParse pipesSafe
     streamingCommons text transformers

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

@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, HUnit }:
+
+cabal.mkDerivation (self: {
+  pname = "rematch";
+  version = "0.2.0.0";
+  sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
+  testDepends = [ hspec HUnit ];
+  doCheck = false;
+  meta = {
+    description = "A simple api for matchers";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shell-conduit";
-  version = "4.3";
+  version = "4.4";
-  sha256 = "1f82ncdsi4w63r48aj7679hii0hkd46drdz3bdgwxqx2yynjmlj8";
+  sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8";
   buildDepends = [
     async conduit conduitExtra controlMonadLoop filepath monadControl
     monadsTf resourcet semigroups split text these transformers

pkgs/development/libraries/haskell/snaplet-redis/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-redis";
-  version = "0.1.4";
+  version = "0.1.4.1";
-  sha256 = "1xyff7hsafxjyiifm7fb2d43sscrzqrn3gxfdjzgrhf8b3ayi01y";
+  sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2";
   buildDepends = [
     configurator hedis lens mtl network snap text transformers
   ];

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.7.2";
+  version = "0.7.3";
-  sha256 = "06w7gss2vqnly2zijf0hkq60jx13nsxwsjsnyfbn25r4f6gjsnq5";
+  sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";

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

@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, text }:
+
+cabal.mkDerivation (self: {
+  pname = "text-binary";
+  version = "0.1.0";
+  sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
+  buildDepends = [ binary text ];
+  meta = {
+    homepage = "https://github.com/kawu/text-binary";
+    description = "Binary instances for text types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.5.3";
+  version = "0.3.5.4";
-  sha256 = "1gfqj9rsjmc8gdg2qrzdnjnjdwdls55k061qh82ihwa6l7nfkjv1";
+  sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace vectorThUnbox

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

@@ -21,12 +21,12 @@ cabal.mkDerivation (self: {
     temporary testFramework testFrameworkHunit text
   ];
   doCheck = false;
+  patches = [ ./lens-4.5.patch ];
   meta = {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
   };
 })

pkgs/development/libraries/haskell/wreq/lens-4.5.patch

@@ -0,0 +1,15 @@
+diff --git a/Network/Wreq/Lens/Machinery.hs b/Network/Wreq/Lens/Machinery.hs
+index 782d965..0c97d27 100644
+--- a/Network/Wreq/Lens/Machinery.hs
++++ b/Network/Wreq/Lens/Machinery.hs
+@@ -13,8 +13,8 @@ import Language.Haskell.TH.Syntax (Dec, Name, Q, mkName, nameBase)
+ defaultRules :: LensRules
+ defaultRules = lensRules
+
+-fieldName :: (String -> String) -> [Name] -> Name -> [DefName]
+-fieldName f _ name = [TopName . mkName . f . nameBase $ name]
++fieldName :: (String -> String) -> Name -> [Name] -> Name -> [DefName]
++fieldName f _ _ name = [TopName . mkName . f . nameBase $ name]
+
+ makeLenses :: Name -> Q [Dec]
+ makeLenses = makeLensesWith (defaultRules & lensField .~ fieldName id)

pkgs/development/libraries/haskell/yi-rope/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yi-rope";
-  version = "0.6.0.0";
+  version = "0.7.0.0";
-  sha256 = "1r52mybqzy28zsv6r6a0cfmi8qaiscc91q2dhfq8rlp63l7ghq36";
+  sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2";
   buildDepends = [
     binary charsetdetectAe dataDefault deepseq fingertree text textIcu
   ];

pkgs/development/libraries/ldb/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, tdb, talloc, tevent
+, popt, libxslt, docbook_xsl, docbook_xml_dtd_42
+, acl ? null, heimdal ? null, libaio ? null, libcap ? null, libgcrypt ? null
+, sasl ? null, pam ? null, zlib ? null, openldap ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "ldb-1.1.17";
+
+  src = fetchurl {
+    url = "http://samba.org/ftp/ldb/${name}.tar.gz";
+    sha256 = "1rmnppbk06aa1kfdrxi4xyjw2zzx54jqyz95dmqn754ys6m158xr";
+  };
+
+  buildInputs = [
+    python27 pkgconfig readline gettext tdb talloc tevent popt
+    libxslt docbook_xsl docbook_xml_dtd_42
+    acl heimdal libaio libcap libgcrypt sasl pam zlib openldap
+  ];
+
+  preConfigure = ''
+    sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf
+  '';
+
+  configureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "a LDAP-like embedded database";
+    homepage = http://ldb.samba.org/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/libcouchbase/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, autoconf, automake, libtool,
+pkgconfig, perl, git, libevent, openssl}:
+
+stdenv.mkDerivation {
+  name = "libcouchbase-2.4.1";
+  src = fetchgit {
+    url = "https://github.com/couchbase/libcouchbase.git";
+    rev = "bd3a20f9e18a69dca199134956fd4ad3e1b80ca8";
+    sha256 = "0gimvfxvbmhm6zy4vgs2630ygilhryxl8apfmv3iqs23pafwzm8r";
+    leaveDotGit = true;
+  };
+
+  preConfigure = ''
+    patchShebangs ./config/
+    ./config/autorun.sh
+  '';
+
+  configureFlags = "--disable-couchbasemock";
+
+  buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
+
+  meta = {
+    description = "C client library for Couchbase.";
+    homepage = "https://github.com/couchbase/libcouchbase";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.unix;
+
+  };
+}

pkgs/development/libraries/libgsystem/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
+, glib, attr, systemd
+}:
+
+stdenv.mkDerivation {
+  name = "libgsystem-2014.2";
+
+  meta = with stdenv.lib; {
+    description = "GIO-based library with Unix/Linux specific API";
+    homepage    = "https://wiki.gnome.org/Projects/LibGSystem";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "GNOME";
+    repo = "libgsystem";
+    rev = "v2014.2";
+    sha256 = "10mqyy94wbmxv9rizwby4dyvqgranjr3hixr5k7fs90lhgbxbkj6";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig gtk_doc gobjectIntrospection
+  ];
+
+  propagatedBuildInputs = [ glib attr systemd ];
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+}

pkgs/development/libraries/libiberty/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "4.8.3";
+  name = "libiberty-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka";
+  };
+
+  postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
+
+  enable_shared = 1;
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp pic/libiberty.a $out/lib/libiberty_pic.a
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://gcc.gnu.org/;
+    license = licenses.lgpl2;
+    description = "Collection of subroutines used by various GNU programs";
+    maintainers = maintainers.abbradar;
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/libxls/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "libxls-1.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libxls/${name}.zip";
+    sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Extract Cell Data From Excel xls files";
+    homepage = http://libxls.sourceforge.net/;
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = maintainers.abbradar;
+  };
+}

pkgs/development/libraries/talloc/default.nix

@@ -1,24 +1,37 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, libxslt, docbook_xsl
+, docbook_xml_dtd_42
+, acl ? null, heimdal ? null, libaio ? null, pam ? null, zlib ? null
+, libgcrypt ? null, libcap ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.0.1";
+  name = "talloc-2.1.1";
 
   src = fetchurl {
     url = "http://samba.org/ftp/talloc/${name}.tar.gz";
-    sha256 = "1d694zyi451a5zr03l5yv0n8yccyr3r8pmzga17xaaaz80khb0av";
+    sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y";
   };
 
-  configureFlags = "--enable-talloc-compat1 --enable-largefile";
+  buildInputs = [
-  
+    python27 pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42
-  # https://bugzilla.samba.org/show_bug.cgi?id=7000
+    acl heimdal libaio pam zlib libgcrypt libcap
-  postConfigure = if stdenv.isDarwin then ''
+  ];
-    substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -Wl,-install_name,"
-  '' else "";
 
-  meta = {
+  preConfigure = ''
+    sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf
+  '';
+
+  configureFlags = [
+    "--enable-talloc-compat1"
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ];
+
+  meta = with stdenv.lib; {
     description = "Hierarchical pool based memory allocator with destructors";
     homepage = http://tdb.samba.org/;
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
   };
 }

pkgs/development/libraries/tdb/default.nix

@@ -1,16 +1,32 @@
-{ fetchurl, stdenv, libxslt, libxml2, docbook_xsl }:
+{ stdenv, fetchurl, python27, pkgconfig, gettext, readline, libxslt
+, docbook_xsl, docbook_xml_dtd_42
+, libaio ? null, acl ? null, heimdal ? null, libcap ? null, sasl ? null, pam ? null, zlib ? null
+, libgcrypt ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.2.1";
+  name = "tdb-1.3.1";
 
   src = fetchurl {
     url = "http://samba.org/ftp/tdb/${name}.tar.gz";
-    sha256 = "1yndfc2hn28v78vgvrds7cjggmmhf9q5dcfklgdfvpsx9j9knhpg";
+    sha256 = "1qzcl8n57vpxwd8048djna3zwjy6ji56c2bnvmnr1hw0x1d9hagz";
   };
 
-  buildInputs = [ libxslt libxml2 docbook_xsl ];
+  buildInputs = [
+    python27 pkgconfig gettext readline libxslt docbook_xsl docbook_xml_dtd_42
+    libaio acl heimdal libcap sasl pam zlib libgcrypt
+  ];
 
-  meta = {
+  preConfigure = ''
+    sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf
+  '';
+
+  configureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ];
+
+  meta = with stdenv.lib; {
     description = "The trivial database";
     longDescription =
       '' TDB is a Trivial Database. In concept, it is very much like GDBM,
@@ -18,11 +34,9 @@ stdenv.mkDerivation rec {
          uses locking internally to keep writers from trampling on each
          other.  TDB is also extremely small.
       '';
-
     homepage = http://tdb.samba.org/;
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = licenses.lgpl3Plus;
-
+    maintainers = with maintainers; [ wkennington ];
-    maintainers = [ ];
+    platforms = platforms.all;
-    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/libraries/tevent/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, talloc
+, libxslt, docbook_xsl, docbook_xml_dtd_42
+, acl ? null, heimdal ? null, libaio ? null, libcap ? null, sasl ? null
+, pam ? null, zlib ? null, libgcrypt ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "tevent-0.9.22";
+
+  src = fetchurl {
+    url = "http://samba.org/ftp/tevent/${name}.tar.gz";
+    sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl";
+  };
+
+  buildInputs = [
+    python27 pkgconfig readline gettext talloc libxslt docbook_xsl
+    docbook_xml_dtd_42
+    acl heimdal libaio libcap sasl pam zlib libgcrypt
+  ];
+
+  preConfigure = ''
+    sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf
+  '';
+
+  configureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "an event system based on the talloc memory management library.";
+    homepage = http://tevent.samba.org/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/xlslib/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "2.4.0";
+  name = "xlslib-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip";
+    sha256 = "0h7qhxcc55cz3jvrfv4scjnzf5w9g97wigyviandi4ag54qjxjdc";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  setSourceRoot = "export sourceRoot=xlslib/xlslib";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "C++/C library to construct Excel .xls files in code";
+    homepage = http://xlslib.sourceforge.net/;
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = maintainers.abbradar;
+  };
+}

pkgs/development/ocaml-modules/camlimages/4.0.nix

@@ -32,6 +32,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    branch = "4.0";
     homepage = https://bitbucket.org/camlspotter/camlimages;
     description = "OCaml image processing library";
     license = licenses.lgpl2;

pkgs/development/ocaml-modules/camomile/0.8.2.nix

@@ -20,7 +20,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://camomile.sourceforge.net/;
     description = "A comprehensive Unicode library for OCaml";
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
+    branch = "0.8.2";
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/ocaml-modules/http/default.nix

@@ -1,20 +1,15 @@
 {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
-let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  pname = "ocaml-http";
-  version = "0.1.3";
-in
-
 stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  name = "ocaml-http-0.1.5";
 
   src = fetchurl {
-    url = "http://upsilon.cc/~zack/hacking/software/${pname}/${pname}-${version}.tar.gz";
+    url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz;
-    sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn";
+    sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws";
   };
 
-  buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4];
+  buildInputs = [ocaml findlib camlp4];
+  propagatedBuildInputs = [ocaml_pcre ocamlnet];
 
   createFindlibDestdir = true;
 
@@ -31,7 +26,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/";
+    homepage = http://ocaml-http.forge.ocamlcore.org/;
+    platforms = ocaml.meta.platforms;
     description = "do it yourself (OCaml) HTTP daemon";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ roconnor vbgl ];

pkgs/development/ocaml-modules/lablgtk/2.14.0.nix

@@ -25,6 +25,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = {
+    branch = "2.14";
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/ocaml-modules/ocamlnet/default.nix

@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocamlnet-3.7.6";
+  name = "ocamlnet-3.7.7";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz;
+    url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz;
-    sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji";
+    sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv";
   };
 
   buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];

pkgs/development/ocaml-modules/sexplib/108.08.00.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
+    branch = "108";
     homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
     license = licenses.asl20;

pkgs/development/ocaml-modules/typeconv/108.08.00.nix

@@ -21,7 +21,8 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
     description = "Support library for OCaml preprocessor type conversions";
-    #license = licenses.apl20; invalid license
+    license = licenses.asl20;
+    branch = "108";
     platforms = ocaml.meta.platforms;
     maintainers = with maintainers; [ z77z ];
   };

pkgs/development/ocaml-modules/zarith/default.nix

@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
   };
 
-  buildInputs = [ ocaml findlib pkgconfig gmp perl ];
+  buildInputs = [ ocaml findlib pkgconfig perl ];
+  propagatedBuildInputs = [ gmp ];
 
   patchPhase = ''
     substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl'

pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch

@@ -0,0 +1,25 @@
+https://github.com/pfig/net-amazon-s3/pull/42
+
+From 116d73235d8243ec4427e6d7bf1f14f7fb9129aa Mon Sep 17 00:00:00 2001
+From: Jay Hannah <jay.hannah@iinteractive.com>
+Date: Thu, 8 May 2014 02:29:14 +0000
+Subject: [PATCH] Patch for current versions of Moose: "Passing a list of
+ values to enum is deprecated. Enum values should be wrapped in an arrayref."
+
+---
+ lib/Net/Amazon/S3/Client/Object.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Net/Amazon/S3/Client/Object.pm b/lib/Net/Amazon/S3/Client/Object.pm
+index 08e48c6..106f2fd 100755
+--- a/lib/Net/Amazon/S3/Client/Object.pm
++++ b/lib/Net/Amazon/S3/Client/Object.pm
+@@ -16,7 +16,7 @@ enum 'AclShort' =>
+     [ qw(private public-read public-read-write authenticated-read) ];
+ 
+ enum 'StorageClass' =>
+-    qw(standard reduced_redundancy);
++    [ qw(standard reduced_redundancy) ];
+ 
+ has 'client' =>
+     ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 );

pkgs/development/python-modules/pycdio/add-cdtext-toc.patch

@@ -0,0 +1,52 @@
+diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc
+--- pycdio-0.20-orig/test/cdtext.toc	1970-01-01 01:00:00.000000000 +0100
++++ pycdio-0.20/test/cdtext.toc	2014-11-06 23:36:12.520708320 +0100
+@@ -0,0 +1,48 @@
++CD_DA
++
++// global CD-TEXT data
++
++CD_TEXT {
++
++  // Mapping from language number (0..7) used in 'LANGUAGE' statements 
++  // to language code.
++///  LANGUAGE_MAP {
++///    0 : EN  // 9 is the code for ENGLISH,
++///            // I don't know any other language code, yet
++///  }
++
++  // Language number should always start with 0
++  LANGUAGE 0 {
++    // Required fields - at least all CD-TEXT CDs I've seen so far have them.
++    TITLE "CD Title"
++    PERFORMER "Performer"
++    DISC_ID "XY12345"
++    UPC_EAN "" // usually empty
++
++    // Further possible items, all of them are optional
++    ARRANGER ""
++    SONGWRITER ""
++    MESSAGE "" 
++    GENRE "" // I'm not sure if this should be really ascii data
++  }
++}
++
++
++TRACK AUDIO
++// track specific CD-TEXT data
++CD_TEXT {
++  LANGUAGE 0 {
++    // if an item is defined for one track it should be defined for all tracks
++    TITLE "Track Title"
++
++    PERFORMER "Performer"
++    ISRC "US-XX1-98-01234"
++
++    ARRANGER ""
++    SONGWRITER ""
++    MESSAGE "" 
++  }
++}
++
++SILENCE 1:0:0
++

pkgs/development/tools/analysis/frama-c/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, ocamlPackages, graphviz
-, ltl2ba, coq, alt-ergo, gmp, why3 }:
+, ltl2ba, coq, alt-ergo, why3 }:
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with ocamlPackages; [
-    ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph gmp
+    ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
     lablgtk coq graphviz zarith why3 zarith
   ];
 

pkgs/development/tools/haskell/hasktags/default.nix

@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath json utf8String ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/MarcWeber/hasktags";
     description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";

pkgs/development/tools/haskell/hdevtools/default.nix

@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
   isLibrary = false;
   isExecutable = true;
-  patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; md5 = "256609d2d3f5b719caa0002ee579d169"; }) ];
+  patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "104vdw6qxl71fdg43ppv0hrg6k17zaijq73vap794178d3gb35al"; }) ];
   buildDepends = [ cmdargs ghcPaths network syb time ];
   meta = {
     homepage = "https://github.com/bitc/hdevtools/";

pkgs/development/tools/haskell/keter/default.nix

@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.3.5";
+  version = "1.3.5.1";
-  sha256 = "0jbf9x50gy9qja6gazh0lgyffz46a3wps6hbxppqmcicjhwbpvr5";
+  sha256 = "1g8cq74cjhy8r0435m4il0iak5g03jdiz40sn4801iy765rcylpv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [