Merge remote-tracking branch 'upstream/master' into staging

lib/maintainers.nix

@@ -118,6 +118,7 @@
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
+  linus = "Linus Arver <linusarver@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";

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

@@ -45,9 +45,6 @@ with lib;
   # Get a console as soon as the initrd loads fbcon on EFI boot.
   boot.initrd.kernelModules = [ "fbcon" ];
 
-  # Configure host id for ZFS to work
-  networking.hostId = "8425e349";
-
   # Allow the user to log in as root without a password.
   users.extraUsers.root.initialHashedPassword = "";
 }

nixos/modules/installer/tools/nixos-install.sh

@@ -45,7 +45,9 @@ while [ "$#" -gt 0 ]; do
             ;;
         --chroot)
             runChroot=1
-            chrootCommand=("$@")
+            if [[ "$@" != "" ]]; then
+                chrootCommand=("$@")
+            fi
             break
             ;;
         --help)
@@ -254,8 +256,14 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
 chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
+# Some systems may not be prepared to use NixOS' paths.
+export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
+export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
+
+
 # Ask the user to set a root password.
-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
+if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then
     echo "setting root password..."
     chroot $mountPoint /var/setuid-wrappers/passwd
 fi

nixos/modules/module-list.nix

@@ -149,6 +149,7 @@
   ./services/games/minecraft-server.nix
   ./services/games/minetest-server.nix
   ./services/hardware/acpid.nix
+  ./services/hardware/actkbd.nix
   ./services/hardware/amd-hybrid-graphics.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/freefall.nix
@@ -271,6 +272,7 @@
   ./services/networking/haproxy.nix
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
+  ./services/networking/i2p.nix
   ./services/networking/ifplugd.nix
   ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix

nixos/modules/profiles/base.nix

@@ -54,4 +54,6 @@
   # Include support for various filesystems.
   boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ];
 
+  # Configure host id for ZFS to work
+  networking.hostId = "8425e349";
 }

nixos/modules/profiles/installation-device.nix

@@ -26,10 +26,6 @@ with lib;
     # Disable some other stuff we don't need.
     security.sudo.enable = false;
 
-    # Include only the en_US locale.  This saves 75 MiB or so compared to
-    # the full glibcLocales package.
-    i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
-
     # Automatically log in at the virtual consoles.
     services.mingetty.autologinUser = "root";
 

nixos/modules/services/audio/alsa.nix

@@ -33,6 +33,16 @@ in
         '';
       };
 
+      enableMediaKeys = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable volume and capture control with keyboard media keys.
+
+          Enabling this will turn on <option>services.actkbd</option>.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -80,6 +90,23 @@ in
         };
       };
 
