Merge branch 'master.upstream' into staging.upstream

2015-08-09 13:34:18 -07:00 · 2015-08-09 13:34:18 -07:00 · 6e698f9c61
commit 6e698f9c61
parent d3ac5c534d 6cfff02b9b
61 changed files with 848 additions and 431 deletions
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@ -36,8 +36,10 @@ config = mkIf cfg.enable {
    preStart = ''
      if [ ! -d ${cfg.settingsDir} ] ; then
        mkdir -m 0750 -p ${cfg.settingsDir}
-        mkdir -m 0750 -p ${cfg.pidDir}
        chown -R gateone.gateone ${cfg.settingsDir}
+      fi
+      if [ ! -d ${cfg.pidDir} ] ; then
+        mkdir -m 0750 -p ${cfg.pidDir}
        chown -R gateone.gateone ${cfg.pidDir}
      fi
      '';
--- a/nixos/modules/services/networking/i2p.nix
+++ b/nixos/modules/services/networking/i2p.nix
@ -7,15 +7,7 @@ let
  homeDir = "/var/lib/i2p";
 in {
  ###### interface
-  options.services.i2p = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables i2p as a running service upon activation.
-        '';
-      };
-  };
+  options.services.i2p.enable = mkEnableOption "I2P router";

  ###### implementation
  config = mkIf cfg.enable {
--- a/nixos/modules/virtualisation/brightbox-config.nix
+++ b/nixos/modules/virtualisation/brightbox-config.nix
@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ];
+}
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@ -0,0 +1,166 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  diskSize = "20G";
+in
+{
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+
+  system.build.brightboxImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "brightbox-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/$diskImageBase
+              truncate $diskImage --size ${diskSize}
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
+              pushd $out
+              ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
+              rm $diskImageBase
+              popd
+            '';
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
+              --option build-users-group ""
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".label = "nixos";
+
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Google Compute.
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  systemd.services."fetch-ec2-data" =
+    { description = "Fetch EC2 Data";
+
+      wantedBy = [ "multi-user.target" "sshd.service" ];
+      before = [ "sshd.service" ];
+      wants = [ "ip-up.target" ];
+      after = [ "ip-up.target" ];
+
+      path = [ pkgs.wget pkgs.iproute ];
+
+      script =
+        ''
+          wget="wget -q --retry-connrefused -O -"
+
+          ${optionalString (config.networking.hostName == "") ''
+            echo "setting host name..."
+            ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname)
+          ''}
+
+          # Don't download the SSH key if it has already been injected
+          # into the image (a Nova feature).
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+              echo "obtaining SSH key..."
+              mkdir -m 0700 -p /root/.ssh
+              $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub
+              if [ $? -eq 0 -a -e /root/key.pub ]; then
+                  if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                      cat /root/key.pub >> /root/.ssh/authorized_keys
+                      echo "new key added to authorized_keys"
+                  fi
+                  chmod 600 /root/.ssh/authorized_keys
+                  rm -f /root/key.pub
+              fi
+          fi
+
+          # Extract the intended SSH host key for this machine from
+          # the supplied user data, if available.  Otherwise sshd will
+          # generate one normally.
+          $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+          key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
+          key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+          if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+              mkdir -m 0755 -p /etc/ssh
+              (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+              echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+          fi
+        '';
+
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+    };
+
+}
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
+{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
@ -15,21 +15,22 @@ let
  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.

  # Version to build.
-  tag = "4.0";
+  tag = "4.1";

  # Version info that is built into the binary. Keep in sync with 'tag'. The
  # last 8 digits is a (fake) commit id.
-  revision = "4.0-e1aa66cb3f";
+  revision = "4.1-fe672c8";

 in

 stdenv.mkDerivation rec {
  name = "ardour-${tag}";

-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "e1aa66cb3f";
-    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
+  src = fetchFromGitHub {
+    owner = "Ardour";
+    repo = "ardour";
+    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
+    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
  };

  buildInputs =
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:

-let version = "1.0.1"; in
+let version = "1.1.2"; in
 stdenv.mkDerivation {
  name = "dfasma-${version}";

  src = fetchFromGitHub {
-    sha256 = "16m6jnr49j525xxqiwmwni07rcdg92p0dcznd5bmzz34xsm0cbiz";
+    sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r";
    rev = "v${version}";
    repo = "dfasma";
    owner = "gillesdegottex";
@ -30,6 +30,10 @@ stdenv.mkDerivation {

  buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];

+  postPatch = ''
+    substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+  '';
+
  configurePhase = ''
    qmake DESTDIR=$out/bin dfasma.pro
  '';
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@ -7,11 +7,11 @@ let
  inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;

 in buildPythonPackage rec {
-  name = "gpodder-3.8.3";
+  name = "gpodder-3.8.4";

  src = fetchurl {
    url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c";
+    sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn";
  };

  buildInputs = [
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    mkdir "$out/bin"
+    mkdir -p "$out/bin"
    mkdir "$out/include"
-    mkdir "$out/share"
-    mkdir "$out/share/doc"
+    mkdir -p "$out/share/doc"

    make PREFIX="$out" install
    install -Dm755 convert4chan "$out/bin/convert4chan"
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:

 stdenv.mkDerivation rec {
-  version = "2.0.11";
+  version = "2.0.13";
  name = "pencil-${version}";

  src = fetchurl {
    url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3";
+    sha256 = "150jsaq27n01l0vf10jiyrlfm0canqhphdxi42di96b9zsfkphpk";

  };

--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -5,12 +5,12 @@
 }:

 stdenv.mkDerivation rec {
-  name = "calibre-2.33.0";
-  version = "2.33.0";
+  name = "calibre-${version}";
+  version = "2.34.0";

  src = fetchurl {
    url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9";
+    sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki";
  };

  inherit python;
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    Version=1.0
    Name=mupdf
    Comment=PDF viewer
-    Exec=$out/bin/mupdf-x11
+    Exec=$out/bin/mupdf-x11 %f
    Terminal=false
    EOF
  '';
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.13";
+  version = "0.4.14";
  name = "baresip-${version}";
  src=fetchurl {
    url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1mndpcclp5cqlm5jfbh37ig8dmga75qxqfinp4dyd1c0wnd0f0jg";
+    sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc";
  };
  buildInputs = [zlib openssl libre librem pkgconfig
    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@ -22,11 +22,11 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  name = "gajim-${version}";
-  version = "0.16.1";
+  version = "0.16.3";

  src = fetchurl {
    url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6";
+    sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51";
  };

  patches = [
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@ -13,15 +13,17 @@
  enableOfficialBranding ? false
 }:

-let version = "31.7.0"; in
+let version = "38.1.0"; in
 let verName = "${version}"; in

 stdenv.mkDerivation rec {
  name = "thunderbird-${verName}";

  src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede";
+    url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
+
+    # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS
+    sha1 = "7bb0c85e889e397e53dcbcbd36957dbd7c8c10bd";
  };

  buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
@ -75,6 +77,10 @@ stdenv.mkDerivation rec {
    cd objdir
    echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
    echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig
+    # From version 38, we need to specify the source directory to build
+    # Thunderbird. Refer to mozilla/configure and search a line with
+    # "checking for application to build" and "# Support comm-central".
+    echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig
    echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig
    echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig

--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -17,15 +17,16 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, gdb
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
 }:

 let
  langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  major = "4";
-  minor = "4";
-  patch = "4";
-  tweak = "3";
+  major = "5";
+  minor = "0";
+  patch = "0";
+  tweak = "5";
  subdir = "${major}.${minor}.${patch}";
  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";

@ -80,14 +81,14 @@ let

    translations = fetchSrc {
      name = "translations";
-      sha256 = "1zyfpbdsx0kjkabdpkf0lg7hjnvxsf6hj9ljs8v9iqw3x3b7llib";
+      sha256 = "0x86vf1fhgnjgkj25rqcfgrvid6smikmb96121sasydmg0jcsypm";
    };

    # TODO: dictionaries

    help = fetchSrc {
      name = "help";
-      sha256 = "1jbbbv63p63mwby52ynz2yk79pb32wsnakhxfhc75ng1br6cpll0";
+      sha256 = "18wqmbm3yvjz6pfnz5qfklwv4d53vrv2npiz3796d4d1j245ylcv";
    };

  };
@ -97,7 +98,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0wns7ny19bsl5ar1rq7n4033rfijl2cjn9l8bj1gwhpqlkd8db1i";
+    sha256 = "046f5lakw2rygs5qjmhsxmdw7pa9gwcamavnyqpk1rfbis2ga5wv";
  };

  # Openoffice will open libcups dynamically, so we link it directly
@ -148,6 +149,11 @@ stdenv.mkDerivation rec {
  postConfigure = ''
    sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
    sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+
+    # unit test sd_tiledrendering seems to be fragile
+    # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+    echo > ./sd/CppunitTest_sd_tiledrendering.mk
+    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
  '';

  makeFlags = "SHELL=${bash}/bin/bash";
@ -255,10 +261,10 @@ stdenv.mkDerivation rec {
      gst_all_1.gst-plugins-base
      neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
      python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc /*libixion*/
+      mdds bluez5 glibc
      libxshmfence libatomic_ops graphite2 harfbuzz
      librevenge libe-book libmwaw glm glew
-      /*liborcus*/ libodfgen
+      libodfgen
    ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@ -29,16 +29,6 @@
  md5 = "8ab049135b2d15313da5d9f0656894a1";
  brief = false;
 }
-{
-  name = "commons-logging-1.1.3-src.tar.gz";
-  md5 = "e8e197d628436490886d17cffa108fe3";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
 {
  name = "commons-logging-1.2-src.tar.gz";
  md5 = "ce977548f1cbf46918e93cd38ac35163";
@ -60,8 +50,8 @@
  brief = false;
 }
 {
-  name = "bsh-2.0b1-src.tar.gz";
-  md5 = "ea570af93c284aa9e5621cd563f54f4d";
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
  brief = false;
 }
 {
@ -105,8 +95,8 @@
  brief = false;
 }
 {
-  name = "curl-7.36.0.tar.bz2";
-  md5 = "e6d1f9d1b59da5062109ffe14e0569a4";
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
  brief = true;
 }
 {
@ -120,8 +110,8 @@
  brief = false;
 }
 {
-  name = "libetonyek-0.1.1.tar.bz2";
-  md5 = "805f941b06448212a988cb65f0691a7a";
+  name = "libetonyek-0.1.3.tar.bz2";
+  md5 = "e5947373dd7834f27e93f1636faa419f";
  brief = true;
 }
 {
@ -195,8 +185,8 @@
  brief = false;
 }
 {
-  name = "libfreehand-0.1.0.tar.bz2";
-  md5 = "5f029fef73e42a2c2ae4524a7513f97d";
+  name = "libfreehand-0.1.1.tar.bz2";
+  md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7";
  brief = true;
 }
 {
@ -220,8 +210,8 @@
  brief = true;
 }
 {
-  name = "harfbuzz-0.9.23.tar.bz2";
-  md5 = "a4a9b548577e2ee22f0887937da5fd6c";
+  name = "harfbuzz-0.9.40.tar.bz2";
+  md5 = "0e27e531f4c4acff601ebff0957755c2";
  brief = true;
 }
 {
@ -240,8 +230,8 @@
  brief = false;
 }
 {
-  name = "icu4c-53_1-src.tgz";
-  md5 = "b73baa6fbdfef197608d1f69300919b9";
+  name = "icu4c-54_1-src.tgz";
+  md5 = "e844caed8f2ca24c088505b0d6271bc0";
  brief = false;
 }
 {
@ -310,8 +300,8 @@
  brief = true;
 }
 {
-  name = "language-subtag-registry-2014-12-03.tar.bz2";
-  md5 = "0f2677ec23bb43ddc7355d1b4cc8ed45";
+  name = "language-subtag-registry-2015-06-08.tar.bz2";
+  md5 = "d431bd8a70455be1fa8523fa633c005b";
  brief = true;
 }
 {
@ -343,7 +333,6 @@
  name = "libgltf-0.0.2.tar.bz2";
  md5 = "d63a9f47ab048f5009d90693d6aa6424";
  brief = true;
-  subDir = "libgltf/";
 }
 {
  name = "liblangtag-0.5.1.tar.bz2";
@ -376,9 +365,9 @@
  brief = false;
 }
 {
-  name = "mdds_0.11.2.tar.bz2";
-  md5 = "cb4207cb913c7a5a8bfa5b91234618ee";
-  brief = false;
+  name = "mdds_0.12.1.tar.bz2";
+  md5 = "ef2560ed5416652a7fe195305b14cebe";
+  brief = true;
 }
 {
  name = "libmspub-0.1.2.tar.bz2";
@ -386,8 +375,8 @@
  brief = true;
 }
 {
-  name = "libmwaw-0.3.1.tar.bz2";
-  md5 = "6f1ac4a0e24131c422e1e91f07718fb6";
+  name = "libmwaw-0.3.5.tar.bz2";
+  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
  brief = true;
 }
 {
@ -406,13 +395,13 @@
  brief = false;
 }
 {
-  name = "nss-3.16.5-with-nspr-4.10.6.tar.gz";
-  md5 = "b279551b7638d0e36d1199548124c247";
+  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
+  md5 = "2100bc5a7ea9685928ff68cda2e60569";
  brief = false;
 }
 {
-  name = "libodfgen-0.1.1.tar.bz2";
-  md5 = "c22c83c17cda0754382ada4e116594b7";
+  name = "libodfgen-0.1.4.tar.bz2";
+  md5 = "8716be5c22ae8353f9aaa380d74840dc";
  brief = true;
 }
 {
@ -426,8 +415,8 @@
  brief = false;
 }
 {
-  name = "openssl-1.0.1j.tar.gz";
-  md5 = "f7175c9cd3c39bb1907ac8bba9df8ed3";
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
  brief = true;
 }
 {
@ -526,8 +515,8 @@
  brief = true;
 }
 {
-  name = "libwps-0.3.1.tar.bz2";
-  md5 = "a111d9ef5a0dab564e9aec0f2cf8d218";
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
  brief = true;
 }
 {
@ -540,10 +529,4 @@
  md5 = "44d667c142d7cda120332623eab69f40";
  brief = true;
 }
-{
-  name = "libgltf-0.0.0.tar.bz2";
-  md5 = "ca5436e916bfe70694adfe2607782786";
-  brief = true;
-  subDir = "libgltf/";
-}
 ]
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:

 stdenv.mkDerivation {
-  name = "ng-spice-rework-25";
+  name = "ngspice-25";

  src = fetchurl {
    url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@ -3,11 +3,11 @@ let
  s = # Generated upstream information
  rec {
    baseName="eprover";
-    version="1.8";
+    version="1.9";
    name="${baseName}-${version}";
-    hash="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
-    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.8/E.tgz";
-    sha256="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
+    hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
+    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz";
+    sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
  };
 in
 stdenv.mkDerivation {
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -105,4 +105,6 @@ rec {
  git-cola = callPackage ./git-cola { };

  git-imerge = callPackage ./git-imerge { };
+
+  git-crypt = callPackage ./git-crypt { };
 }
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation rec {
+
+  name = "git-crypt-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "AGWA";
+    repo = "git-crypt";
+    rev = meta.version;
+    sha256 = "4fe45f903a4b3cc06a5fe11334b914c225009fe8440d9e91a54fdf21cf4dcc4d";
+    inherit name;
+  };
+
+  buildInputs = [ openssl ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = "https://www.agwa.name/projects/git-crypt";
+    description = "transparent file encryption in git";
+    longDescription = ''
+      git-crypt enables transparent encryption and decryption of files in a git
+      repository. Files which you choose to protect are encrypted when
+      committed, and decrypted when checked out. git-crypt lets you freely
+      share a repository containing a mix of public and private
+      content. git-crypt gracefully degrades, so developers without the secret
+      key can still clone and commit to a repository with encrypted files. This
+      lets you store your secret material (such as keys or passwords) in the
+      same repository as your code, without requiring you to lock down your
+      entire repository.
+    '';
+    downloadPage = "https://github.com/AGWA/git-crypt/releases";
+    license = stdenv.lib.licenses.gpl3;
+    version = "0.5.0";
+    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+  };
+
+}
--- a/pkgs/applications/window-managers/bar/default.nix
+++ b/pkgs/applications/window-managers/bar/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, libxcb }:

 let
-  version = "1.0";
+  version = "1.1";
 in
  stdenv.mkDerivation rec {
    name = "bar-${version}";
  
    src = fetchurl {
      url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
+      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
    };
  
    buildInputs = [ libxcb perl ];
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:

 stdenv.mkDerivation rec {
-  name = "font-awesome-4.3.0";
+  name = "font-awesome-4.4.0";

  src = fetchurl {
    url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd";
+    sha256 = "1bmjh3j533awihdxihvlk2d1ypzs9q7azj0viqbm0df8jj2v4rwq";
  };

  buildCommand = ''
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "1smf1mqciwavf29lwgzjam3xb37bwxp6wf6na4c9xv6islidsrd9";
+    sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
  };

  phases = ["installPhase"];
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -17,18 +17,20 @@ let
 in

 stdenv.mkDerivation rec {
-  version = "7.11.20150705";
+  version = "7.11.20150809";
  name = "ghc-${version}";
-  rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
+  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";

  src = fetchgit {
    url = "git://git.haskell.org/ghc.git";
    inherit rev;
-    sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
+    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
  };

  postUnpack = ''
    pushd ghc-${builtins.substring 0 7 rev}
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
    patchShebangs .
    ./boot
    popd
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@ -1,8 +1,8 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "1.1.0";
+  shortVersion = "1.2.0";
  isRelease = true;
-  srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8";
+  srcSha = "1zq2nhgaxkv1ghi3z2qgff6cylqirn33nphvkjiczlkjfi0pyw16";

  /* Rust is bootstrapped from an earlier built version. We need
  to fetch these earlier versions, which vary per platform.
@ -12,22 +12,22 @@ callPackage ./generic.nix {
  */

  # linux-i386
-  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";

  # linux-x86_64
-  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";

  # macos-i386
-  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";

  # macos-x86_64
-  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";

-  snapshotDate = "2015-04-27";
-  snapshotRev = "857ef6e";
+  snapshotDate = "2015-05-24";
+  snapshotRev = "ba0e1cd";

  patches = [
-    ./patches/beta.patch
+    ./patches/stable.patch
    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
  configureFlags = [ "--release-channel=stable" ];
 }
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@ -123,10 +123,6 @@ stdenv.mkDerivation {
  inherit patches;

  postPatch = ''
-    substituteInPlace src/librustc_trans/back/link.rs \
-      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"
-    substituteInPlace src/librustc_back/archive.rs \
-      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
    substituteInPlace src/librustc_back/target/mod.rs \
      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
--- a/pkgs/development/compilers/rustc/patches/beta.patch
+++ b/pkgs/development/compilers/rustc/patches/beta.patch
@ -1,43 +0,0 @@
-diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index ca59b1c..65ee7bf 100755
--- a/src/etc/local_stage0.sh
-+++ b/src/etc/local_stage0.sh
-@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then
- fi
- 
- cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
- 
- # do not fail if one of the above fails, as all we need is a working rustc!
- exit 0
-diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index ed44bf8..2b84627 100644
--- a/src/librustc_back/archive.rs
-+++ b/src/librustc_back/archive.rs
-@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
-           paths: &[&Path]) -> Output {
-     let ar = match *maybe_ar_prog {
-         Some(ref ar) => &ar[..],
-        None => "ar"
-+        None => "@arPath@"
-     };
-     let mut cmd = Command::new(ar);
- 
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 3087a8e..578448f 100644
--- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -352,7 +352,7 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
-        Some(ref linker) => return linker.to_string(),
-        None => sess.target.target.options.linker.clone(),
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string(),
-     }
- }
--- a/pkgs/development/compilers/rustc/patches/stable.patch
+++ b/pkgs/development/compilers/rustc/patches/stable.patch
@ -0,0 +1,28 @@
+diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
+index 402fbcd..8fe2de2 100644
+--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
+@@ -172,8 +172,8 @@ impl Default for TargetOptions {
+     /// incomplete, and if used for compilation, will certainly not work.
+     fn default() -> TargetOptions {
+         TargetOptions {
+-            linker: "cc".to_string(),
+-            ar: "ar".to_string(),
+            linker: "@ccPath@".to_string(), // ignore-tidy-linelength
+            ar: "@arPath@".to_string(), // ignore-tidy-linelength
+             pre_link_args: Vec::new(),
+             post_link_args: Vec::new(),
+             cpu: "generic".to_string(),
+diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
+index 2772fc8..3d37b08 100644
+--- a/src/test/run-pass/issue-20797.rs
+++ b/src/test/run-pass/issue-20797.rs
+@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
+ }
+ 
+ fn _foo() {
+-    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
+    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
+ }
+ 
+ fn main() {}
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name    = "sbcl-${version}";
-  version = "1.2.13";
+  version = "1.2.14";

  src = fetchurl {
    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6";
+    sha256 = "01jw1w5siv6q16y1vmgd7s1i22aq0cqaipgn12jvq18c8vb6s55r";
  };

  buildInputs = [ which ]
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -191,7 +191,7 @@ self: super: {
  vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;

  # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
-  # on darwin: https://github.com/NixOS/cabal2nix/issues/146
+  # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;

  # hfsevents needs CoreServices in scope
@ -271,6 +271,9 @@ self: super: {
  webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
  websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };

+  # While waiting for https://github.com/jwiegley/gitlib/pull/53 to be merged
+  hlibgit2 = addBuildTool super.hlibgit2 pkgs.git;
+
  # https://github.com/mvoidex/hsdev/issues/11
  hsdev = dontHaddock super.hsdev;

@ -321,6 +324,7 @@ self: super: {
  wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
  xkbcommon = dontCheck super.xkbcommon;
  xmlgen = dontCheck super.xmlgen;
+  ide-backend = dontCheck super.ide-backend;

  # These packages try to access the network.
  amqp = dontCheck super.amqp;
@ -763,7 +767,7 @@ self: super: {
  zlib = dontCheck super.zlib;

  # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = pkgs.cabal2nix;
+  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};

  # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
  HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
@ -913,13 +917,13 @@ self: super: {
  # https://github.com/bos/pcap/issues/5
  pcap = addExtraLibrary super.pcap pkgs.libpcap;

-  # https://github.com/bscarlet/llvm-general/issues/143
-  llvm-general-pure = dontCheck super.llvm-general-pure;
-
  # https://github.com/skogsbaer/hscurses/issues/24
  hscurses = markBroken super.hscurses;

  # https://github.com/qnikst/imagemagick/issues/34
  imagemagick = dontCheck super.imagemagick;

+  # https://github.com/liyang/thyme/issues/36
+  thyme = dontCheck super.thyme;
+
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@ -42,7 +42,22 @@ self: super: {
  cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });

  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
+  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+    version = "1.23.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "cabal";
+      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
+      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
+    };
+    jailbreak = false;
+    doHaddock = false;
+    postUnpack = "sourceRoot+=/Cabal";
+  });
+  jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
+    executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
+    preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
+  });

  idris =
    let idris' = overrideCabal super.idris (drv: {
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@ -2,7 +2,7 @@

 callPackage ./generic.nix (args // {
  baseVersion = "1.10";
-  revision = "9";
-  sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
+  revision = "10";
+  sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb";
  extraConfigureFlags = "--with-gnump";
 })
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@ -2,7 +2,7 @@

 callPackage ./generic.nix (args // {
  baseVersion = "1.11";
-  revision = "16";
-  sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
+  revision = "19";
+  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
  openssl = null;
 })
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "jsoncpp-${version}";
-  version = "1.6.2";
+  version = "1.6.5";

  src = fetchFromGitHub {
    owner = "open-source-parsers";
    repo = "jsoncpp";
    rev = version;
-    sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
+    sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
  };

  /* During darwin bootstrap, we have a cp that doesn't understand the
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j";
+    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
  };

  nativeBuildInputs = [ pkgconfig gettext ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
      MTP, and other vendor specific protocols for controlling and transferring data
      from digital cameras.
    '';
-    version = "2.5.7";
+    version = "2.5.8";
    # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
    license = stdenv.lib.licenses.lgpl21Plus;
    platforms = with stdenv.lib.platforms; unix;
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  version = "0.12.0";
+  version = "0.12.1";
  name = "mdds-${version}";

  src = fetchurl {
    url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
-    sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia";
+    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
  };

  postInstall = ''
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  meta = {
    inherit version;
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = "https://gitlab.com/mdds/mdds";
    description = "A collection of multi-dimensional data structure and indexing algorithm";
    platforms = stdenv.lib.platforms.all;
  };
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/pkgs/development/libraries/mdds/default.upstream
@ -1,4 +1,4 @@
-url https://code.google.com/p/multidimalgorithm/wiki/Downloads
+url https://gitlab.com/mdds/mdds
 version_link '[.]tar[.][a-z0-9]+$'
 version '.*_([0-9.]+)[.]tar[.].*' '\1'

--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@ -176,7 +176,9 @@ stdenv.mkDerivation rec {
  ++ optional (postgresql != null) postgresql
  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];

-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;

  nativeBuildInputs = [ python perl pkgconfig ];

--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@ -174,7 +174,9 @@ stdenv.mkDerivation {
  ++ optional (postgresql != null) postgresql
  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];

-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;

  nativeBuildInputs = [ python perl pkgconfig ];

--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
  name = "rocksdb-${version}";
-  version = "3.11.2";
+  version = "3.12.1";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "rocksdb";
    rev = "rocksdb-${version}";
-    sha256 = "0cjwr7n5l2wdzdv4b0p90k0ijg9ka28akpq2aqa8lknsa1kb1cyv";
+    sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa";
  };

  buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@ -1,16 +1,16 @@
-{stdenv, fetchurl, texinfo, texLive}:
+{stdenv, fetchurl, texinfo, texLive, perl}:
 let
  s = # Generated upstream information
  rec {
    baseName="asdf";
-    version="3.1.4";
+    version="3.1.5";
    name="${baseName}-${version}";
-    hash="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.4.tar.gz";
-    sha256="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
+    hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz";
+    sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
  };
  buildInputs = [
-    texinfo texLive
+    texinfo texLive perl
  ];
 in
 stdenv.mkDerivation {
@ -19,7 +19,6 @@ stdenv.mkDerivation {
  src = fetchurl {
    inherit (s) url sha256;
  };
-  sourceRoot=".";
  buildPhase = ''
    make build/asdf.lisp
    make -C doc asdf.info asdf.html
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:

 stdenv.mkDerivation rec {
-  version = "0.2.7-2015.04.20";
+  version = "0.2.8-2015.08.08";
  name = "pharo-launcher-${version}";
  src = fetchurl {
    url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    sha256 = "0qz8469hadlv6mj8b0hp0jas153alwmja7fr4099jv1b0sx4s0kf";
+    sha256 = "1cpjihdkywlqvjsvrpkkx7fx14wxi6yhymmayjbl0l7bpci0l7qm";
  };

  executable-name = "pharo-launcher";
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {

-  version = "2015.04.30";
+  version = "2015.08.06";

  name = "pharo-vm-core-i386-${version}";
  system = "x86_32-linux";
  src = fetchurl {
    url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv";
+    sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
  };

  sources10Zip = fetchurl {
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  version = "6.8.2";
+  version = "6.9";
  name = "checkstyle-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c";
+    sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70";
  };

  installPhase = ''
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin
    cat > $out/bin/sbt << EOF
    #! ${stdenv.shell}
+    if [ ! -v JAVA_HOME ]; then
+        export JAVA_HOME="${jre.home}"
+    fi
    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
    EOF
    chmod +x $out/bin/sbt
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@ -8,14 +8,14 @@

 mkDerivation rec {
  pname = "cabal2nix";
-  version = "20150807";
+  version = "20150807-6-g9f58996";
  src = fetchgit {
    url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "796dabfc3fb0a98174b680c5d722954096465103";
-    sha256 = "1blyjq80w9534ap4cg0m6awks0zj2135kxld1i9d2z88x1ijzx9v";
+    rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
+    sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
    deepClone = true;
  };
-  isLibrary = true;
+  isLibrary = false;
  isExecutable = true;
  libraryHaskellDepends = [
    aeson ansi-wl-pprint base bytestring Cabal containers
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@ -3,11 +3,11 @@ let
  s = # Generated upstream information
  rec {
    baseName="cl-launch";
-    version="4.1.3.3";
+    version="4.1.4";
    name="${baseName}-${version}";
-    hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz";
-    sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
+    hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz";
+    sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
  };
  buildInputs = [
  ];
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@ -0,0 +1,71 @@
+{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
+SDL2_mixer, freetype, gettext }:
+
+let architecture =
+      if stdenv.system == "i686-linux" then
+        "linux32"
+      else if stdenv.system == "x86_64-linux" then
+        "linux64"
+      else
+        abort "currently only linux 32-bit and 64-bit are supported";
+
+in stdenv.mkDerivation rec {
+  version = "0.C";
+  name = "cataclysm-dda-${version}";
+
+  src = fetchFromGitHub {
+    owner = "CleverRaven";
+    repo = "Cataclysm-DDA";
+    rev = "${version}";
+    sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv";
+  };
+
+  buildInputs = [ makeWrapper pkgconfig ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ];
+
+  patchPhase = ''
+    patchShebangs .
+    substituteAllInPlace lang/compile_mo.sh \
+      --replace msgfmt ${gettext}/msgfmt
+    sed -i -e 's|DATA_PREFIX=$(PREFIX)/share/cataclysm-dda/|DATA_PREFIX=$(PREFIX)/share/|g' Makefile
+  '';
+
+  makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
+
+  postInstall = ''
+    wrapProgram $out/bin/cataclysm-tiles \
+      --add-flags "--datadir $out/share/"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A free, post apocalyptic, zombie infested rogue-like";
+    longDescription = ''
+      Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.
+      Surviving is difficult: you have been thrown, ill-equipped, into a
+      landscape now riddled with monstrosities of which flesh eating zombies are
+      neither the strangest nor the deadliest.
+
+      Yet with care and a little luck, many things are possible. You may try to
+      eke out an existence in the forests silently executing threats and
+      providing sustenance with your longbow. You can ride into town in a
+      jerry-rigged vehicle, all guns blazing, to settle matters in a fug of
+      smoke from your molotovs. You could take a more measured approach and
+      construct an impregnable fortress, surrounded by traps to protect you from
+      the horrors without. The longer you survive, the more skilled and adapted
+      you will get and the better equipped and armed to deal with the threats
+      you are presented with.
+
+      In the course of your ordeal there will be opportunities and temptations
+      to improve or change your very nature. There are tales of survivors fitted
+      with extraordinary cybernetics giving great power and stories too of
+      gravely mutated survivors who, warped by their ingestion of exotic
+      substances or radiation, now more closely resemble insects, birds or fish
+      than their original form.
+    '';
+    homepage = http://en.cataclysmdda.com/;
+    license = licenses.cc-by-sa-30;
+    maintainers = [ maintainers.skeidel ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@ -3,10 +3,10 @@ let
  inherit (stdenv.lib) optional optionalString;
  s = rec {
    baseName="sysdig";
-    version = "0.1.101";
+    version = "0.1.102";
    name="${baseName}-${version}";
    url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9";
+    sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0";
  };
  buildInputs = [
    cmake zlib luajit ncurses
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@ -3,10 +3,10 @@ let
  s = # Generated upstream information
  rec {
    baseName="apache-jena";
-    version = "2.13.0";
+    version = "3.0.0";
    name="${baseName}-${version}";
    url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d";
+    sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb";
  };
  buildInputs = [
    makeWrapper
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@ -4,7 +4,7 @@

 with stdenv.lib;

-let version = "3.0.4";
+let version = "3.0.5";
    system-libraries = [
      "pcre"
      "wiredtiger"
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "0q23hvi0axc14s1ah1p67rxvi36skw34kj9ahpijx2dd2a5smrvd";
+    sha256 = "1nvzbxgyjsp72w4fvfd8zxpj38zv0whn5p53jv9v2rdaj5wnmc85";
  };

  nativeBuildInputs = [ scons ];
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@ -213,6 +213,7 @@ stdenv.mkDerivation {
    (mkWith   true                         "rgw-user"             "rgw")
    (mkWith   true                         "rgw-group"            "rgw")
    (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
+    (mkWith   false                        "selinux"              null)  # TODO: Implement
  ];

  preBuild = optionalString (versionAtLeast version "9.0.0") ''
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:

 callPackage ./generic.nix (args // rec {
-  version = "2015-08-05";
+  version = "2015-08-07";

  src = fetchgit {
-    url = "git://github.com/wkennington/ceph.git";
-    rev = "043a780feb973b7ad571bb696437476da3260133";
-    sha256 = "02kk24wm6mxsclklsz5zzpj3wm6f341blj2anx3v5x20cixzdnhp";
+    url = "git://github.com/ceph/ceph.git";
+    rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37";
+    sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m";
  };

  patches = [ ./fix-pythonpath.patch ];
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@ -6,11 +6,11 @@ let
  s = # Generated upstream information 
  rec {
    baseName="glusterfs";
-    version="3.7.2";
+    version="3.7.3";
    name="${baseName}-${version}";
-    hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz";
-    sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
+    hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz";
+    sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
  };
  buildInputs = [
    fuse bison flex_2_5_35 openssl python ncurses readline
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
  name = "chrony-${version}";

-  version = "1.31";
+  version = "2.1.1";
  
  src = fetchurl {
    url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3";
+    sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4";
  };
  
  buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap;
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@ -1,10 +1,10 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:

 stdenv.mkDerivation rec {
-  name = "i2p-0.9.20";
+  name = "i2p-0.9.21";
  src = fetchurl {
    url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s";
+    sha256 = "1cgki9sg0pc4d66rr556lw0682c4mmdvmr6awvsn7ch0rp4zav9f";
  };
  buildInputs = [ jdk ant gettext which ];
  patches = [ ./i2p.patch ];
@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
    '';

  meta = with stdenv.lib; {
-    homepage = "https://geti2p.net";
+    homepage = https://geti2p.net;
    description = "Applications and router for I2P, anonymity over the Internet";
-    maintainers = [ stdenv.lib.maintainers.joelmo ];
+    maintainers = [ maintainers.joelmo ];
    license = licenses.gpl2;
    # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
    platforms = [ "x86_64-linux" ];
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:

 stdenv.mkDerivation rec {
-  version = "0.7.21";
+  version = "0.8";
  name = "pdf2djvu-${version}";

  src = fetchurl {
    url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j";
+    sha256 = "0xdxx5c7hvhzfmi37cf9p17smm2y55wc8z1vsncqqvf1sxqpjmbn";
  };

  buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -788,7 +788,7 @@ let

  byobu = callPackage ../tools/misc/byobu { };

-  cabal2nix = haskellPackages.callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = haskellPackages.cabal2nix;

  capstone = callPackage ../development/libraries/capstone { };

@ -13575,6 +13575,8 @@ let

  castle_combat = callPackage ../games/castle-combat { };

+  cataclysm-dda = callPackage ../games/cataclysm-dda { };
+
  chessdb = callPackage ../games/chessdb { };

  construoBase = lowPrio (callPackage ../games/construo {
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@ -6,6 +6,12 @@ let self = with self; {
    inherit (pkgs) stdenv autoreconfHook fetchurl;
  };

+  apcu = buildPecl {
+    name = "apcu-4.0.7";
+
+    sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
+  };
+
  memcache = buildPecl {
    name = "memcache-3.0.8";

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8163,12 +8163,12 @@ let
  };

  nbxmpp = buildPythonPackage rec {
-    name = "nbxmpp-0.5.2";
+    name = "nbxmpp-0.5.3";

    src = pkgs.fetchurl {
      name = "${name}.tar.gz";
-      url = "https://python-nbxmpp.gajim.org/downloads/7";
-      sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn";
+      url = "https://python-nbxmpp.gajim.org/downloads/8";
+      sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp";
    };

    meta = {
@ -15636,7 +15636,7 @@ let


  pyusb = buildPythonPackage rec {
-    name = "pyusb-1.0.0b1";
+    name = "pyusb-1.0.0b2";

    src = pkgs.fetchurl {
      url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
@ -15653,7 +15653,7 @@ let
    meta = {
      description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
      homepage = http://pyusb.sourceforge.net/;
-      license = "BSD";
+      license = licenses.bsd3;
      maintainers = with maintainers; [ bjornfor ];
    };
  };