+    services.actkbd = mkIf config.sound.enableMediaKeys {
+      enable = true;
+      bindings = [
+        # "Mute" media key
+        { keys = [ 113 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Master toggle"; }
+
+        # "Lower Volume" media key
+        { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; }
+
+        # "Raise Volume" media key
+        { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; }
+
+        # "Mic Mute" media key
+        { keys = [ 190 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Capture toggle"; }
+      ];
+    };
+
   };
 
 }

nixos/modules/services/cluster/kubernetes.nix

@@ -224,7 +224,7 @@ in {
 
       machines = mkOption {
         description = "Kubernetes controller list of machines to schedule to schedule onto";
-        default = [];
+        default = [config.networking.hostName];
         type = types.listOf types.str;
       };
 
@@ -310,6 +310,12 @@ in {
         type = types.str;
       };
 
+      master = mkOption {
+        description = "Kubernetes apiserver address";
+        default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+        type = types.str;
+      };
+
       extraOpts = mkOption {
         description = "Kubernetes proxy extra command line options.";
         default = "";
@@ -355,6 +361,7 @@ in {
             --secure_port=${toString cfg.apiserver.securePort} \
             --portal_net=${cfg.apiserver.portalNet} \
             --logtostderr=true \
+            --runtime_config=api/v1beta3 \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
             ${cfg.apiserver.extraOpts}
           '';
@@ -416,7 +423,6 @@ in {
         script = ''
           export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
           exec ${cfg.package}/bin/kubelet \
-            --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
             --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers}  \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
@@ -443,7 +449,7 @@ in {
         after = [ "network-interfaces.target" "etcd.service" ];
         serviceConfig = {
           ExecStart = ''${cfg.package}/bin/kube-proxy \
-            --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \
+            --master=${cfg.proxy.master} \
             --bind_address=${cfg.proxy.address} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \

nixos/modules/services/hardware/actkbd.nix

@@ -0,0 +1,130 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.actkbd;
+
+  configFile = pkgs.writeText "actkbd.conf" ''
+    ${concatMapStringsSep "\n"
+      ({ keys, events, attributes, command, ... }:
+        ''${concatMapStringsSep "+" toString keys}:${concatStringsSep "," events}:${concatStringsSep "," attributes}:${command}''
+      )
+      cfg.bindings}
+    ${cfg.extraConfig}
+  '';
+
+  bindingCfg = { config, ... }: {
+    options = {
+
+      keys = mkOption {
+        type = types.listOf types.int;
+        description = "List of keycodes to match.";
+      };
+
+      events = mkOption {
+        type = types.listOf (types.enum ["key" "rep" "rel"]);
+        default = [ "key" ];
+        description = "List of events to match.";
+      };
+
+      attributes = mkOption {
+        type = types.listOf types.str;
+        default = [ "exec" ];
+        description = "List of attributes.";
+      };
+
+      command = mkOption {
+        type = types.str;
+        default = "";
+        description = "What to run.";
+      };
+
+    };
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.actkbd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the <command>actkbd</command> key mapping daemon.
+
+          Turning this on will start an <command>actkbd</command>
+          instance for every evdev input that has at least one key
+          (which is okay even for systems with tiny memory footprint,
+          since actkbd normally uses &lt;100 bytes of memory per
+          instance).
+
+          This allows binding keys globally without the need for e.g.
+          X11.
+        '';
+      };
+
+      bindings = mkOption {
+        type = types.listOf (types.submodule bindingCfg);
+        default = [];
+        example = lib.literalExample ''
+          [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; }
+          ]
+        '';
+        description = ''
+          Key bindings for <command>actkbd</command>.
+
+          See <command>actkbd</command> <filename>README</filename> for documentation.
+
+          The example shows a piece of what <option>sound.enableMediaKeys</option> does when enabled.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Literal contents to append to the end of actkbd configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.udev.packages = lib.singleton (pkgs.writeTextFile {
+      name = "actkbd-udev-rules";
+      destination = "/etc/udev/rules.d/61-actkbd.rules";
+      text = ''
+        ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="actkbd@$env{DEVNAME}.service"
+      '';
+    });
+
+    systemd.services."actkbd@" = {
+      enable = true;
+      restartIfChanged = true;
+      unitConfig = {
+        Description = "actkbd on %I";
+        ConditionPathExists = "%I";
+      };
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.actkbd}/bin/actkbd -D -c ${configFile} -d %I";
+      };
+    };
+
+  };
+
+}

nixos/modules/services/misc/ripple-data-api.nix

@@ -43,6 +43,24 @@ in {
         type = types.int;
       };
 
+      importMode = mkOption {
+        description = "Ripple data api import mode.";
+        default = "liveOnly";
+        type = types.enum ["live" "liveOnly"];
+      };
+
+      minLedger = mkOption {
+        description = "Ripple data api minimal ledger to fetch.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
+      maxLedger = mkOption {
+        description = "Ripple data api maximal ledger to fetch.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
       redis = {
         enable = mkOption {
           description = "Whether to enable caching of ripple data to redis.";
@@ -129,6 +147,7 @@ in {
 
       serviceConfig = {
         ExecStart = "${pkgs.ripple-data-api}/bin/api";
+        Restart = "always";
         User = "ripple-data-api";
       };
     };
@@ -145,8 +164,15 @@ in {
         LOG_FILE = "/dev/null";
       };
 
-      serviceConfig = {
-        ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2";
+      serviceConfig = let
+        importMode =
+          if cfg.minLedger != null && cfg.maxLedger != null then
+            "${toString cfg.minLedger} ${toString cfg.maxLedger}"
+          else
+            cfg.importMode;
+      in {
+        ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug";
+        Restart = "always";
         User = "ripple-data-api";
       };
 

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

@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.23.3";
+    name= "mediawiki-1.23.9";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
-      sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf";
+      sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql";
     };
 
     skins = config.skins;
@@ -142,6 +142,7 @@ in
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
         ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs}
+        ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedFiles}
         RewriteRule ${if config.enableUploads
           then "!^/images"
           else "^.*\$"

nixos/modules/services/web-servers/apache-httpd/per-server-options.nix

@@ -57,7 +57,8 @@ with lib;
   };
 
   sslServerChain = mkOption {
-    type = types.path;
+    type = types.nullOr types.path;
+    default = null;
     example = "/var/ca.pem";
     description = "Path to server SSL chain file.";
   };
@@ -96,7 +97,7 @@ with lib;
     default = [];
     example = [
       { urlPath = "/foo/bar.png";
-        dir = "/home/eelco/some-file.png";
+        files = "/home/eelco/some-file.png";
       }
     ];
     description = ''

nixos/modules/services/web-servers/nginx/default.nix

@@ -102,6 +102,7 @@ in
         '';
       serviceConfig = {
         ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
         RestartSec = "10s";
         StartLimitInterval = "1min";

nixos/modules/virtualisation/google-compute-config.nix

@@ -1,5 +1,5 @@
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
+  imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ];
 }

pkgs/applications/altcoins/primecoin.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec{
     else "install -D bitcoind $out/bin/primecoind";
 
   meta = {
-    description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers.";
+    description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers";
     longDescription= ''
       Primecoin is an innovative cryptocurrency, a form of digital
       currency secured by cryptography and issued through a

pkgs/applications/audio/dirt/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
+
+stdenv.mkDerivation rec {
+  name = "dirt-git";
+  src = fetchFromGitHub {
+    repo = "Dirt";
+    owner = "tidalcycles";
+    rev = "cfc5e85318defda7462192b5159103c823ce61f7";
+    sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+  };
+  buildInputs = [ libsndfile libsamplerate liblo jack2 ];
+  configurePhase = ''
+    export DESTDIR=$out
+  '';
+
+  meta = {
+    description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
+    homepage = "https://github.com/tidalcycles/Dirt";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}

pkgs/applications/audio/mopidy-mopify/default.nix

@@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/dirkgroenen/mopidy-mopify;
-    description = "A mopidy webclient based on the Spotify webbased interface.";
+    description = "A mopidy webclient based on the Spotify webbased interface";
     license = licenses.gpl3;
     maintainers = [ maintainers.Gonzih ];
   };

pkgs/applications/audio/musescore/default.nix

@@ -1,33 +1,31 @@
-{ stdenv, fetchurl, makeWrapper, cmake, qt4, pkgconfig, alsaLib, portaudio, jack2, libsndfile}:
+{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2
+, lame, libsndfile, libvorbis }:
 
 stdenv.mkDerivation rec {
-  name = "musescore-1.3";
+  name = "musescore-${version}";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "http://ftp.osuosl.org/pub/musescore/releases/MuseScore-1.3/mscore-1.3.tar.bz2";
-    sha256 = "a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683";
+    url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
+    sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w";
   };
 
-  buildInputs = [ makeWrapper cmake qt4 pkgconfig alsaLib portaudio jack2 libsndfile ];
+  buildInputs = [
+    makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
+  ];
 
-  configurePhase = ''
-    cd mscore;
-    mkdir build;
-    cd build;
-    cmake -DCMAKE_INSTALL_PREFIX=$out -DQT_PLUGINS_DIR=$out/lib/qt4/plugins -DCMAKE_BUILD_TYPE=Release ..'';
-
-  preBuild = ''make lrelease;'';
-
-  postInstall = ''
-    wrapProgram $out/bin/mscore --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
+  patchPhase = ''
+    sed s,"/usr/local",$out, -i Makefile
   '';
 
+  preBuild = "make lrelease";
+
   meta = with stdenv.lib; {
     description = "Qt-based score editor";
     homepage = http://musescore.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.vandenoever ];
+    maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
   };
 }

pkgs/applications/audio/xmp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
 
 stdenv.mkDerivation rec {
-  name = "xmp-4.0.7";
+  name = "xmp-4.0.10";
 
   meta = with stdenv.lib; {
     description = "Extended module player";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
-    sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw";
+    sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
   };
 
   buildInputs = [ pkgconfig alsaLib libxmp ];

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

@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.emacswiki.org/emacs/Icicles";
-    description = "Enhance Emacs minibuffer input with cycling and powerful completion.";
+    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

@@ -227,7 +227,7 @@ in
     name = "clion-${version}";
     version = "1.0";
     build = "141.353";
-    description  = "C/C++ IDE. New. Intelligent. Cross-platform.";
+    description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";

pkgs/applications/editors/yi/wrapper.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   env = yiEnv;
 
   meta = with stdenv.lib; {
-    description = "Allows Yi to find libraries and the compiler easily.";
+    description = "Allows Yi to find libraries and the compiler easily";
     # This wrapper and wrapper only is under PD
     license = licenses.publicDomain;
     maintainers = with maintainers; [ fuuzetsu ];

pkgs/applications/editors/yi/yi.nix

@@ -30,7 +30,7 @@ cabal.mkDerivation (self: {
   configureFlags = "-fpango -fvty";
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8";
   meta = {
-    homepage = "http://haskell.org/haskellwiki/Yi";
+    homepage = http://haskell.org/haskellwiki/Yi;
     description = "The Haskell-Scriptable Editor";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;

pkgs/applications/misc/ctodo/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://ctodo.apakoh.dk/";
-    description = "A simple ncurses-based task list manager.";
+    description = "A simple ncurses-based task list manager";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
     platforms = stdenv.lib.platforms.linux;

pkgs/applications/networking/browsers/chromium/common.nix

@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt
+, libpng, libxml2, libxslt, libcap
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, libexif, pciutils
 
@@ -86,7 +86,7 @@ let
   defaultDependencies = [
     bzip2 flac speex icu opusWithCustomModes
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt
+    libpng libxml2 libxslt libcap
     xdg_utils yasm minizip libwebp
     libusb1 libexif
   ];

pkgs/applications/networking/browsers/chromium/source/update.nix

@@ -1,7 +1,7 @@
 { system ? builtins.currentSystem }:
 
 let
-  inherit (import <nixpkgs> {
+  inherit (import ../../../../../../. {
     inherit system;
   }) lib writeText stdenv;
 

pkgs/applications/networking/cluster/kubernetes/default.nix

@@ -2,25 +2,27 @@
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "0.12.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml";
+    sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8";
   };
 
   buildInputs = [ makeWrapper which go iptables rsync ];
 
-  preBuild = "patchShebangs ./hack";
-
-  postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go'';
+  buildPhase = ''
+    substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
+    GOPATH=$(pwd)
+    patchShebangs ./hack
+    hack/build-go.sh --use_go_build
+  '';
 
   installPhase = ''
     mkdir -p "$out/bin"
     cp _output/local/go/bin/* "$out/bin/"
-    cp pause $out/bin/kube-pause
   '';
 
   preFixup = ''
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Open source implementation of container cluster management.";
+    description = "Open source implementation of container cluster management";
     license = licenses.asl20;
     homepage = https://github.com/GoogleCloudPlatform;
     maintainers = with maintainers; [offline];

pkgs/applications/networking/cluster/marathon/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://mesosphere.github.io/marathon;
-    description = "Cluster-wide init and control system for services in cgroups or Docker containers.";
+    description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
     maintainers = with maintainers; [ rushmorem ];
     platforms = platforms.linux;

pkgs/applications/networking/feedreaders/rawdog/default.nix

@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
   
   meta = {
     homepage = "http://offog.org/code/rawdog/";
-    description = "an RSS Aggregator Without Delusions Of Grandeur.";
+    description = "An RSS Aggregator Without Delusions Of Grandeur";
     license = stdenv.lib.licenses.gpl2;
     platform = stdenv.lib.platforms.unix;
   };

pkgs/applications/networking/feedreaders/rsstail/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
+
+let version = "1.9"; in
+stdenv.mkDerivation rec {
+  name = "rsstail-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf";
+    rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef";
+    repo = "rsstail";
+    owner = "flok99";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Monitor RSS feeds for new entries";
+    longDescription = ''
+      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
+      detects a new entry it'll emit only that new entry.
+    '';
+    homepage = http://www.vanheusden.com/rsstail/;
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ libmrss ]
+    ++ stdenv.lib.optional doCheck cppcheck;
+
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,share/man/man1}
+  '';
+}

pkgs/applications/networking/irc/quassel/default.nix

@@ -19,12 +19,12 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  version = "0.11.0";
+  version = "0.12.2";
   name = "quassel${tag}-${version}";
 
   src = fetchurl {
     url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
-    sha256 = "01251y5i1fvm6s2g9acxaczk2jdyw1byr45q41q0yh9apjw938cr";
+    sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb";
   };
 
   enableParallelBuilding = true;

pkgs/applications/networking/p2p/firestr/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid, qt5
+, libXScrnSaver, openssl }:
+
+stdenv.mkDerivation {
+  name = "firestr-0.8";
+
+  buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ];
+
+  src = fetchFromGitHub {
+    owner  = "mempko";
+    repo   = "firestr";
+    rev    = "f888890f71d49953d05bccdd27a1c4f6690e165c";
+    sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
+  };
+
+  patches = ./return.patch;
+
+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace "set(Boost_USE_STATIC_LIBS on)" "" \
+        --replace "/usr/include/botan" "${botan}/include/botan" \
+        --replace "libopus.a"       "libopus.so" \
+        --replace "libsnappy.a"     "libsnappy.so" \
+        --replace "libbotan-1.10.a" "libbotan-1.10.so.0"
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Grass computing platform";
+      homepage = http://firestr.com/;
+      license = licenses.gpl3;
+      maintainers = [ maintainers.emery ];
+      platforms = platforms.linux;
+    };
+}

pkgs/applications/networking/p2p/firestr/return.patch

@@ -0,0 +1,13 @@
+diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp
+index c3a5ea9..7c821b9 100644
+--- a/src/message/master_post.cpp
++++ b/src/message/master_post.cpp
+@@ -56,7 +56,7 @@ namespace fire
+ 
+         metadata::encryption_type to_message_encryption_type(sc::encryption_type s)
+         {
+-            metadata::encryption_type r;
++            metadata::encryption_type r = metadata::encryption_type::asymmetric;
+             switch(s)
+             {
+                 case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break;

pkgs/applications/networking/syncthing/default.nix

@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.10.30";
+  version = "0.11.1";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a";
+    sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4";
   };
 
   subPackages = [ "cmd/syncthing" ];

pkgs/applications/networking/vnstat/default.nix

@@ -1,11 +1,12 @@
 {stdenv, fetchurl, ncurses}:
 
+let version = "1.14"; in
 stdenv.mkDerivation rec {
-  name = "vnstat-1.13";
+  name = "vnstat-${version}";
 
   src = fetchurl {
+    sha256 = "11l39qqv5pgli9zzn0xilld67bi5qzxymsn97m4r022xv13jlipq";
     url = "http://humdi.net/vnstat/${name}.tar.gz";
-    sha256 = "1kcrxpvp3al1j6kh7k69vwva6kd1ba32wglx95gv55dixfcjakkg";
   };
 
   installPhase = ''
@@ -18,10 +19,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses];
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     homepage = http://humdi.net/vnstat/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "Console-based network statistics utility for Linux";
-    maintainers = with stdenv.lib.maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx ];
   };
 }

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

@@ -0,0 +1,68 @@
+# - coqide compilation can be disabled by setting lablgtk to null;
+
+{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+
+let
+  version = "8.5b2";
+  coq-version = "8.5";
+  buildIde = lablgtk != null;
+  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+in
+
+stdenv.mkDerivation {
+  name = "coq-${version}";
+
+  inherit coq-version;
+  inherit ocaml camlp5;
+
+  src = fetchurl {
+    url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz;
+    sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v";
+  };
+
+  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+
+  postPatch = ''
+    UNAME=$(type -tp uname)
+    RM=$(type -tp rm)
+    substituteInPlace configure --replace "/bin/uname" "$UNAME"
+    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+    substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+  '';
+
+  setupHook = writeText "setupHook.sh" ''
+    addCoqPath () {
+      if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+        export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+      fi
+    }
+
+    envHooks=(''${envHooks[@]} addCoqPath)
+  '';
+
+  preConfigure = ''
+    configureFlagsArray=(
+      -opt
+      ${ideFlags}
+    )
+  '';
+
+  prefixKey = "-prefix ";
+
+  buildFlags = "revision coq coqide";
+
+  meta = with stdenv.lib; {
+    description = "Coq proof assistant";
+    longDescription = ''
+      Coq is a formal proof management system.  It provides a formal language
+      to write mathematical definitions, executable algorithms and theorems
+      together with an environment for semi-interactive development of
+      machine-checked proofs.
+    '';
+    homepage = "http://coq.inria.fr";
+    license = licenses.lgpl21;
+    branch = coq-version;
+    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+    platforms = platforms.unix;
+  };
+}

pkgs/applications/science/programming/kframework/default.nix

@@ -90,7 +90,7 @@ releaseTools.mvnBuild rec {
   '';
 
   meta = {
-    description = "The K Framework is a rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined.";
+    description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined";
     homepage = http://www.kframework.org;
     license = stdenv.lib.licenses.bsd3;     # technically it is the UIUC/NCSA license
                                             # but LLVM uses that license as well and

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

@@ -102,4 +102,6 @@ rec {
   git-extras = callPackage ./git-extras { };
 
   git-cola = callPackage ./git-cola { };
+
+  git-imerge = callPackage ./git-imerge { };
 }

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

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "git-imerge-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
+    sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+  };
+
+  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mhagger/git-imerge;
+    description = "Perform a merge between two branches incrementally";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.spwhitt ];
+  };
+}

pkgs/applications/window-managers/sawfish/default.nix

@@ -1,17 +1,25 @@
-{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }:
+{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango
+, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo
+, makeWrapper
+}:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
 
-  name = "sawfish-git-2015-02-15";
+  name = "sawfish-${version}";
+  version = "1.11.90";
 
   src = fetchgit {
     url = "https://github.com/SawfishWM/sawfish.git";
-    rev = "44729f44017e6779b4b66a7ecdbd63a98731f668";
-    sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73";
+    rev = "b121f832571c9aebd228691c32604146e49f5e55";
+    sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
   };
 
-  buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ];
+  buildInputs =
+    [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama
+      libXrandr libXtst imlib gettext texinfo makeWrapper
+    ];
 
   patchPhase = ''
     sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
@@ -25,7 +33,7 @@ stdenv.mkDerivation rec {
 	--set REP_LOAD_PATH "$out/share/sawfish/lisp"
     done
   '';
-  
+
   meta = {
     description = "An extensible, Lisp-based window manager";
     longDescription = ''

pkgs/build-support/fetchhg/default.nix

@@ -6,13 +6,17 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   buildInputs = [mercurial];
 
+  impureEnvVars = [
+    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+  ];
+
   # Nix <= 0.7 compatibility.
   id = md5;
 
   outputHashAlgo = if md5 != null then "md5" else "sha256";
   outputHashMode = "recursive";
   outputHash = if md5 != null then md5 else sha256;
-  
+
   inherit url rev;
   preferLocalBuild = true;
 }

pkgs/data/fonts/comic-neue/default.nix

@@ -1,20 +1,27 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl
+, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "comic-neue-1.1";
+  name = "comic-neue-${version}";
+  version = "2.2";
 
   src = fetchurl {
-    url = "http://comicneue.com/comic-neue-1.1.zip";
-    sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923";
+    url = "http://comicneue.com/${name}.zip";
+    sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n";
   };
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
   sourceRoot = name;
 
   installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name}
+    cp -v OTF/*.otf  $out/share/fonts/opentype
+    cp -v Web/*.ttf $out/share/fonts/truetype
+    cp -v Web/*.eot  $out/share/fonts/EOT
+    cp -v Web/*.woff  $out/share/fonts/WOFF
+    cp -v Web/*.woff2  $out/share/fonts/WOFF2
+    cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name}
   '';
 
   meta = with stdenv.lib; {
@@ -27,7 +34,8 @@ stdenv.mkDerivation rec {
       the latter angular terminals.  Both variants come in Light,
       Regular, and Bold weights with Oblique variants.
     '';
-    license = licenses.cc0;
+    license = licenses.ofl;
     platforms = platforms.all;
+    maintainers = [ maintainers.AndersonTorres ];
   };
 }

pkgs/data/fonts/dina/default.nix

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   meta = with stdenv.lib; {
-    description = "A monospace bitmap font aimed at programmers.";
+    description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
       Dina is a monospace bitmap font, primarily aimed at programmers. It is
       relatively compact to allow a lot of code on screen, while (hopefully)

pkgs/development/compilers/ghcjs/default.nix

@@ -45,8 +45,8 @@ let
   libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "8bf1a2c665d42a66354f17220c7dfb1c8b44c0ea"; # 7.10 branch
-    sha256 = "18bm6sfa9c9kwsmv3lz6j27ng6jl0ck3ifgqbwwa8myfy7fw4il7";
+    rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
+    sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343";
     fetchSubmodules = true;
   };
   shims = fetchgit {

pkgs/development/compilers/squeak/default.nix

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
+, libpthreadstubs, pango, pkgconfig, pulseaudio, which }:
+
+let version = "4.10.2.2614"; in
+stdenv.mkDerivation rec {
+  name = "squeak-${version}";
+
+  src = fetchurl {
+    sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix";
+    url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Smalltalk programming language and environment";
+    longDescription = ''
+      Squeak is a full-featured implementation of the Smalltalk programming
+      language and environment based on (and largely compatible with) the
+      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
+      graphics, sound, video, MIDI, animation and other multimedia
+      capabilities. It also includes a customisable framework for creating
+      dynamic HTTP servers and interactively extensible Web sites.
+    '';
+    homepage = http://squeakvm.org/;
+    downloadPage = http://squeakvm.org/unix/index.html;
+    license = with licenses; [ asl20 mit ];
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
+    pango pkgconfig pulseaudio which ];
+
+  postPatch = ''
+    for i in squeak.in squeak.sh.in; do
+      substituteInPlace unix/cmake/$i --replace "PATH=" \
+        "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
+    done
+  '';
+
+  configurePhase = ''
+    unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads}
+  '';
+
+  enableParallelBuilding = true;
+}

pkgs/development/coq-modules/mathcomp/1.5.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, coq, ssreflect}:
+
+stdenv.mkDerivation {
+
+  name = "coq-mathcomp-1.5-8.5b2";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz;
+    sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy";
+  };
+
+  propagatedBuildInputs = [ coq ssreflect ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+    platforms = coq.meta.platforms;
+    hydraPlatforms = [];
+  };
+
+}

pkgs/development/coq-modules/ssreflect/1.5.nix

@@ -0,0 +1,42 @@
+{stdenv, fetchurl, coq}:
+
+assert coq.coq-version == "8.5";
+
+stdenv.mkDerivation {
+
+  name = "coq-ssreflect-1.5-8.5b2";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz;
+    sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  patches = [ ./threads.patch ];
+
+  postPatch = ''
+    # Permit building of the ssrcoq statically-bound executable
+    sed -i 's/^#-custom/-custom/' Make
+    sed -i 's/^#SSRCOQ/SSRCOQ/' Make
+  '';
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp -p bin/ssrcoq $out/bin
+    cp -p bin/ssrcoq.byte $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = with maintainers; [ vbgl jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}

pkgs/development/coq-modules/ssreflect/threads.patch

@@ -0,0 +1,16 @@
+--- a/Make  2015-04-20 13:37:06.000000000 +0200
++++ b/Make  2015-04-25 11:32:53.885194600 +0200
+@@ -1,9 +1,9 @@
+ ### Uncomment for static linking
+ ##
+-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
+-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
+-#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
+-#SSRCOQ = bin/ssrcoq
++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq -I +threads src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
++-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
++SSRCOQ = bin/ssrcoq
+ ##
+
+ ## What follows should be left untouched by the final user of ssreflect

pkgs/development/coq-modules/unimath/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/UniMath/UniMath;
-    description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view.";
+    description = "A formalization of a substantial body of mathematics using the univalent point of view";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };

pkgs/development/haskell-modules/configuration-common.nix

@@ -22,8 +22,8 @@ self: super: {
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
 
-  # https://github.com/bartavelle/hruby/issues/10
-  hruby = addExtraLibrary super.hruby pkgs.ruby_2_1;
+  # The package doesn't compile with ruby 1.9, which is our default at the moment.
+  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
 
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
@@ -155,9 +155,11 @@ self: super: {
     patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
   });
 
-  # The test suite imposes too narrow restrictions on the version of
-  # Cabal that can be used to build this package.
-  cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck;
+  # Needs the latest version of QuickCheck to compile.
+  cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; };
+
+  # https://github.com/massysett/rainbox/issues/1
+  rainbox = dontCheck super.rainbox;
 
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -329,4 +329,9 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
+  # https://github.com/bos/wreq/issues/61
+  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
+  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  hipbot = dontDistribute super.hipbot;
+
 }

pkgs/development/haskell-modules/with-packages-wrapper.nix

@@ -1,6 +1,7 @@
-{ stdenv, lib, ghc, llvmPackages, packages, buildEnv
-, makeWrapper
-, ignoreCollisions ? false, withLLVM ? false }:
+{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
+, ignoreCollisions ? false, withLLVM ? false
+, postBuild ? ""
+}:
 
 # This wrapper works only with GHC 6.12 or later.
 assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
@@ -89,7 +90,7 @@ buildEnv {
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     $out/bin/${ghcCommand}-pkg check
-  '';
+  '' + postBuild;
 } // {
   preferLocalBuild = true;
   inherit (ghc) version meta;

pkgs/development/interpreters/jython/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "jython-${version}";
+
+  version = "2.7-rc3";
+
+  src = fetchurl {
+    url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
+    sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = ":";
+
+  installPhase = ''
+     mkdir -pv $out/bin
+     cp $src $out/jython.jar
+     makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar"
+  '';
+
+  meta = {
+    description = "Python interpreter written in Java";
+    homepage = http://jython.org/;
+    license = stdenv.lib.licenses.psfl;
+    platforms = jre.meta.platforms;
+  };
+}

pkgs/development/interpreters/php/5.4.nix

@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
-callPackage ./makePhpDerivation.nix {
-  phpVersion = "5.4.39";
-  sha = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw";
+callPackage ./generic.nix {
+  phpVersion = "5.4.40";
+  sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628";
   apacheHttpd = apacheHttpd;
 }

pkgs/development/interpreters/php/5.5.nix

@@ -1,5 +1,5 @@
 { callPackage, apacheHttpd  }:
-callPackage ./makePhpDerivation.nix {
+callPackage ./generic.nix {
   phpVersion = "5.5.21";
   sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2";
   apacheHttpd = apacheHttpd;

pkgs/development/interpreters/php/5.6.nix

@@ -1,5 +1,5 @@
 { callPackage, apacheHttpd  }:
-callPackage ./makePhpDerivation.nix {
+callPackage ./generic.nix {
   phpVersion = "5.6.6";
   sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9";
   apacheHttpd = apacheHttpd;

pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix

@@ -25,7 +25,6 @@
 
 let
   v8 = v8_3_16_14;
-  mysql = assert false; (import <nixpkgs> {}).mysql;
 
 in
 

pkgs/development/libraries/geis/default.nix

@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://launchpad.net/geis";
-    description = "GEIS is a library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism.";
+    description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
-}
+}

pkgs/development/libraries/gpgme/default.nix

@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.3";
+  name = "gpgme-1.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d";
+    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

pkgs/development/libraries/libcouchbase/default.nix

@@ -20,9 +20,9 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
 
   meta = {
-    description = "C client library for Couchbase.";
+    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/libnetfilter_cthelper/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure.";
+    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure";
     longDescription = ''
       libnetfilter_cthelper is the userspace library that provides the programming interface
       to the user-space helper infrastructure available since Linux kernel 3.6. With this

pkgs/development/libraries/libnetfilter_cttimeout/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure.";
+    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure";
     longDescription = ''
       libnetfilter_cttimeout is the userspace library that provides the programming
       interface to the fine-grain connection tracking timeout infrastructure.

pkgs/development/libraries/libosmpbf/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/scrosby/OSM-binary;
-    description = "C library to read and write OpenStreetMap PBF files.";
+    description = "C library to read and write OpenStreetMap PBF files";
     license = stdenv.lib.licenses.lgpl3;
   };
 }

pkgs/development/libraries/librep/default.nix

@@ -1,18 +1,17 @@
-
-	{ stdenv, fetchgit
+{ stdenv, fetchurl
 , pkgconfig, autoreconfHook
 , readline, texinfo
 , gdbm, gmp, libffi }:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
+  name = "librep-${version}";
+  version = "0.92.5";
 
-  name = "librep-git-2015-02-15";
-
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/librep.git";
-    rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf";
-    sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
+    sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
   };
 
   buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
@@ -25,15 +24,12 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "Lisp system for Sawfish";
+    description = "Fast, lightweight, and versatile Lisp environment";
     longDescription = ''
-      This is librep, a Lisp system for UNIX, needed by Sawfish window manager.
-      It contains a Lisp interpreter, byte-code compiler and virtual machine.
-      Applications may use the Lisp interpreter as an extension language,
-      or it may be used for stand-alone scripts.
-
-      The Lisp dialect was originally inspired by Emacs Lisp, but with the worst
-      features removed. It also borrows many ideas from Scheme.
+      librep is a Lisp system for UNIX, comprising an
+      interpreter, a byte-code compiler, and a virtual
+      machine. It can serve as an application extension language
+      but is also suitable for standalone scripts.
     '';
     homepage = http://sawfish.wikia.com;
     license = licenses.gpl2;

pkgs/development/libraries/libs3/default.nix

@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, curl, libxml2 }:
+{ stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libs3-2015-01-09";
 
-  src = fetchgit {
-    url = "git://github.com/bji/libs3.git";
+  src = fetchFromGitHub {
+    owner = "bji";
+    repo = "libs3";
     rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
-    sha256 = "058sixppk078mdn9ii3swg87nbpgl86llz9mdhj5km5m53a7dnjw";
+    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
   };
 
   buildInputs = [ curl libxml2 ];

pkgs/development/libraries/libxmp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.2.7";
+  name = "libxmp-4.3.8";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536";
+    sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny";
   };
 }

pkgs/development/libraries/luabind/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/luabind/luabind;
-    description = "Luabind is a library that helps you create bindings between C++ and Lua.";
+    description = "A library that helps you create bindings between C++ and Lua";
     license = stdenv.lib.licenses.mit;
   };
 }

pkgs/development/libraries/nss_wrapper/default.nix

@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "nss_wrapper-1.0.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/nss_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18";
   };
 
   buildInputs = [ cmake pkgconfig ];

pkgs/development/libraries/pcg-c/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchzip }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "0.94";
+  name = "pcg-c-${version}";
+
+  src = fetchzip {
+    url = "http://www.pcg-random.org/downloads/${name}.zip";
+    sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
+  };
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./prefix-variable.patch
+    ];
+
+  preInstall = ''
+    sed -i s,/usr/local,$out, Makefile
+    mkdir -p $out/lib $out/include
+  '';
+
+  meta = {
+    description = "A family of better random number generators";
+    homepage = "http://www.pcg-random.org/";
+    license = stdenv.lib.licenses.asl20;
+    longDescription = ''
+      PCG is a family of simple fast space-efficient statistically good
+      algorithms for random number generation. Unlike many general-purpose RNGs,
+      they are also hard to predict.
+    '';
+    platforms = platforms.unix;
+    maintainers = [ maintainers.linus ];
+    repositories.git = git://github.com/imneme/pcg-c.git;
+  };
+}

pkgs/development/libraries/pcg-c/prefix-variable.patch

@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index dddea44..fdb9401 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,8 @@ all:
+ PREFIX = /usr/local
+ 
+ install: all
+-	install src/libpcg_random.a $PREFIX/lib
+-	install -m 0644 include/pcg_variants.h $PREFIX/include
++	install src/libpcg_random.a ${PREFIX}/lib
++	install -m 0644 include/pcg_variants.h ${PREFIX}/include
+ 
+ test:   all
+ 	cd test-low; $(MAKE) test

pkgs/development/libraries/rep-gtk/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "rep-gtk-git-2015-02-15";
+  name = "rep-gtk-${version}";
+  version = "0.90.8.2";
 
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/rep-gtk.git";
-    rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d";
-    sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz";
+    sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r";
   };
 
   buildInputs = [ pkgconfig autoreconfHook ];

pkgs/development/libraries/science/math/arpack/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
-      problems.
+      problems
     '';
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];

pkgs/development/libraries/socket_wrapper/default.nix

@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "socket_wrapper-1.1.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/socket_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3";
   };
 
   buildInputs = [ cmake pkgconfig ];

pkgs/development/libraries/stxxl/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/stxxl/stxxl;
-    description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations.";
+    description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     license = stdenv.lib.licenses.boost;
   };
 }

pkgs/development/libraries/tevent/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "an event system based on the talloc memory management library.";
+    description = "An event system based on the talloc memory management library";
     homepage = http://tevent.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];

pkgs/development/libraries/uid_wrapper/default.nix

@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "uid_wrapper-1.1.0";
 
-  src = fetchgit {
-    url = "git://git.samba.org/uid_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
   };
 
   buildInputs = [ cmake pkgconfig ];

pkgs/development/lisp-modules/lisp-packages.nix

@@ -20,7 +20,7 @@ let lispPackages = rec {
   clx = buildLispPackage rec {
     baseName = "clx";
     version = "git-20150117";
-    description = "An implementation of the X Window System protocol in Lisp.";
+    description = "An implementation of the X Window System protocol in Lisp";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -98,7 +98,7 @@ let lispPackages = rec {
   clx-truetype = buildLispPackage rec {
     baseName = "clx-truetype";
     version = "git-20141112";
-    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.";
+    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension";
     deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
     # Source type: git
     src = pkgs.fetchgit {
@@ -178,7 +178,7 @@ let lispPackages = rec {
   trivial-features = buildLispPackage rec {
     baseName = "trivial-features";
     version = "git-20141112";
-    description = "Ensures consistent *FEATURES* across multiple CLs.";
+    description = "Ensures consistent *FEATURES* across multiple CLs";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -280,7 +280,7 @@ let lispPackages = rec {
   babel = buildLispPackage rec {
     baseName = "babel";
     version = "git-20141113";
-    description = "Babel, a charset conversion library.";
+    description = "A charset conversion library";
     deps = [alexandria trivial-features];
     # Source type: git
     src = pkgs.fetchgit {
@@ -408,7 +408,7 @@ let lispPackages = rec {
   trivial-gray-streams = buildLispPackage rec {
     baseName = "trivial-gray-streams";
     version = "git-20141113";
-    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
+    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -421,7 +421,7 @@ let lispPackages = rec {
   cl-ssl = buildLispPackage rec {
     baseName = "cl+ssl";
     version = "git-20141113";
-    description = "Common Lisp interface to OpenSSL.";
+    description = "Common Lisp interface to OpenSSL";
     deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams];
     # Source type: git
     src = pkgs.fetchgit {
@@ -448,7 +448,7 @@ let lispPackages = rec {
   trivial-garbage = buildLispPackage rec {
     baseName = "trivial-garbage";
     version = "git-20141113";
-    description = "Portable finalizers, weak hash-tables and weak pointers.";
+    description = "Portable finalizers, weak hash-tables and weak pointers";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -461,7 +461,7 @@ let lispPackages = rec {
   cl-base64 = buildLispPackage rec {
     baseName = "cl-base64";
     version = "git-20141113";
-    description = "Base64 encoding and decoding with URI support.";
+    description = "Base64 encoding and decoding with URI support";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {

pkgs/development/ocaml-modules/magic-mime/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchzip, ocaml, findlib }:
+
+let version = "1.0.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-magic-mime-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
+    sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/mirage/ocaml-magic-mime;
+    description = "Convert file extensions to MIME types";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}

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

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.1";
+  version = "6.4.3";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
     url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
     curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = "02r2jazb2hnhcqcjnmlj6sjd9dvyfalgi99bzncwfadixf3hmpvn";
+    sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1";
   };
 
   buildInputs = [ yacc ];

pkgs/development/tools/build-managers/boot/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc8";
+  version = "2.0.0-rc14";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
+    sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
   };
 
   inherit jdk;

pkgs/development/tools/chefdk/default.nix

@@ -11,7 +11,7 @@ bundlerEnv {
   buildInputs = [ perl ];
 
   meta = with lib; {
-    description = "A streamlined development and deployment workflow for Chef platform.";
+    description = "A streamlined development and deployment workflow for Chef platform";
     homepage    = https://downloads.chef.io/chef-dk/;
     license     = with licenses; asl20;
     maintainers = with maintainers; [ offline ];

pkgs/development/tools/database/sqldeveloper/default.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Oracle's Oracle DB GUI client.";
+    description = "Oracle's Oracle DB GUI client";
     longDescription = ''
       Oracle SQL Developer is a free integrated development environment that
       simplifies the development and management of Oracle Database in both

pkgs/development/tools/misc/autoconf-archive/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ xz ];
 
   meta = with stdenv.lib; {
-    description = "Archive of autoconf m4 macros.";
+    description = "Archive of autoconf m4 macros";
     homepage = http://www.gnu.org/software/autoconf-archive/;
     license = licenses.gpl3;
   };

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

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://sourceforge.net/projects/checkbaskisms/;
-    description = "Performs basic checks on shell scripts for the presence of non portable syntax.";
+    description = "Performs basic checks on shell scripts for the presence of non portable syntax";
     license = stdenv.lib.licenses.gpl2;
   };
 

pkgs/development/tools/parsing/jshon/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = http://kmkeen.com/jshon;
-    description = "JSON parser designed for maximum convenience within the shell.";
+    description = "JSON parser designed for maximum convenience within the shell";
     license = licenses.free;
     platforms = platforms.all;
     maintainers = with maintainers; [ rushmorem ];

pkgs/development/tools/rust/racer/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A utility intended to provide Rust code completion for editors and IDEs.";
+    description = "A utility intended to provide Rust code completion for editors and IDEs";
     homepage = https://github.com/phildawes/racer;
     license = stdenv.lib.licenses.mit;
     maintainers = [ maintainers.jagajaga ];

pkgs/development/tools/selenium/selendroid/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://code.google.com/p/selenium;
-    description = "Test automation for native or hybrid Android apps and the mobile web.";
+    description = "Test automation for native or hybrid Android apps and the mobile web";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.all;
     license = licenses.asl20;

pkgs/development/tools/vagrant/default.nix

@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.6.5";
+  version = "1.7.2";
   rake = buildRubyGem {
     inherit ruby;
     name = "rake-10.3.2";
@@ -19,19 +19,19 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
-        sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2";
+        sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx";
       }
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq";
+        sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz";
       };
 
   meta = with stdenv.lib; {
     description = "A tool for building complete development environments";
     homepage    = http://vagrantup.com;
     license     = licenses.mit;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 globin ];
     platforms   = platforms.linux;
   };
 
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 }

pkgs/games/gnubg/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-gtk" "--with--board3d" ];
 
   meta = with stdenv.lib;
-    { description = "World class backgammon application.";
+    { description = "World class backgammon application";
       homepage = http://www.gnubg.org/;
       license = licenses.gpl3;
       maintainers = [ maintainers.emery ];

pkgs/games/scrolls/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "scrolls-2014-03-08";
 
   meta = {
-    description = "Scrolls is a strategy collectible card game.";
+    description = "A strategy collectible card game";
     homepage = "https://scrolls.com/";
     # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/
 

pkgs/misc/emulators/cdemu/base.nix

@@ -17,7 +17,7 @@ in stdenv.mkDerivation ({
     cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
   '';
   meta = {
-    description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system.";
+    description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system";
     longDescription = ''
       CDEmu consists of:
 

pkgs/os-specific/linux/fusionio/srcs.nix

@@ -0,0 +1,22 @@
+{ fetchurl }:
+rec {
+  version = "3.2.10";
+
+  libvsl = fetchurl {
+    name = "fusionio-libvsl-${version}.deb";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk";
+    sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk";
+  };
+
+  util = fetchurl {
+    name = "fusionio-util-${version}.deb";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs";
+    sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq";
+  };
+
+  vsl = fetchurl {
+    name = "fusionio-iomemory-vsl-${version}.tar.gz";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM";
+    sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc";
+  };
+}

pkgs/os-specific/linux/fusionio/util.nix

@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }:
+
+let
+  srcs = import ./srcs.nix { inherit fetchurl; };
+in
+stdenv.mkDerivation {
+  name = "fusionio-util-${srcs.version}";
+
+  nativeBuildInputs = [ dpkg ];
+
+  buildCommand = ''
+    dpkg-deb -R ${srcs.libvsl} $TMPDIR
+    dpkg-deb -R ${srcs.util} $TMPDIR
+
+    rm $TMPDIR/usr/bin/fio-{bugreport,sanitize}
+
+    mkdir -p $out
+    cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
+    for BIN in $(find $out/bin -type f); do
+      echo Patching $BIN
+      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
+
+      # Test our binary to see if it was correctly patched
+      set +e
+      $BIN --help >/dev/null 2>&1
+      ST="$?"
+      set -e
+      if [ "$ST" -ge "10" ]; then
+        echo "Failed testing $BIN"
+        exit 1;
+      fi
+    done
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://fusionio.com;
+    description = "Fusionio command line utilities.";
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    broken = stdenv.system != "x86_64-linux";
+    maintainers = with maintainers; [ wkennington ];
+  };
+}

pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch

@@ -0,0 +1,13 @@
+diff --git a/kfile.c b/kfile.c
+index 5014e77..a65d921 100644
+--- a/kfile.c
++++ b/kfile.c
+@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp)
+ #if KFIOC_STRUCT_FILE_HAS_PATH
+     return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode;
+ #else
+-    return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode;
++    return (fusion_inode *) file_inode((struct file *)fp);
+ #endif
+ }
+ 

pkgs/os-specific/linux/fusionio/vsl.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, kernel }:
+
+let
+  srcs = import ./srcs.nix { inherit fetchurl; };
+in
+stdenv.mkDerivation rec {
+  name = "fusionio-iomemory-vsl-${srcs.version}";
+
+  src = srcs.vsl;
+
+  prePatch = ''
+    cd root/usr/src/iomemory-vsl-*
+  '';
+
+  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch;
+
+  preBuild = ''
+    sed -i Makefile kfio_config.sh \
+      -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g"
+    export DKMS_KERNEL_VERSION=${kernel.modDirVersion}
+    export TARGET="x86_64_cc48"
+  '';
+
+  installPhase = ''
+    export INSTALL_ROOT=$out
+    make modules_install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://fusionio.com;
+    description = "kernel driver for accessing fusion-io cards";
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    broken = stdenv.system != "x86_64-linux";
+    maintainers = with maintainers; [ wkennington ];
+  };
+}

pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-${version}.debian.tar.gz";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
     sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 

pkgs/os-specific/linux/mcelog/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "115"; in
+let version = "116"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "13m9y4xfd3klzj2xrwwwwg31pnjfwd0rbrr2845sf557iyqrshki";
+    sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

pkgs/servers/apache-kafka/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     # allow us the specify logging directory using env
     substituteInPlace $out/bin/kafka-run-class.sh \
-      --replace 'LOG_DIR=$base_dir/logs' 'LOG_DIR=$KAFKA_LOG_DIR'
+      --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"'
 
     for p in $out/bin\/*.sh; do
       wrapProgram $p \