Merge branch 'master' into staging

README.md

@@ -2,8 +2,6 @@
 
 [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs)
 [![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs)
-[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs)
-[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs)
 
 Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
 manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/)

doc/stdenv.xml

@@ -988,6 +988,41 @@ set debug-file-directory ~/.nix-profile/lib/debug
 
 </section>
 
+<section xml:id="ssec-installCheck-phase"><title>The installCheck phase</title>
+
+<para>The installCheck phase checks whether the package was installed
+correctly by running its test suite against the installed directories.
+The default <function>installCheck</function> calls <command>make
+installcheck</command>.</para>
+
+<variablelist>
+  <title>Variables controlling the installCheck phase</title>
+
+  <varlistentry>
+    <term><varname>doInstallCheck</varname></term>
+    <listitem><para>If set to a non-empty string, the installCheck phase is
+    executed, otherwise it is skipped (default).  Thus you should set
+
+    <programlisting>doInstallCheck = true;</programlisting>
+
+    in the derivation to enable install checks.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>preInstallCheck</varname></term>
+    <listitem><para>Hook executed at the start of the installCheck
+    phase.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>postInstallCheck</varname></term>
+    <listitem><para>Hook executed at the end of the installCheck
+    phase.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</section>
 
 <section xml:id="ssec-distribution-phase"><title>The distribution
 phase</title>

lib/maintainers.nix

@@ -49,6 +49,7 @@
   auntie = "Jonathan Glines <auntieNeo@gmail.com>";
   avnik = "Alexander V. Nikolaev <avn@avnik.info>";
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
+  bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
@@ -96,6 +97,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
   cransom = "Casey Ransom <cransom@hubns.net>";
+  cryptix = "Henry Bubert <cryptix@riseup.net>";
   CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
   cstrahan = "Charles Strahan <charles@cstrahan.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
@@ -227,6 +229,7 @@
   linquize = "Linquize <linquize@yahoo.com.hk>";
   linus = "Linus Arver <linusarver@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
+  loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
@@ -456,4 +459,5 @@
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
   amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
+  yochai = "Yochai <yochai@titat.info>";
 }

maintainers/scripts/vanity.sh

@@ -101,15 +101,15 @@ cleaner_script="$(echo "$name_list_canonical" | denormalize_name |
 
 # Add github usernames
 if [ -n "$NIXPKGS_GITHUB_NAME_CACHE" ]; then
-    github_adder_script="$(echo "$github_name_list" |
+    github_adder_script="$(mktemp)"
+    echo "$github_name_list" |
         grep -E "$(echo "$name_list_canonical" | cut -f 2 |
 	    tr '\n' '|' )" |
 	sort | uniq |
         sed -re 's/(.*)\t(.*)/s| \1$| \1\t\2|g;/' |
-	denormalize_name
+	denormalize_name > "$github_adder_script"
-	)"
 else
-    github_adder_script=''
+    github_adder_script='/dev/null'
 fi
 
 echo "$name_list" | denormalize_name
@@ -118,5 +118,5 @@ echo
 
 echo "$git_data" | cut -f 1 |
     sed -e "$cleaner_script" |
-    sort | uniq -c | sort -k1n | sed -re "$github_adder_script" |
+    sort | uniq -c | sort -k1n | sed -rf "$github_adder_script" |
     sed -re 's/^ *([0-9]+) /\1\t/'

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

@@ -35,6 +35,14 @@ following incompatible changes:</para>
       Now you need to use versioned attributes, like <literal>gnome3</literal>.
     </para>
   </listitem>
+
+  <listitem>
+    <para>
+      The attribute name of the Radicale daemon has been changed from
+      <literal>pythonPackages.radicale</literal> to
+      <literal>radicale</literal>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 

nixos/modules/config/networking.nix

@@ -232,7 +232,7 @@ in
     # and other configurations. If the file is destroyed by an environment
     # activation then it must be rebuilt so that applications which interface
     # with /etc/resolv.conf directly don't break.
-    system.activationScripts.resolvconf = stringAfter [ "etc" "tmpfs" "var" ]
+    system.activationScripts.resolvconf = stringAfter [ "etc" "specialfs" "var" ]
       ''
         # Systemd resolved controls its own resolv.conf
         rm -f /run/resolvconf/interfaces/systemd

nixos/modules/hardware/opengl.nix

@@ -14,7 +14,7 @@ let
     name = "mesa-drivers+txc-${p.mesa_drivers.version}";
     paths =
       [ p.mesa_drivers
-        p.mesa_noglu # mainly for libGL
+        p.mesa_drivers.out # mainly for libGL
         (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
       ];
   };

nixos/modules/misc/ids.nix

@@ -119,7 +119,6 @@
       minidlna = 91;
       elasticsearch = 92;
       tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
-      #connman = 94; # unused
       firebird = 95;
       #keys = 96; # unused
       haproxy = 97;
@@ -275,6 +274,7 @@
       mattermost = 254;
       prometheus = 255;
       telegraf = 256;
+      gitlab-runner = 257;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -376,7 +376,6 @@
       minidlna = 91;
       elasticsearch = 92;
       #tcpcryptd = 93; # unused
-      connman = 94;
       firebird = 95;
       keys = 96;
       haproxy = 97;
@@ -520,6 +519,7 @@
       mattermost = 254;
       prometheus = 255;
       #telegraf = 256; # unused
+      gitlab-runner = 257;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix

@@ -133,6 +133,7 @@
   ./services/computing/slurm/slurm.nix
   ./services/continuous-integration/buildkite-agent.nix
   ./services/continuous-integration/hydra/default.nix
+  ./services/continuous-integration/gitlab-runner.nix
   ./services/continuous-integration/gocd-agent/default.nix
   ./services/continuous-integration/gocd-server/default.nix
   ./services/continuous-integration/jenkins/default.nix
@@ -210,6 +211,7 @@
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/mlmmj.nix
+  ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
@@ -382,7 +384,6 @@
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
   ./services/networking/nylon.nix
-  ./services/networking/offlineimap.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
   ./services/networking/openntpd.nix

nixos/modules/programs/zsh/zsh.nix

@@ -102,9 +102,9 @@ in
 
       interactiveShellInit = ''
         # history defaults
-        export SAVEHIST=2000
+        SAVEHIST=2000
-        export HISTSIZE=2000
+        HISTSIZE=2000
-        export HISTFILE=$HOME/.zsh_history
+        HISTFILE=$HOME/.zsh_history
 
         setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
 

nixos/modules/services/backup/rsnapshot.nix

@@ -7,11 +7,14 @@ let
   cfgfile = pkgs.writeText "rsnapshot.conf" ''
     config_version	1.2
     cmd_cp	${pkgs.coreutils}/bin/cp
+    cmd_rm	${pkgs.coreutils}/bin/rm
     cmd_rsync	${pkgs.rsync}/bin/rsync
     cmd_ssh	${pkgs.openssh}/bin/ssh
     cmd_logger	${pkgs.inetutils}/bin/logger
     cmd_du	${pkgs.coreutils}/bin/du
+    cmd_rsnapshot_diff	${pkgs.rsnapshot}/bin/rsnapshot-diff
     lockfile	/run/rsnapshot.pid
+    link_dest	1
 
     ${cfg.extraConfig}
   '';

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.gitlab-runner;
+  configFile = pkgs.writeText "config.toml" cfg.configText;
+in
+{
+  options.services.gitlab-runner = {
+    enable = mkEnableOption "Gitlab Runner";
+
+    configText = mkOption {
+      description = "Verbatim config.toml to use";
+    };
+
+    workDir = mkOption {
+      default = "/var/lib/gitlab-runner";
+      type = types.path;
+      description = "The working directory used";
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.gitlab-runner = {
+      description = "Gitlab Runner";
+      after = [ "network.target" "docker.service" ];
+      requires = [ "docker.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \
+          --working-directory ${cfg.workDir} \
+          --config ${configFile} \
+          --service gitlab-runner \
+          --user gitlab-runner \
+        '';
+      };
+    };
+
+    users.extraUsers.gitlab-runner = {
+      group = "gitlab-runner";
+      extraGroups = [ "docker" ];
+      uid = config.ids.uids.gitlab-runner;
+      home = cfg.workDir;
+      createHome = true;
+    };
+
+    users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner;
+  };
+}

nixos/modules/services/mail/offlineimap.nix

@@ -59,7 +59,7 @@ in {
       };
       path = cfg.path;
     };
-    environment.systemPackages = [ "${cfg.package}" ];
+    environment.systemPackages = [ cfg.package ];
     systemd.user.timers.offlineimap = {
       description = "offlineimap timer";
       timerConfig               = {

nixos/modules/services/misc/gitlab.nix

@@ -449,13 +449,15 @@ in {
         Group = cfg.group;
         TimeoutSec = "300";
         Restart = "on-failure";
+        WorkingDirectory = gitlabEnv.HOME;
         ExecStart =
           "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse "
           + "-listenUmask 0 "
           + "-listenNetwork unix "
           + "-listenAddr /run/gitlab/gitlab-workhorse.socket "
           + "-authSocket ${gitlabSocket} "
-          + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public";
+          + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public "
+          + "-secretPath ${cfg.packages.gitlab}/share/gitlab/.gitlab_workhorse_secret";
       };
     };
 
@@ -525,11 +527,6 @@ in {
             psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
             ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
             touch "${cfg.statePath}/db-created"
-
-            # The gitlab:setup task is horribly broken somehow, these two tasks will do the same for setting up the initial database
-            ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
-            ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
-              GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}";
           fi
         fi
 
@@ -538,6 +535,15 @@ in {
         # Always do the db migrations just to be sure the database is up-to-date
         ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
 
+        # The gitlab:setup task is horribly broken somehow, the db:migrate
+        # task above and the db:seed_fu below will do the same for setting
+        # up the initial database
+        if ! test -e "${cfg.statePath}/db-seeded"; then
+          ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
+            GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}"
+          touch "${cfg.statePath}/db-seeded"
+        fi
+
         # Change permissions in the last step because some of the
         # intermediary scripts like to create directories as root.
         chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}

nixos/modules/services/networking/connman.nix

@@ -27,6 +27,14 @@ in {
         '';
       };
 
+      enableVPN = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable ConnMan VPN service.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = ''
@@ -78,7 +86,7 @@ in {
       };
     };
 
-    systemd.services."connman-vpn" = {
+    systemd.services."connman-vpn" = mkIf cfg.enableVPN {
       description = "ConnMan VPN service";
       wantedBy = [ "multi-user.target" ];
       after = [ "syslog.target" ];
@@ -91,7 +99,7 @@ in {
       };
     };
 
-    systemd.services."net-connman-vpn" = {
+    systemd.services."net-connman-vpn" = mkIf cfg.enableVPN {
       description = "D-BUS Service";
       serviceConfig = {
         Name = "net.connman.vpn";

nixos/modules/services/networking/nsd.nix

@@ -71,6 +71,7 @@ let
       # interfaces
     ${forEach "  ip-address: " cfg.interfaces}
 
+      ip-freebind:         ${yesOrNo  cfg.ipFreebind}
       hide-version:        ${yesOrNo  cfg.hideVersion}
       identity:            "${cfg.identity}"
       ip-transparent:      ${yesOrNo  cfg.ipTransparent}
@@ -84,7 +85,7 @@ let
       reuseport:           ${yesOrNo  cfg.reuseport}
       round-robin:         ${yesOrNo  cfg.roundRobin}
       server-count:        ${toString cfg.serverCount}
-      ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
+      ${maybeToString "statistics: " cfg.statistics}
       tcp-count:           ${toString cfg.tcpCount}
       tcp-query-count:     ${toString cfg.tcpQueryCount}
       tcp-timeout:         ${toString cfg.tcpTimeout}
@@ -117,7 +118,8 @@ let
   '';
 
   yesOrNo = b: if b then "yes" else "no";
-  maybeString = pre: s: if s == null then "" else ''${pre} "${s}"'';
+  maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"'';
+  maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}'';
   forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
 
 
@@ -146,6 +148,11 @@ let
     ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
       ${maybeString "zonestats: "          zone.zoneStats}
 
+      ${maybeToString "max-refresh-time: " zone.maxRefreshSecs}
+      ${maybeToString "min-refresh-time: " zone.minRefreshSecs}
+      ${maybeToString "max-retry-time:   " zone.maxRetrySecs}
+      ${maybeToString "min-retry-time:   " zone.minRetrySecs}
+
       allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
     ${forEach     "  allow-notify: "       zone.allowNotify}
     ${forEach     "  request-xfr: "        zone.requestXFR}
@@ -241,6 +248,44 @@ let
         '';
       };
 
+      maxRefreshSecs = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Limit refresh time for secondary zones. This is the timer which
+          checks to see if the zone has to be refetched when it expires.
+          Normally the value from the SOA record is used, but this  option
+          restricts that value.
+        '';
+      };
+
+      minRefreshSecs = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Limit refresh time for secondary zones.
+        '';
+      };
+
+      maxRetrySecs = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Limit retry time for secondary zones. This is the timeout after
+          a failed fetch attempt for the zone. Normally the value from
+          the SOA record is used, but this option restricts that value.
+        '';
+      };
+
+      minRetrySecs = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Limit retry time for secondary zones.
+        '';
+      };
+
+
       notify = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -366,6 +411,15 @@ in
       '';
     };
 
+    ipFreebind = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to bind to nonlocal addresses and interfaces that are down.
+        Similar to ip-transparent.
+      '';
+    };
+
     ipTransparent = mkOption {
       type = types.bool;
       default = false;

nixos/modules/services/networking/radicale.nix

@@ -33,7 +33,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.pythonPackages.radicale ];
+    environment.systemPackages = [ pkgs.radicale ];
 
     users.extraUsers = singleton
       { name = "radicale";
@@ -52,7 +52,7 @@ in
       description = "A Simple Calendar and Contact Server";
       after = [ "network-interfaces.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f";
+      script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f";
       serviceConfig.User = "radicale";
       serviceConfig.Group = "radicale";
     };

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.13";
+    name= "mediawiki-1.27.1";
 
     src = pkgs.fetchurl {
-      url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
+      url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz";
-      sha256 = "168wpf53n4ksj2g5q5r0hxapx6238dvsfng5ff9ixk6axsn0j5d0";
+      sha256 = "0sm3ymz93qragbwhzzbwq7f127mbj29inv0afg2z6p32jb1pd9h8";
     };
 
     skins = config.skins;

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

@@ -5,7 +5,8 @@ with lib;
 
 let
 
-  version = "4.3.1";
+  # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
+  version = "4.6.1";
   fullversion = "${version}";
 
   # Our bare-bones wp-config.php file using the above settings
@@ -74,7 +75,7 @@ let
       owner = "WordPress";
       repo = "WordPress";
       rev = "${fullversion}";
-      sha256 = "1rk10vcv4z9p04hfzc0wkbilrgx7m9ssyr6c3w6vw3vl1bcgqxza";
+      sha256 = "0n82xgjg1ry2p73hhgpslnkdzrma5n6hxxq76s7qskkzj0qjfvpn";
     };
     installPhase = ''
       mkdir -p $out
@@ -98,7 +99,7 @@ let
       # symlink additional plugin(s)
       ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins) }
 
-      # symlink additional translation(s) 
+      # symlink additional translation(s)
       mkdir -p $out/wp-content/languages
       ${concatMapStrings (language: "ln -s ${language}/*.mo ${language}/*.po $out/wp-content/languages/\n") (selectedLanguages) }
     '';
@@ -123,7 +124,7 @@ in
   options = {
     dbHost = mkOption {
       default = "localhost";
-      description = "The location of the database server.";  
+      description = "The location of the database server.";
       example = "localhost";
     };
     dbName = mkOption {
@@ -253,7 +254,7 @@ in
       done
       ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'
       ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";'
-    else 
+    else
       echo "Good, no need to do anything database related."
     fi
   '';

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

@@ -18,9 +18,13 @@ let
 
     ${cfg.config}
 
-    ${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
+    ${optionalString (cfg.eventsConfig != "" || cfg.config == "") ''
-    events {}
+    events {
+      ${cfg.eventsConfig}
+    }
+    ''}
 
+    ${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
     http {
       include ${cfg.package}/conf/mime.types;
       include ${cfg.package}/conf/fastcgi.conf;
@@ -98,7 +102,6 @@ let
     }''}
 
     ${optionalString (cfg.httpConfig != "") ''
-    events {}
     http {
       include ${cfg.package}/conf/mime.types;
       include ${cfg.package}/conf/fastcgi.conf;
@@ -272,12 +275,20 @@ in
         ";
       };
 
+      eventsConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration lines to be set inside the events block.
+        '';
+      };
+
       appendHttpConfig = mkOption {
         type = types.lines;
         default = "";
         description = "
           Configuration lines to be appended to the generated http block.
-          This is mutually exclusive with using config and httpConfig for 
+          This is mutually exclusive with using config and httpConfig for
           specifying the whole http block verbatim.
         ";
       };

nixos/modules/system/activation/activation-script.nix

@@ -159,7 +159,7 @@ in
         rmdir --ignore-fail-on-non-empty /usr/bin /usr
       '';
 
-    system.activationScripts.tmpfs =
+    system.activationScripts.specialfs =
       ''
         specialMount() {
           local device="$1"
@@ -167,7 +167,12 @@ in
           local options="$3"
           local fsType="$4"
 
-          ${pkgs.utillinux}/bin/mount -t "$fsType" -o "remount,$options" "$device" "$mountPoint"
+          if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then
+            local options="remount,$options"
+          else
+            mkdir -m 0755 -p "$mountPoint"
+          fi
+          ${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"
         }
         source ${config.system.build.earlyMountScript}
       '';

nixos/modules/system/boot/loader/grub/grub.nix

@@ -503,7 +503,7 @@ in
             + "'boot.loader.grub.mirroredBoots' to make the system bootable.";
         }
         {
-          assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters);
+          assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters);
           message = "You cannot have duplicated devices in mirroredBoots";
         }
         {

nixos/tests/wordpress.nix

@@ -0,0 +1,60 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "wordpress";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ grahamc ]; # under duress!
+  };
+
+  nodes =
+    { web =
+        { config, pkgs, ... }:
+        {
+          services.mysql.enable = true;
+          services.mysql.package = pkgs.mysql;
+          services.mysql.initialScript = pkgs.writeText "start.sql" ''
+            CREATE DATABASE wordpress;
+	    CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress';
+            GRANT ALL on wordpress.* TO 'wordpress'@'localhost';
+          '';
+
+          services.httpd = {
+            enable = true;
+            logPerVirtualHost = true;
+            adminAddr="js@lastlog.de";
+            extraModules = [
+              { name = "php7"; path = "${pkgs.php}/modules/libphp7.so"; }
+            ];
+
+            virtualHosts = [
+              {
+                hostName = "wordpress";
+                extraSubservices =
+                  [
+                    {
+                      serviceType = "wordpress";
+                      dbPassword = "wordpress";
+                      wordpressUploads = "/data/uploads";
+                      languages = [ "de_DE" "en_GB" ];
+                    }
+                  ];
+              }
+            ];
+          };
+        };
+    };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      startAll;
+
+      $web->waitForUnit("mysql");
+      $web->waitForUnit("httpd");
+
+      $web->succeed("curl -L 127.0.0.1:80 | grep 'Welcome to the famous'");
+
+
+    '';
+
+})

pkgs/applications/audio/linuxband/default.nix

@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python, pyGtkGlade, pygtksourceview }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) pyGtkGlade pygtksourceview python;
+in stdenv.mkDerivation rec {
   version = "12.02.1";
   name = "linuxband-${version}";
 

pkgs/applications/audio/spotify/default.nix

@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.37.152.gc83ea995-42";
+  version = "1.0.38.171.g5e1cd7b2-22";
 
   deps = [
     alsaLib
@@ -51,20 +51,27 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "00hd5q3cn9dzgphkpswd5y06k9phiqhhmb3frwdkcnb1d4pnp9cx";
+      sha256 = "0mhrbcw92g11czwcclnbwz1pk1jgap4xlya7dqsrcyb50azmv450";
     };
 
   buildInputs = [ dpkg makeWrapper ];
 
-  unpackPhase = "true";
+  unpackPhase = ''
+    runHook preUnpack
+    dpkg-deb -x $src .
+    runHook postUnpack
+  '';
+
+  configurePhase = "runHook preConfigure; runHook postConfigure";
+  buildPhase = "runHook preBuild; runHook postBuild";
 
   installPhase =
     ''
+      runHook preInstall
+
       libdir=$out/lib/spotify
       mkdir -p $libdir
-      dpkg-deb -x $src $out
+      mv ./usr/* $out/
-      mv $out/usr/* $out/
-      rm -rf $out/usr
 
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
@@ -96,6 +103,8 @@ stdenv.mkDerivation {
         ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
           "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
       done
+
+      runHook postInstall
     '';
 
   dontStrip = true;

pkgs/applications/editors/nvpy/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }:
+{ pkgs, fetchurl, tk, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   version = "0.9.7";
   name = "nvpy-${version}";
 

pkgs/applications/graphics/cinepaint/default.nix

@@ -1,10 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
-  perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
+  perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
   mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygtk;
+in stdenv.mkDerivation rec {
   name = "cinepaint-1.1";
 
   src = fetchurl {

pkgs/applications/graphics/freecad/default.nix

@@ -1,8 +1,9 @@
 { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
-, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper
+, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }:
-, matplotlib, pycollada, pyside, pysideTools, pysideShiboken, pivy }:
 
-stdenv.mkDerivation rec {
+let
+  pythonPackages = python27Packages;
+in stdenv.mkDerivation rec {
   name = "freecad-${version}";
   version = "0.16";
 
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
   };
 
-  buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
+  buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
     zlib python swig gfortran soqt libf2c makeWrapper matplotlib
     pycollada pyside pysideShiboken pysideTools pivy
   ];

pkgs/applications/graphics/gimp/2.8.nix

@@ -1,9 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
+, pythonPackages, libart_lgpl, libexif, gettext, xorg }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) pygtk wrapPython python;
+in stdenv.mkDerivation rec {
   name = "gimp-${version}";
   version = "2.8.18";
 

pkgs/applications/graphics/inkscape/default.nix

@@ -1,12 +1,13 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
-, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
+, gsl, python, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, unzip, automake114x, autoconf
 , boxMakerPlugin ? false # boxmaker plugin
 }:
 
 let 
+  pythonEnv = python.withPackages(ps: with ps; [ pyxml numpy lxml ]);
 
 boxmaker = fetchurl {
   # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
@@ -42,11 +43,9 @@ stdenv.mkDerivation rec {
       --replace "#if __cplusplus >= 201103L" "#if true"
   '';
 
-  propagatedBuildInputs = [
+  # Python is used at run-time to execute scripts, e.g., those from
-    # Python is used at run-time to execute scripts, e.g., those from
+  # the "Effects" menu.
-    # the "Effects" menu.
+  propagatedBuildInputs = [ pythonEnv ];
-    python pyxml numpy lxml
-  ];
 
   buildInputs = [
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
@@ -71,13 +70,6 @@ stdenv.mkDerivation rec {
     }
 
     # Make sure PyXML modules can be found at run-time.
-    for i in "$out/bin/"*
-    do
-      wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})"  \
-       --prefix PATH : ${python}/bin ||  \
-        exit 2
-    done
     rm "$out/share/icons/hicolor/icon-theme.cache"
   '';
 

pkgs/applications/graphics/jbrout/default.nix

@@ -1,6 +1,8 @@
-{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2,  pythonPackages, fbida, which }:
+{ stdenv, fetchsvn, pythonPackages, makeWrapper, fbida, which }:
 
-buildPythonApplication rec {
+let
+  inherit (pythonPackages) python;
+in pythonPackages.buildPythonApplication rec {
   name = "jbrout-${version}";
   version = "338";
 

pkgs/applications/graphics/mcomix/default.nix

@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, python27Packages }:
+{ stdenv, fetchurl, python27Packages }:
 
-buildPythonApplication rec {
+python27Packages.buildPythonApplication rec {
-    namePrefix = "";
     name = "mcomix-${version}";
     version = "1.2.1";
 

pkgs/applications/graphics/mirage/default.nix

@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }:
+{ stdenv, fetchurl, pythonPackages, libX11, gettext }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-    namePrefix = "";
+    name = "mirage-${version}";
-    name = "mirage-0.9.5.2";
+    version = "0.9.5.2";
 
     src = fetchurl {
       url = "mirror://sourceforge/mirageiv/${name}.tar.bz2";
@@ -17,7 +17,7 @@ buildPythonApplication rec {
       sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py
     '';
 
-    propagatedBuildInputs = [ pygtk pillow ];
+    propagatedBuildInputs = with pythonPackages; [ pygtk pillow ];
 
     meta = {
       description = "Simple image viewer written in PyGTK";

pkgs/applications/graphics/mypaint/default.nix

@@ -1,9 +1,11 @@
 { stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
-, lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages
+, lcms2, libpng , makeWrapper, pkgconfig, pythonPackages
 , scons, swig
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygtk numpy;
+in stdenv.mkDerivation rec {
   name = "mypaint-${version}";
   version = "1.1.0";
 
@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
     python scons swig
   ];
 
-  propagatedBuildInputs = [ hicolor_icon_theme pythonPackages.numpy ];
+  propagatedBuildInputs = [ hicolor_icon_theme numpy ];
 
   buildPhase = "scons prefix=$out";
 

pkgs/applications/graphics/rawtherapee/default.nix

@@ -1,27 +1,31 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
 , libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
-, mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:
 
 stdenv.mkDerivation rec {
-  name = "rawtherapee-4.2";
+  version = "4.2.1025";
+  name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    rev = "4.2";
+    rev = "dc4bbe906ba92ddc66f98a3c26ce19822bfb99ab";
-    sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
+    sha256 = "0c5za9s8533fiyl32378dq9rgd5044xi8y0wm2gkr7krbdnx74l3";
   };
 
   buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
-    lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ];
+    lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
 
-  patchPhase = ''
+  cmakeFlags = [
-    patch -p1 < ${./sigc++_fix.patch}
+    "-DPROC_TARGET_NUMBER=2"
+  ];
+
+  CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result";
+
+  postUnpack = ''
+    echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake
   '';
 
-  NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
-
   enableParallelBuilding = true;
 
   meta = {

pkgs/applications/graphics/rawtherapee/sigc++_fix.patch

@@ -1,52 +0,0 @@
-diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
-index f73dd8a..a7a069c 100644
---- a/rtgui/adjuster.cc
-+++ b/rtgui/adjuster.cc
-@@ -17,7 +17,7 @@
-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-  */
- #include "adjuster.h"
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include <cmath>
- #include "multilangmgr.h"
- #include "../rtengine/rtengine.h"
-diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
-index 134c0d7..8ce1808 100644
---- a/rtgui/preferences.cc
-+++ b/rtgui/preferences.cc
-@@ -16,7 +16,7 @@
-  *  You should have received a copy of the GNU General Public License
-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-  */
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include "preferences.h"
- #include "multilangmgr.h"
- #include "splash.h"
-diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
-index 6b41329..19cde25 100644
---- a/rtgui/thresholdadjuster.cc
-+++ b/rtgui/thresholdadjuster.cc
-@@ -17,7 +17,7 @@
-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-  */
- #include "thresholdadjuster.h"
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include <cmath>
- #include "multilangmgr.h"
- #include "../rtengine/rtengine.h"
-diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
-index 2e439e1..5f14200 100644
---- a/rtgui/tonecurve.cc
-+++ b/rtgui/tonecurve.cc
-@@ -18,7 +18,7 @@
-  */
- #include "tonecurve.h"
- #include "adjuster.h"
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include <iomanip>
- #include "ppversion.h"
- #include "edit.h"

pkgs/applications/misc/buku/default.nix

@@ -1,19 +1,21 @@
 { stdenv, pythonPackages, fetchFromGitHub,
-  encryptionSupport ? false
 }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.9";
+  version = "2.4";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
-    rev = "e99844876d0d871df80770b1bd76c161276116eb";
+    rev = "v${version}";
-    sha256 = "1qwkff61gdjd6w337a5ipfiybzqdwkxdyfa1l4zzm9dj7lsklgq2";
+    sha256 = "0rmvlpp1pzzgn1hf87ksigj9kp60gfwkvxymb4wiz7dqa57b1q0n";
   };
 
-  buildInputs = stdenv.lib.optional encryptionSupport pythonPackages.pycrypto;
+  buildInputs = [
+    pythonPackages.cryptography
+    pythonPackages.beautifulsoup4
+  ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 

pkgs/applications/misc/electrum-dash/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "electrum-dash-${version}";
   version = "2.4.1";
 

pkgs/applications/misc/ikiwiki/default.nix

@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20150614";
+  version = "3.20160905";
 
   lib = stdenv.lib;
 in
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
+    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2";
+    sha256 = "1xbjj5qpxh7f05b69z9vvajg05zv63fj8js77c47yx01xifgd3vn";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, buildEnv, fetchFromGitHub, mono }:
+
+let
+  version = "1.8.4.1";
+  drv = stdenv.mkDerivation {
+    name = "keepasshttp-${version}";
+    src = fetchFromGitHub {
+      owner = "pfn";
+      repo = "keepasshttp";
+      rev = "${version}";
+      sha256 = "1074yv0pmzdwfwkx9fh7n2igdqwsyxypv55khkyng6synbv2p2fd";
+    };
+
+    meta = {
+      description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP";
+      homepage    = https://github.com/pfn/keepasshttp;
+      platforms   = with stdenv.lib.platforms; linux;
+      license     = stdenv.lib.licenses.gpl3;
+    };
+
+    pluginFilename = "KeePassHttp.plgx";
+
+    installPhase = ''
+      mkdir -p $out/lib/dotnet/keepass/
+      cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
+    '';
+  };
+in
+  # Mono is required to compile plugin at runtime, after loading.
+  buildEnv { name = drv.name; paths = [ mono drv ]; }

pkgs/applications/misc/llpp/default.nix

@@ -1,6 +1,8 @@
-{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
+{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
 , gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
 
+assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
+
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";

pkgs/applications/misc/mlterm/default.nix

@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, autoconf
+{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem
-, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte, fribidi, libssh2
+, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte
+, harfbuzz #substituting glyphs with opentype fonts
+, fribidi, m17n_lib #bidi and encoding
+, openssl, libssh2 #build-in ssh
 }:
 
 stdenv.mkDerivation rec {
@@ -13,11 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf ];
   buildInputs = [
-    libX11 gdk_pixbuf.dev cairo libXft gtk3 vte fribidi libssh2
+    libX11 gdk_pixbuf.dev cairo libXft gtk3 vte
+    harfbuzz fribidi m17n_lib openssl libssh2
   ];
 
+  #bad configure.ac and Makefile.in everywhere
   preConfigure = ''
-    sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \
+    sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
       xwindow/libtype/Makefile.in \
       main/Makefile.in \
       tool/mlfc/Makefile.in \
@@ -26,24 +31,69 @@ stdenv.mkDerivation rec {
       xwindow/libotl/Makefile.in
     sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
       tool/mlconfig/po/Makefile.in.in
+    #utmp and mlterm-fb
+    substituteInPlace configure.in \
+      --replace "-m 2755 -g utmp" " " \
+      --replace "-m 4755 -o root" " "
+    substituteInPlace configure \
+      --replace "-m 2755 -g utmp" " " \
+      --replace "-m 4755 -o root" " "
   '';
+  NIX_LDFLAGS = "
+    -L${stdenv.cc.cc.lib}/lib
+    -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
+    -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
+  " + stdenv.lib.optionalString (openssl != null) "
+    -lcrypto
+  " + stdenv.lib.optionalString (libssh2 != null) "
+    -lssh2
+  ";
 
   configureFlags = [
     "--with-x=yes"
-    "--with-gtk=3.0"
+    "--with-gui=xlib,fb"
-    "--with-imagelib=gdk-pixbuf"
+    "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice
-    "--with-gui=xlib"
     "--with-type-engines=cairo,xft,xcore"
-    "--enable-ind"
+    "--with-gtk=3.0"
-    "--enable-fribidi"
+    "--enable-ind" #indic scripts
+    "--enable-fribidi" #bidi scripts
+    "--enable-m17nlib" #character encodings
     "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
-    "--disable-utmp"
+     #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core
+     #and configuring ~/.mlterm/key correctly.
+ ] ++ stdenv.lib.optional (libssh2 == null) [
+    "--disable-ssh2"
  ];
 
+  postInstall = ''
+    mkdir -p "$out/share/icons/hicolor/scalable/apps"
+    cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
+
+    mkdir -p "$out/share/icons/hicolor/48x48/apps"
+    cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
+
+    mkdir -p "$out/share/applications"
+    cp $desktopItem/share/applications/* $out/share/applications
+  '';
+
+  desktopItem = makeDesktopItem rec {
+    name = "mlterm";
+    exec = "mlterm %U";
+    icon = "mlterm";
+    type = "Application";
+    comment = "Terminal emulator";
+    desktopName = "mlterm";
+    genericName = "Terminal emulator";
+    categories = stdenv.lib.concatStringsSep ";" [
+      "Application" "System" "TerminalEmulator"
+    ];
+    startupNotify = "false";
+  };
+
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/mlterm/;
     license = licenses.bsd2;
-    maintainers = with maintainers; [ vrthra ];
+    maintainers = with maintainers; [ vrthra ramkromberg ];
     platforms = with platforms; linux;
   };
 }

pkgs/applications/misc/mupdf/default.nix

@@ -18,15 +18,19 @@ stdenv.mkDerivation rec {
       url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958";
       sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7";
     })
+    (fetchpatch {
+      name = "mupdf-696941-fix-use-after-free.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958";
+      sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h";
+    })
     # Compatibility with new openjpeg
     (fetchpatch {
-      name = "mupdf-1.5-openjpeg-2.1.0.patch";
+      name = "mupdf-1.9a-openjpeg-2.1.1.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.5-openjpeg-2.1.0.patch?h=packages/mupdf&id=ca5e3ef6c7788ccfb6011d785078bc47762f19e5";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53";
-      sha256 = "0f18793q9fd22h3lclm8wahvc8az4v08an6lzy8mczrkl8mcgm3k";
+      sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g";
     })
   ];
 
-  NIX_CFLAGS_COMPILE= [ "-fPIC" ];
   makeFlags = [ "prefix=$(out)" ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
@@ -78,7 +82,7 @@ stdenv.mkDerivation rec {
     repositories.git = git://git.ghostscript.com/mupdf.git;
     description = "Lightweight PDF viewer and toolkit written in portable C";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ viric vrthra ];
+    maintainers = with maintainers; [ viric vrthra fpletz ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/ranger/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, python, w3m, file }:
+{ stdenv, fetchurl, pythonPackages, w3m, file }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "ranger-1.7.2";
 
   meta = {
@@ -15,7 +15,7 @@ buildPythonApplication rec {
     sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
   };
 
-  propagatedBuildInputs = [ python.modules.curses file ];
+  propagatedBuildInputs = [ pythonPackages.python.modules.curses file ];
 
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \

pkgs/applications/misc/terminator/default.nix

@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool
+{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }:
-, makeWrapper
-}:
 
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   name = "terminator-${version}";
   version = "0.98";
   
@@ -11,18 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
   
-  buildInputs = [
+  propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ];
-    python pygtk notify keybinder vte gettext intltool makeWrapper
-  ];
 
-  installPhase = ''
+  #setupPyBuildFlags = [ "--without-icon-cache" ];
-    python setup.py --without-icon-cache install --prefix="$out"
 
-    for file in "$out"/bin/*; do
+  doCheck = false;
-        wrapProgram "$file" \
-            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
-    done
-  '';
 
   meta = with stdenv.lib; {
     description = "Terminal emulator with support for tiling and tabs";

pkgs/applications/misc/termite/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper
+{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin
 , configFile ? null
 }:
 
@@ -37,13 +37,13 @@ let
       platforms = platforms.all;
     };
   };
-in if configFile == null then termite else stdenv.mkDerivation {
+in if configFile == null then termite else symlinkJoin {
   name = "termite-with-config-${version}";
+  paths = [ termite ];
   nativeBuildInputs = [ makeWrapper ];
-  buildCommand = ''
+  postBuild = ''
-    mkdir -p $out/etc/xdg/termite/ $out/bin
+    wrapProgram $out/bin/termite \
-    ln -s ${termite}/bin/termite $out/bin/termite
+      --add-flags "--config ${configFile}"
-    wrapProgram $out/bin/termite --add-flags "--config ${configFile}"
   '';
   passthru.terminfo = termite.terminfo;
 }

pkgs/applications/networking/browsers/chromium/upstream-info.nix

@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31";
+    sha256 = "1wpcl6cgiv02s3zgxvgsmrws454g81lnvyfjmhhcdckkwyljcv5l";
-    sha256bin64 = "006pksc1ibdqcshsal55ps4qizj706zh1jrph6152znafl5hjb7i";
+    sha256bin64 = "0snr5rd2r5jfjqhqwkxcw26j53fivmf60g3qfnp5xz5b6nlsab9g";
-    version = "53.0.2785.92";
+    version = "54.0.2840.34";
   };
   dev = {
-    sha256 = "1n6cq9fani9cl4qxx82iaiv40n4d6y5ns9mk63na1m5pdcjbaqhw";
+    sha256 = "1lbpj1wm35l2qf4fxfivd9drwwdrylv3knh8db889dyz5hrh3j5y";
-    sha256bin64 = "0iypx2p7xqc03i5mc85ilf162gdpn4x2vkb1kgzhlzhq8nvq0y9d";
+    sha256bin64 = "0rkvrrcr1j9662v00kf7x7qmdps1pd4hq818x7crkilczybd05pr";
-    version = "54.0.2840.8";
+    version = "55.0.2868.3";
   };
   stable = {
-    sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31";
+    sha256 = "0qk0y457l91yzxradpinayzw3947s5s4axd75h968vrl0jan51vs";
-    sha256bin64 = "0nma1h5npx6vp5fww50xdznadq7yf5604w02w8h5mq3an4pn4g1j";
+    sha256bin64 = "0sz4dfwxvkffcj4rrqh3vn2xxp2vvjzdjsy0s9wcvam01igmy261";
-    version = "53.0.2785.92";
+    version = "53.0.2785.116";
   };
 }

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

@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk
+{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
-, webkit, glib_networking, gsettings_desktop_schemas, pythonPackages
+, webkit, glib_networking, gsettings_desktop_schemas, python2Packages
 }:
 # This package needs python3 during buildtime,
 # but Python 2 + packages during runtime.
@@ -40,5 +40,5 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
 
   buildInputs = [ gsettings_desktop_schemas webkit ];
-  propagatedBuildInputs = [ pygtk pythonPackages.six ];
+  propagatedBuildInputs = with python2Packages; [ pygtk six ];
 }

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

@@ -1,24 +1,42 @@
-{ stdenv, fetchgit, go, git, which }:
+{ stdenv, fetchFromGitHub, go, which }:
 
+let
+  version = "1.3.0";
+  versionMajor = "1";
+  versionMinor = "3";
+in
 stdenv.mkDerivation rec {
   name = "openshift-origin-${version}";
-  version = "1.0.1";
+  inherit version;
 
-  src = fetchgit {
+  src = fetchFromGitHub {
-    url = https://github.com/openshift/origin.git;
+    owner = "openshift";
-    rev = "1b601951daa44964c9bc7e4a2264d65489e3a58c";
+    repo = "origin";
-    sha256 = "0hvipgnkpph81jx6h6bar49j5zkrxzi6h71b4y75c0l7af129wdi";
+    rev = "v${version}";
-    leaveDotGit = true;
+    sha256 = "07s7xv8x8pch68j7lsw29im0axi07x32ag9wh9aqa0y570q9xgxy";
-    deepClone = true;
   };
 
-  buildInputs = [ go git which ];
+  buildInputs = [ go which ];
 
-  buildPhase = "hack/build-go.sh";
+  patchPhase = ''
+    patchShebangs ./hack
+  '';
+
+  buildPhase = ''
+    export GOPATH=$(pwd)
+    # Openshift build require this variables to be set
+    # unless there is a .git folder which is not the case with fetchFromGitHub
+    export OS_GIT_VERSION=${version}
+    export OS_GIT_MAJOR=${versionMajor}
+    export OS_GIT_MINOR=${versionMinor}
+    make build
+  '';
 
   installPhase = ''
+    export GOOS=$(go env GOOS)
+    export GOARCH=$(go env GOARCH)
     mkdir -p "$out/bin"
-    cp _output/local/go/bin/* "$out/bin/"
+    mv _output/local/bin/$GOOS/$GOARCH/* "$out/bin/"
   '';
 
   meta = with stdenv.lib; {
@@ -27,6 +45,5 @@ stdenv.mkDerivation rec {
     homepage = http://www.openshift.org;
     maintainers = with maintainers; [offline];
     platforms = [ "x86_64-linux" ];
-    broken = true;
   };
 }

pkgs/applications/networking/corebird/default.nix

@@ -2,14 +2,14 @@
 , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.1";
+  version = "1.3.2";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "1a7b6hinl5p7yanf75a0khki2fvd04km1xlkwnspgx75cmnbnn5z";
+    sha256 = "1ps4l37dyj2pmzcly9jb95y7cqa8zm8hyfja5prsqj7pbka1fibn";
   };
 
   preConfigure = ''

pkgs/applications/networking/dropbox/default.nix

@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "10.4.25";
+  version = "11.4.20";
   sha256 =
     {
-      "x86_64-linux" = "12kklhy5i3sj7hhlg0r0vvnv8vkd34swdjlby4sd3lcf012amc6q";
+      "x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6";
-      "i686-linux"   = "13i8ykxyc7scyaynfzgp2jhl9qd47lpdq62sx657abziclbybkh6";
+      "i686-linux"   = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

pkgs/applications/networking/google-drive-ocamlfuse/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, ocamlPackages, zlib }:
+{ stdenv, fetchurl, zlib
+, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
   name = "google-drive-ocamlfuse-${version}";
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab";
   };
 
-  buildInputs = [ zlib ] ++ (with ocamlPackages; [ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]);
+  buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];
 
   configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
   buildPhase = "ocaml setup.ml -build";

pkgs/applications/networking/instant-messengers/baresip/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
 , cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
 , gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
-, gsm, speex, portaudio, spandsp, libuuid
+, gsm, speex, portaudio, spandsp, libuuid, ccache
 }:
 stdenv.mkDerivation rec {
   version = "0.4.20";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
+    ccache
     ];
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
     "LIBREM_PATH=${librem}"
     ''PREFIX=$(out)''
     "USE_VIDEO=1"
+    "CCACHE_DISABLE=1"
 
     "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" 
     "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1" 
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
     "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" 
     "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1"
 
-    "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" 
+    "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1="
     "USE_ILBC=" "USE_OPUS=" "USE_SILK=" 
   ]
   ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"

pkgs/applications/networking/instant-messengers/pidgin/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
-, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext
+, gst_all_1, startupnotification, gettext
-, perl, perlXMLParser, libxml2, nss, nspr, farsight2
+, perl, perlXMLParser, libxml2, nss, nspr, farstream, farsight2
 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
 , lib, python, libICE, libXext, libSM
 , openssl ? null
@@ -14,21 +14,23 @@
 let unwrapped = stdenv.mkDerivation rec {
   name = "pidgin-${version}";
   majorVersion = "2";
-  version = "${majorVersion}.10.11";
+  version = "${majorVersion}.11.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj";
+    sha256 = "0crkggjj6y07v1kdwil9vw532b0vrs6p33nmlvdkpnl60m2169pp";
   };
 
   inherit nss ncurses;
 
   nativeBuildInputs = [ makeWrapper ];
 
+  NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
+
   buildInputs = [
-    gtkspell2 aspell
+    gtkspell2 aspell startupnotification
-    gstreamer gst_plugins_base gst_plugins_good startupnotification
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    libxml2 nss nspr farsight2
+    libxml2 nss nspr farstream farsight2
     libXScrnSaver ncurses python
     avahi dbus dbus_glib intltool libidn
     libICE libXext libSM
@@ -41,7 +43,7 @@ let unwrapped = stdenv.mkDerivation rec {
     pkgconfig gtk2 perl perlXMLParser gettext
   ];
 
-  patches = [./pidgin-makefile.patch ./add-search-path.patch ];
+  patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
 
   configureFlags = [
     "--with-nspr-includes=${nspr.dev}/include/nspr"

pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch

@@ -1,15 +1,16 @@
-diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
+diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
---- pidgin-2.6.4/pidgin/Makefile.am	2009-11-30 04:13:54.000000000 +0100
+index 84d927b..1467c19 100644
-+++ pidgin-2.6.4.new/pidgin/Makefile.am	2009-12-27 17:30:58.000000000 +0100
+--- a/pidgin/Makefile.am
-@@ -200,6 +200,7 @@
++++ b/pidgin/Makefile.am
+@@ -151,6 +151,7 @@ pidgin_LDADD = \
  	$(GLIB_LIBS) \
  	$(DBUS_LIBS) \
  	$(GSTREAMER_LIBS) \
 +	$(GSTINTERFACES_LIBS) \
+ 	$(GSTVIDEO_LIBS) \
  	$(XSS_LIBS) \
  	$(SM_LIBS) \
- 	$(INTLLIBS) \
+@@ -171,6 +172,7 @@ AM_CPPFLAGS = \
-@@ -224,6 +225,7 @@
  	-I$(top_srcdir) \
  	$(GLIB_CFLAGS) \
  	$(GSTREAMER_CFLAGS) \
@@ -17,18 +18,19 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
  	$(DEBUG_CFLAGS) \
  	$(GTK_CFLAGS) \
  	$(DBUS_CFLAGS) \
-diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
+diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
---- pidgin-2.6.4/pidgin/Makefile.in	2009-11-30 05:12:21.000000000 +0100
+index 0d51e25..dd5d879 100644
-+++ pidgin-2.6.4.new/pidgin/Makefile.in	2009-12-27 17:30:36.000000000 +0100
+--- a/pidgin/Makefile.in
-@@ -645,6 +645,7 @@
++++ b/pidgin/Makefile.in
+@@ -703,6 +703,7 @@ EXTRA_DIST = \
  @ENABLE_GTK_TRUE@	$(GLIB_LIBS) \
  @ENABLE_GTK_TRUE@	$(DBUS_LIBS) \
  @ENABLE_GTK_TRUE@	$(GSTREAMER_LIBS) \
 +@ENABLE_GTK_TRUE@	$(GSTINTERFACES_LIBS) \
+ @ENABLE_GTK_TRUE@	$(GSTVIDEO_LIBS) \
  @ENABLE_GTK_TRUE@	$(XSS_LIBS) \
  @ENABLE_GTK_TRUE@	$(SM_LIBS) \
- @ENABLE_GTK_TRUE@	$(INTLLIBS) \
+@@ -723,6 +724,7 @@ EXTRA_DIST = \
-@@ -666,6 +667,7 @@
  @ENABLE_GTK_TRUE@	-I$(top_srcdir) \
  @ENABLE_GTK_TRUE@	$(GLIB_CFLAGS) \
  @ENABLE_GTK_TRUE@	$(GSTREAMER_CFLAGS) \
@@ -36,23 +38,25 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
  @ENABLE_GTK_TRUE@	$(DEBUG_CFLAGS) \
  @ENABLE_GTK_TRUE@	$(GTK_CFLAGS) \
  @ENABLE_GTK_TRUE@	$(DBUS_CFLAGS) \
-diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.am pidgin-2.6.4.new/pidgin/plugins/Makefile.am
+diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
---- pidgin-2.6.4/pidgin/plugins/Makefile.am	2009-11-30 04:13:57.000000000 +0100
+index 3bb8c22..6d1e869 100644
-+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am	2009-12-27 16:58:50.000000000 +0100
+--- a/pidgin/plugins/Makefile.am
-@@ -137,6 +137,7 @@
++++ b/pidgin/plugins/Makefile.am
- 	$(DEBUG_CFLAGS) \
+@@ -145,6 +145,7 @@ AM_CPPFLAGS = \
  	$(GTK_CFLAGS) \
+ 	$(UNITY_CFLAGS) \
  	$(GSTREAMER_CFLAGS) \
 +	$(GSTINTERFACES_CFLAGS) \
  	$(PLUGIN_CFLAGS)
  
  #
-diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in
+diff --git a/pidgin/plugins/Makefile.in b/pidgin/plugins/Makefile.in
---- pidgin-2.6.4/pidgin/plugins/Makefile.in	2009-11-30 05:12:22.000000000 +0100
+index 82a34aa..1f7db00 100644
-+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in	2009-12-27 16:59:13.000000000 +0100
+--- a/pidgin/plugins/Makefile.in
-@@ -644,6 +644,7 @@
++++ b/pidgin/plugins/Makefile.in
- 	$(DEBUG_CFLAGS) \
+@@ -781,6 +781,7 @@ AM_CPPFLAGS = \
  	$(GTK_CFLAGS) \
+ 	$(UNITY_CFLAGS) \
  	$(GSTREAMER_CFLAGS) \
 +	$(GSTINTERFACES_CFLAGS) \
  	$(PLUGIN_CFLAGS)

pkgs/applications/networking/mumble/default.nix

@@ -37,6 +37,7 @@ let
       "CONFIG+=no-bundled-speex"
     ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
       ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
+      ++ optional (!iceSupport) "CONFIG+=no-ice"
       ++ (overrides.configureFlags or [ ]);
 
     preConfigure = ''

pkgs/applications/networking/newsreaders/liferea/default.nix

@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
+{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages
 , glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
 , webkitgtk, json_glib, gobjectIntrospection, gst_all_1
 , libnotify
 , makeWrapper
 }:
 
-let pname = "liferea";
+let
-    version = "1.10.19";
+  pname = "liferea";
-in
+  version = "1.10.19";
-stdenv.mkDerivation rec {
+  inherit (pythonPackages) python pygobject3;
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {

pkgs/applications/office/gnumeric/default.nix

@@ -1,9 +1,10 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
-, goffice, gnome3, makeWrapper, gtk3, bison
+, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
-, python, pygobject3
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject3;
+in stdenv.mkDerivation rec {
   name = "gnumeric-1.12.32";
 
   src = fetchurl {

pkgs/applications/office/keepnote/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, pygtk }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication {
+pythonPackages.buildPythonApplication {
   name = "keepnote-0.7.8";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ buildPythonApplication {
     sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
   };
 
-  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];
+  propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ];
 
   # Testing fails.
   doCheck = false;

pkgs/applications/office/qnotero/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, python3, python3Packages
+{ stdenv, fetchFromGitHub, python3Packages
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0";
   };
 
-  propagatedBuildInputs = [ python3 python3Packages.pyqt4 ];
+  propagatedBuildInputs = [ python3Packages.pyqt4 ];
 
   patchPhase = ''
       substituteInPlace ./setup.py \

pkgs/applications/office/zim/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject2, python }:
+{ stdenv, lib, fetchurl, pythonPackages }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
@@ -7,7 +7,7 @@
 #  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
 #
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "zim-${version}";
   version = "0.65";
   namePrefix = "";
@@ -17,7 +17,7 @@ buildPythonApplication rec {
     sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
   };
 
-  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject2 ];
+  propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ];
 
   preBuild = ''
     export HOME=$TMP

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

@@ -3,7 +3,10 @@
 #   However, coq can build without csdp by setting it to null.
 #   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }:
+{ stdenv, lib, make, fetchurl
+, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }:
+
+assert lib.versionOlder ocaml.version "4";
 
 let 
   version = "8.3pl4";

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

@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
   buildInputs = [ mlton ];
+  patchPhase = ''
+    patchShebangs ./script/
+  '';
   builder = builtins.toFile "builder.sh" ''
     source $stdenv/setup
     mkdir -p $out/bin

pkgs/applications/science/math/glsurf/default.nix

@@ -27,5 +27,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
     description = "A program to draw implicit surfaces and curves";
+    broken = true;
   };
 }

pkgs/applications/science/math/scilab/default.nix

@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
     description = "Scientific software package for numerical computations (Matlab lookalike)";
     # see http://www.scilab.org/legal
     license = "SciLab";
+    broken = true;
   };
 }

pkgs/applications/science/robotics/gazebo/default.nix

@@ -31,7 +31,9 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true; # gazebo needs this so bad
-  cmakeFlags = []
+  cmakeFlags = [
+  "-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+  "-DCMAKE_INSTALL_INCLUDEDIR=include" ]
     ++ optional withQuickBuild [ "-DENABLE_TESTS_COMPILATION=False" ]
     ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ]
     ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ];

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

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   version = "2.7";
   release = ".0";
   name = "bazaar-${version}${release}";
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d";
   };
 
-  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
-
   # Readline support is needed by bzrtools.
-  pythonPath = [ pythonPackages.readline ];
+  propagatedBuildInputs = [ pythonPackages.python.modules.readline ];
+
+  doCheck = false;
 
   # Bazaar can't find the certificates alone
   patches = [ ./add_certificates.patch ];
@@ -22,11 +22,6 @@ stdenv.mkDerivation rec {
       --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
   '';
 
-  installPhase = ''
-    python setup.py install --prefix=$out
-    wrapPythonPrograms
-  '';
-
   meta = {
     homepage = http://bazaar-vcs.org/;
     description = "A distributed version control system that Just Works";

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

@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, python, pygtk, makeWrapper }:
+{ stdenv, fetchurl, python27Packages, makeWrapper }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (python27Packages) pygtk python;
+in stdenv.mkDerivation rec {
   version = "0.4.8";
   name = "diffuse-${version}";
 

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

@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, buildPythonApplication }:
+{ stdenv, fetchzip, pythonPackages}:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "gitinspector-${version}";
   version = "0.4.4";
   namePrefix = "";

pkgs/applications/version-management/gitlab-shell/default.nix

@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  version = "3.4.0";
+  version = "3.6.0";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1vhwsiz6n96i6cbcqbf4pa93nzx4xkaph2lmzh0nm4mi5ydl49is";
+    sha256 = "1cc8lnz06d1q2hdrgnsqk50wj0x950w81jsalfjxmx5lais4qgg9";
   };
 
   buildInputs = [
@@ -56,7 +56,10 @@ stdenv.mkDerivation rec {
         " *args)"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://www.gitlab.com/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
+    license = licenses.mit;
   };
 }

pkgs/applications/version-management/gitlab-workhorse/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.11";
+  version = "0.8.2";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1z32nf9qbw050wzl1dsydrs68c9fp5kkvdn58z2g88bbyk6gyivm";
+    sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag";
   };
 
   buildInputs = [ git go ];
@@ -24,7 +24,10 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://www.gitlab.com/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
+    license = licenses.mit;
   };
 }

pkgs/applications/version-management/gitlab/Gemfile

@@ -26,7 +26,7 @@ gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
 gem 'omniauth-bitbucket',     '~> 0.0.2'
 gem 'omniauth-cas3',          '~> 1.1.2'
-gem 'omniauth-facebook',      '~> 3.0.0'
+gem 'omniauth-facebook',      '~> 4.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.4.1'
@@ -53,7 +53,7 @@ gem 'browser', '~> 2.2'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.4.7'
+gem 'gitlab_git', '~> 10.6.6'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -97,9 +97,6 @@ gem 'fog-rackspace', '~> 0.1.1'
 # for aws storage
 gem 'unf', '~> 0.1.4'
 
-# Authorization
-gem 'six', '~> 0.2.0'
-
 # Seed data
 gem 'seed-fu', '~> 2.3.5'
 
@@ -209,6 +206,9 @@ gem 'mousetrap-rails', '~> 1.4.6'
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.3'
 
+# Faster JSON
+gem 'oj', '~> 2.17.4'
+
 # Parse time & duration
 gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'
@@ -298,9 +298,10 @@ group :development, :test do
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop', '~> 0.41.2', require: false
+  gem 'rubocop', '~> 0.42.0', require: false
   gem 'rubocop-rspec', '~> 1.5.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
+  gem 'haml_lint', '~> 0.18.2', require: false
   gem 'simplecov', '0.12.0', require: false
   gem 'flog', '~> 4.3.2', require: false
   gem 'flay', '~> 2.6.1', require: false
@@ -319,6 +320,7 @@ group :test do
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack', '~> 1.3.6'
+  gem 'timecop', '~> 0.8.0'
 end
 
 group :production do
@@ -349,7 +351,7 @@ gem 'paranoia', '~> 2.0'
 gem 'health_check', '~> 2.1.0'
 
 # System information
-gem 'vmstat', '~> 2.1.1'
+gem 'vmstat', '~> 2.2'
 gem 'sys-filesystem', '~> 1.1.6'
 
 gem "activerecord-nulldb-adapter"

pkgs/applications/version-management/gitlab/Gemfile.lock

@@ -191,7 +191,7 @@ GEM
     erubis (2.7.0)
     escape_utils (1.1.1)
     eventmachine (1.0.8)
-    excon (0.49.0)
+    excon (0.52.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_girl (4.5.0)
@@ -217,8 +217,8 @@ GEM
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
-    fog-aws (0.9.2)
+    fog-aws (0.11.0)
-      fog-core (~> 1.27)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
@@ -227,7 +227,7 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-core (1.40.0)
+    fog-core (1.42.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -281,7 +281,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gitlab_git (10.4.7)
+    gitlab_git (10.6.6)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
@@ -324,11 +324,18 @@ GEM
     grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
+    haml (4.0.7)
+      tilt
+    haml_lint (0.18.2)
+      haml (~> 4.0)
+      rake (>= 10, < 12)
+      rubocop (>= 0.36.0)
+      sysexits (~> 1.1)
     hamlit (2.6.1)
       temple (~> 0.7.6)
       thor
       tilt
-    hashie (3.4.3)
+    hashie (3.4.4)
     health_check (2.1.0)
       rails (>= 4.0)
     hipchat (1.5.2)
@@ -396,9 +403,9 @@ GEM
       mime-types (>= 1.16, < 4)
     mail_room (0.8.0)
     method_source (0.8.2)
-    mime-types (2.99.2)
+    mime-types (2.99.3)
     mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
     multi_json (1.12.1)
@@ -410,7 +417,7 @@ GEM
     net-ssh (3.0.1)
     newrelic_rpm (3.16.0.318)
     nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+      mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
     numerizer (0.1.1)
     oauth (0.4.7)
@@ -422,6 +429,7 @@ GEM
       rack (>= 1.2, < 3)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    oj (2.17.4)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
@@ -439,7 +447,7 @@ GEM
       addressable (~> 2.3)
       nokogiri (~> 1.6.6)
       omniauth (~> 1.2)
-    omniauth-facebook (3.0.0)
+    omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.1.2)
       omniauth (~> 1.0)
@@ -586,7 +594,7 @@ GEM
       railties (>= 4.2.0, < 5.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (2.0.5)
+    rouge (2.0.6)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -614,7 +622,7 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.5.0)
-    rubocop (0.41.2)
+    rubocop (0.42.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -685,7 +693,6 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    six (0.2.0)
     slack-notifier (1.2.1)
     slop (3.6.0)
     spinach (0.8.10)
@@ -726,6 +733,7 @@ GEM
     stringex (2.5.2)
     sys-filesystem (1.1.6)
       ffi
+    sysexits (1.2.0)
     systemu (2.6.5)
     task_list (1.0.2)
       html-pipeline
@@ -757,7 +765,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -774,7 +782,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    vmstat (2.1.1)
+    vmstat (2.2.0)
     warden (1.2.6)
       rack (>= 1.0)
     web-console (2.3.0)
@@ -862,7 +870,7 @@ DEPENDENCIES
   github-linguist (~> 4.7.0)
   github-markup (~> 1.4)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab_git (~> 10.4.7)
+  gitlab_git (~> 10.6.6)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.2)
@@ -870,6 +878,7 @@ DEPENDENCIES
   gon (~> 6.1.0)
   grape (~> 0.15.0)
   grape-entity (~> 0.4.2)
+  haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.1.0)
   hipchat (~> 1.5.0)
@@ -899,12 +908,13 @@ DEPENDENCIES
   nokogiri (~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.2.0)
   octokit (~> 4.3.0)
+  oj (~> 2.17.4)
   omniauth (~> 1.3.1)
   omniauth-auth0 (~> 1.4.1)
   omniauth-azure-oauth2 (~> 0.0.6)
   omniauth-bitbucket (~> 0.0.2)
   omniauth-cas3 (~> 1.1.2)
-  omniauth-facebook (~> 3.0.0)
+  omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.1.1)
   omniauth-gitlab (~> 1.0.0)
   omniauth-google-oauth2 (~> 0.4.1)
@@ -939,7 +949,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
-  rubocop (~> 0.41.2)
+  rubocop (~> 0.42.0)
   rubocop-rspec (~> 1.5.0)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.15.9)
@@ -957,7 +967,6 @@ DEPENDENCIES
   sidekiq-cron (~> 0.4.0)
   simplecov (= 0.12.0)
   sinatra (~> 1.4.4)
-  six (~> 0.2.0)
   slack-notifier (~> 1.2.0)
   spinach-rails (~> 0.2.1)
   spinach-rerun-reporter (~> 0.0.2)
@@ -974,6 +983,7 @@ DEPENDENCIES
   teaspoon-jasmine (~> 2.2.0)
   test_after_commit (~> 0.4.2)
   thin (~> 1.7.0)
+  timecop (~> 0.8.0)
   turbolinks (~> 2.5.0)
   u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
@@ -983,7 +993,7 @@ DEPENDENCIES
   unicorn-worker-killer (~> 0.4.2)
   version_sorter (~> 2.1.0)
   virtus (~> 1.0.1)
-  vmstat (~> 2.1.1)
+  vmstat (~> 2.2)
   web-console (~> 2.0)
   webmock (~> 1.21.0)
   wikicloth (= 0.8.1)

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

@@ -15,7 +15,7 @@ let
     meta = with lib; {
       homepage = http://www.gitlab.com/;
       platforms = platforms.linux;
-      maintainers = [ ];
+      maintainers = with maintainers; [ fpletz ];
       license = licenses.mit;
     };
   };
@@ -24,7 +24,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.11.2";
+  version = "8.12.1";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1id6jsf4mshxis07dqlkgdyqi1v415rp4lx9ix8sjfznchria58b";
+    sha256 = "1aq91q89g3xb28v833748y9ywy9d6551zn3hb22cqphjijkn3wgl";
   };
 
   patches = [

pkgs/applications/version-management/gitlab/gemset.nix

@@ -674,10 +674,10 @@
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z";
+      sha256 = "0aq0mzk95m944ccq4x5bzxb02qbzywc3rzjl5dxhrcaw32hqdjp0";
       type = "gem";
     };
-    version = "0.49.0";
+    version = "0.52.0";
   };
   execjs = {
     source = {
@@ -784,10 +784,10 @@
   fog-aws = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0imhhxrw8m031lc912bnlqzgac41sjsip1fa8v845ldmn56kn9zg";
+      sha256 = "1zvcsgskxmlhb31wjcbkfi6m8b91y80kcwk61byybld9xl431mwf";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "0.11.0";
   };
   fog-azure = {
     source = {
@@ -800,10 +800,10 @@
   fog-core = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1flkprsdm1qr38bzd80wxpkbcwm5zshivbg2k8pjls9i6jh6a0z7";
+      sha256 = "0jx4ynsc0b78601xypaamv6j5kw33n6ymqs3iz2fmhdw0k44lnwv";
       type = "gem";
     };
-    version = "1.40.0";
+    version = "1.42.0";
   };
   fog-google = {
     source = {
@@ -958,10 +958,10 @@
   gitlab_git = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xcn55jwc3g53mcj1fjr6qfjcj0awba9lwgd1720d2hkpfiglsai";
+      sha256 = "1vg2k3nlws6ghbs80zy3v8yclsx61x36f17r0k8vwv1xwvfhyhgz";
       type = "gem";
     };
-    version = "10.4.7";
+    version = "10.6.6";
   };
   gitlab_meta = {
     source = {
@@ -1037,6 +1037,22 @@
     };
     version = "0.4.8";
   };
+  haml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      type = "gem";
+    };
+    version = "4.0.7";
+  };
+  haml_lint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0shja16n76lw74c3dylml98lbmlcq9i1933davymayfplmyr52wi";
+      type = "gem";
+    };
+    version = "0.18.2";
+  };
   hamlit = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1048,10 +1064,10 @@
   hashie = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
+      sha256 = "1qlqcmrl696f1gg209zcyr81l9c5ynzfwlzl44a081q1fckrdmlx";
       type = "gem";
     };
-    version = "3.4.3";
+    version = "3.4.4";
   };
   health_check = {
     source = {
@@ -1314,10 +1330,10 @@
   mime-types = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06lnv0w9j45llai5qhvc1m7w409j5lhnssdzkvv6yw49d632jxkz";
+      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
       type = "gem";
     };
-    version = "2.99.2";
+    version = "2.99.3";
   };
   mimemagic = {
     source = {
@@ -1330,10 +1346,10 @@
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.0";
   };
   minitest = {
     source = {
@@ -1455,6 +1471,14 @@
     };
     version = "4.3.0";
   };
+  oj = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1krdgjl0agvcxb0bgmdk8zv7ysms8xmx7py7564v69csdkbwd4a5";
+      type = "gem";
+    };
+    version = "2.17.4";
+  };
   omniauth = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1499,13 +1523,12 @@
     version = "1.1.3";
   };
   omniauth-facebook = {
-    dependencies = ["omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0plj56sna4b6c71k03jsng6gq3r5yxhj7h26ndahc9caasgk869c";
+      sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "4.0.0";
   };
   omniauth-github = {
     dependencies = ["omniauth" "omniauth-oauth2"];
@@ -2022,10 +2045,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07nda5cfrxxizcd4ff7ad8z3i0j9jaff8q7q6ddpxcj0s80nvvpi";
+      sha256 = "182hp2fh6gd3p5c862i36k6jxkc02mhi08qd94gsyfj3v34ngza0";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "2.0.6";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -2104,10 +2127,10 @@
   rubocop = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02adr908a9l8nhdfjz137i20w1dv8mbfiamy0m9z9q0fvslfdxly";
+      sha256 = "064rh2fhr05mjgsmi1viljn9arcm2ggfaxkpk92ns9kf3ym7dz8v";
       type = "gem";
     };
-    version = "0.41.2";
+    version = "0.42.0";
   };
   rubocop-rspec = {
     source = {
@@ -2356,14 +2379,6 @@
     };
     version = "1.4.7";
   };
-  six = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
   slack-notifier = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2504,6 +2519,14 @@
     };
     version = "1.1.6";
   };
+  sysexits = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
   systemu = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2666,10 +2689,10 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "194d70pfxq4d7rrk0vsk1dvj46ns2f350308khi7q5cvnmg3h1xs";
+      sha256 = "1b1mb3sj7azfvv166q6rqr0y634wsikiimm17xzn0304lcrw2fiz";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   unicorn = {
     source = {
@@ -2725,10 +2748,10 @@
   vmstat = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02yf9y7050zk1k7mn7dkp81wwa220kpkpdnlv4bg5mp65w33g5jf";
+      sha256 = "10hlfam5gvxjvr5p1f4f81wlv5k81mrlg556rc9525290bcz31f0";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.2.0";
   };
   warden = {
     source = {

pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch

@@ -37,7 +37,7 @@ index 1470a6e..1b2660d 100644
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 86f5521..3bf006b 100644
+index 195108b..e55b11d 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
 @@ -192,7 +192,7 @@ Settings.gitlab['user']       ||= 'git'
@@ -49,7 +49,7 @@ index 86f5521..3bf006b 100644
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -350,7 +350,7 @@ Settings.backup['upload']['encryption'] ||= nil
+@@ -362,7 +362,7 @@ Settings.backup['upload']['encryption'] ||= nil
  #
  Settings['git'] ||= Settingslogic.new({})
  Settings.git['max_size']  ||= 20971520 # 20.megabytes
@@ -100,7 +100,7 @@ index be8fcc7..7642d74 100644
    end
  end
 diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
-index 60f4636..157641f 100644
+index 5f4a6bb..01b4cfd 100644
 --- a/lib/tasks/gitlab/check.rake
 +++ b/lib/tasks/gitlab/check.rake
 @@ -223,7 +223,7 @@ namespace :gitlab do

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, docutils, unzip
+{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip
 , guiSupport ? false, tk ? null
 , ApplicationServices, cf-private }:
 
@@ -6,7 +6,7 @@ let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
   version = "3.9.1";
   name = "mercurial-${version}";
-  inherit (pythonPackages) curses docutils hg-git dulwich python;
+  inherit (python2Packages) curses docutils hg-git dulwich python;
 in
 
 stdenv.mkDerivation {

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

@@ -7,7 +7,7 @@
 , saslSupport ? false
 , stdenv, fetchurl, apr, aprutil, zlib, sqlite
 , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
-, sasl ? null, serf ? null
+, sasl ? null, serf ? null, openssl
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -29,7 +29,7 @@ let
   # Can't do separate $lib and $bin, as libs reference bins
   outputs = [ "out" "dev" "man" ];
 
-    buildInputs = [ zlib apr aprutil sqlite ]
+    buildInputs = [ zlib apr aprutil sqlite openssl ]
       ++ stdenv.lib.optional httpSupport serf
       ++ stdenv.lib.optional pythonBindings python
       ++ stdenv.lib.optional perlBindings perl
@@ -75,11 +75,13 @@ let
       mkdir -p $out/share/bash-completion/completions
       cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
 
-    for f in $out/lib/*.la; do
+      for f in $out/lib/*.la; do
-      substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
+        substituteInPlace $f \
-      substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib"
+          --replace "${expat.dev}/lib" "${expat.out}/lib" \
-      substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib"
+          --replace "${zlib.dev}/lib" "${zlib.out}/lib" \
-    done
+          --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \
+          --replace "${openssl.dev}/lib" "${openssl.out}/lib"
+      done
     '';
 
     inherit perlBindings pythonBindings;

pkgs/applications/video/key-mon/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, gnome2, librsvg, pygtk, pythonPackages }:
+{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "key-mon-${version}";
   version = "1.17";
   namePrefix = "";
@@ -11,7 +11,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs =
-    [ gnome2.python_rsvg librsvg pygtk pythonPackages.xlib ];
+    [ gnome2.python_rsvg librsvg pythonPackages.pygtk pythonPackages.xlib ];
 
   doCheck = false;
 

pkgs/applications/video/mplayer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm
+{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg
 , aalibSupport ? true, aalib ? null
 , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
 , fribidiSupport ? true, fribidi ? null
@@ -84,34 +84,19 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mplayer-1.1.1";
+  name = "mplayer-1.3.0";
 
   src = fetchurl {
-    # Old kind of URL:
+    url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz";
-    # url = http://tarballs.nixos.org/mplayer-snapshot-20101227.tar.bz2;
+    sha256 = "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s";
-    # Snapshot I took on 20110423
-
-    #Transient
-    #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2;
-    #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb";
-
-    url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz";
-    sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76";
   };
 
   prePatch = ''
     sed -i /^_install_strip/d configure
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pigoz/mplayer-svn/commit/6c6a7c2afe11c15716cdf4371fb4bf211644b7e1.patch";
-      sha256 = "0abg5122kisgcc8ay3barlibrgn259igsfq3ak6na9g8j5cgviw9";
-    })
-  ];
-
   buildInputs = with stdenv.lib;
-    [ pkgconfig freetype ]
+    [ pkgconfig freetype ffmpeg ]
     ++ optional aalibSupport aalib
     ++ optional fontconfigSupport fontconfig
     ++ optional fribidiSupport fribidi

pkgs/applications/video/subtitleeditor/default.nix

@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake114x, intltool,
+{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils,
-  desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme,
+  enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx,
-  libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook } :
+  xdg_utils, isocodes, wrapGAppsHook
+}:
 
 let
-  ver_maj = "0.52";
+  ver_maj = "0.53";
-  ver_min = "1";
+  ver_min = "0";
 in
 
 stdenv.mkDerivation rec {
@@ -12,11 +13,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz";
-    sha256 = "1m8j2i27kjaycvp09b0knp9in61jd2dj852hrx5hvkrby70mygjv";
+    sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g";
   };
 
   nativeBuildInputs =  [
-    autoconf automake114x pkgconfig intltool wrapGAppsHook
+    pkgconfig
+    intltool
+    file
+    wrapGAppsHook
   ];
 
   buildInputs =  [
@@ -35,20 +39,14 @@ stdenv.mkDerivation rec {
     isocodes
   ];
 
-  NIX_CFLAGS_COMPILE = "-std=c++11 -DDEBUG";
-
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # disable check because currently making check in po fails
+  doCheck = false;
 
   hardeningDisable = [ "format" ];
 
-  patches = [ ./subtitleeditor-0.52.1-build-fix.patch ];
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  preConfigure = ''
-    # ansi overrides -std, see src_configure
-    sed 's/\(CXXFLAGS\) -ansi/\1/' -i configure.ac configure
-  '';
 
   configureFlags = [ "--disable-debug" ];
 

pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch

@@ -1,55 +0,0 @@
-Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
-
-https://gna.org/bugs/?23714
-
-https://bugs.gentoo.org/show_bug.cgi?id=550764
-https://bugs.gentoo.org/show_bug.cgi?id=566328
-
---- a/src/subtitleview.cc	2015-12-24 01:52:29.322622155 +0100
-+++ b/src/subtitleview.cc	2015-12-24 01:52:44.210491213 +0100
-@@ -1363,7 +1363,7 @@
- 	{
- 		int num;
- 		std::istringstream ss(event->string);
--		bool is_num = ss >> num != 0; 
-+		bool is_num = static_cast<bool>(ss >> num) != 0; 
- 		// Update only if it's different
- 		if(is_num != get_enable_search())
- 			set_enable_search(is_num);
---- a/src/utility.h	2015-12-24 01:49:42.205104858 +0100
-+++ b/src/utility.h	2015-12-24 01:50:23.387737071 +0100
-@@ -91,7 +91,7 @@
- 	std::istringstream s(src);
- 	// return s >> dest != 0;
- 
--	bool state = s >> dest != 0;
-+	bool state = static_cast<bool>(s >> dest) != 0;
- 
- 	if(!state)
- 		se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
---- a/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:24.125428454 +0100
-+++ b/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:42.630277006 +0100
-@@ -23,7 +23,7 @@
-  *	along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
-  
--#include <auto_ptr.h>
-+#include <memory>
- #include "extension/action.h"
- #include "i18n.h"
- #include "debug.h"
---- a/plugins/actions/documentmanagement/documentmanagement.old	2015-12-24 01:17:13.914730337 +0100
-+++ b/plugins/actions/documentmanagement/documentmanagement.cc	2015-12-24 01:17:23.339640430 +0100
-@@ -178,9 +178,9 @@
- 
- 		ui_id = ui->new_merge_id();
- 
--		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
--		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name);
--		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name);
-+		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
-+		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name);
-+		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name);
- 
- 		ADD_UI("new-document");
- 		ADD_OPEN_UI("open-document");

pkgs/applications/virtualization/qemu/default.nix

@@ -15,7 +15,7 @@
 
 with stdenv.lib;
 let
-  version = "2.6.1";
+  version = "2.7.0";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9";
+    sha256 = "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij";
   };
 
   buildInputs =
@@ -47,22 +47,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-etc-install.patch
-    (fetchpatch {
-      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fff39a7ad09da07ef490de05c92c91f22f8002f2";
-      name = "9pfs-forbid-illegal-path-names.patch";
-      sha256 = "081j85p6m7s1cfh3aq1i2av2fsiarlri9gs939s0wvc6pdyb4b70";
-    })
-    (fetchpatch {
-      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=805b5d98c649d26fc44d2d7755a97f18e62b438a";
-      name = "9pfs-forbid-.-and-..-in-file-names.patch";
-      sha256 = "0km6knll492dx745gx37bi6dhmz08cmjiyf479ajkykp0aljii24";
-    })
-    (fetchpatch {
-      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=56f101ecce0eafd09e2daf1c4eeb1377d6959261";
-      name = "9pfs-directory-traversal-CVE-2016-7116.patch";
-      sha256 = "06pr070qj19w5mjxr36bcqxmgpiczncigqsbwfc8ncjhm1h7dmry";
-    })
   ];
+  hardeningDisable = [ "stackprotector" ];
 
   configureFlags =
     [ "--smbd=smbd" # use `smbd' from $PATH

pkgs/applications/virtualization/spice-vdagent/default.nix

@@ -1,16 +1,17 @@
 {stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
- libpciaccess, libxcb, libXrandr, libXinerama, libXfixes}:
+ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus}:
 stdenv.mkDerivation rec {
-  name = "spice-vdagent-0.16.0";
+  name = "spice-vdagent-0.17.0";
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0z8gwc5va2i64mjippavmxajdb9az83ffqyhlbynm6dxw131d5av";
+    sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi";
   };
   postPatch = ''
     substituteInPlace data/spice-vdagent.desktop --replace /usr $out
   '';
   buildInputs = [ pkgconfig alsaLib spice_protocol glib
-                  libpciaccess libxcb libXrandr libXinerama libXfixes ] ;
+                  libpciaccess libxcb libXrandr libXinerama libXfixes
+                  dbus ] ;
   meta = {
     description = "Enhanced SPICE integration for linux QEMU guest";
     longDescription = ''

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

@@ -19,12 +19,13 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "pic" ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   buildInputs = [ patchelf cdrkit makeWrapper dbus ];
 
   installPhase = ''
     mkdir -p $out
     cp -r install/* $out
-
   '';
 
   buildCommand = with xorg; ''
@@ -139,6 +140,5 @@ stdenv.mkDerivation {
     license = "GPL";
     maintainers = [ lib.maintainers.sander ];
     platforms = lib.platforms.linux;
-    broken = kernel.features.grsecurity or false;
   };
 }

pkgs/applications/virtualization/xen/generic.nix

@@ -2,7 +2,7 @@
 , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
 , lvm2, utillinux, procps, texinfo, perl, pythonPackages
 , glib, bridge-utils, xorg, pixman, iproute, udev, bison
-, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
+, flex, cmake, ocamlPackages, figlet, libaio, yajl
 , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
 , spice_protocol, usbredir, alsaLib, quilt
 , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       dev86 iasl pciutils bzip2 xz texinfo perl yajl
       pythonPackages.python pythonPackages.wrapPython
       glib bridge-utils pixman iproute udev bison xorg.libX11
-      flex ocaml ocamlPackages.findlib figlet libaio
+      flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio
       checkpolicy pythonPackages.markdown transfig
       glusterfs acl cmake spice spice_protocol usbredir
       alsaLib quilt

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

@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }:
+{ stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }:
 
 let cairocffi-xcffib = python27Packages.cairocffi.override {
     pythonPath = [ python27Packages.xcffib ];
   };
 in
 
-buildPythonApplication rec {
+python27Packages.buildPythonApplication rec {
   name = "qtile-${version}";
   version = "0.10.4";
 
@@ -24,12 +24,12 @@ buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace libqtile/manager.py --subst-var-by out $out
-    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out}
-    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out}
-    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out}
+    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
   '';
 
-  buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
+  buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ];
 
   pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline];
 

pkgs/build-support/docker/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript
-, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }:
+, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz, findutils }:
 
 # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
   
@@ -249,7 +249,7 @@ EOF
                then mkPureLayer { inherit baseJson contents extraCommands; }
                else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
       result = runCommand "${baseName}.tar.gz" {
-        buildInputs = [ jshon pigz ];
+        buildInputs = [ jshon pigz coreutils findutils ];
 
         imageName = name;
         imageTag = tag;
@@ -261,6 +261,18 @@ EOF
           buildArgs = args;
         };
       } ''
+        # Print tar contents:
+        # 1: Interpreted as relative to the root directory
+        # 2: With no trailing slashes on directories
+        # This is useful for ensuring that the output matches the values generated by the "find" command
+        ls_tar() {
+            for f in $(tar -tf $1 | xargs realpath -ms --relative-to=.); do
+                if [ "$f" != "." ]; then
+                    echo "/$f"
+                fi
+            done
+        }
+      
         mkdir image
         touch baseFiles
         if [ -n "$fromImage" ]; then
@@ -276,7 +288,7 @@ EOF
           parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories)
           
           for l in image/*/layer.tar; do
-            tar -tf $l >> baseFiles
+            ls_tar $l >> baseFiles
           done
         fi
 
@@ -297,8 +309,7 @@ EOF
         fi
 
         echo Adding layer
-        tar -tf temp/layer.tar >> baseFiles
+        ls_tar temp/layer.tar >> baseFiles
-        sed 's/^\.//' -i baseFiles
         comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
         tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true
 

pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix

@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, pygtk, python, gtk }:
+{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, python27Packages, gtk }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (python27Packages) python pygtk;
+in stdenv.mkDerivation rec {
   ver_maj = "2.32";
   ver_min = "0";
   version = "${ver_maj}.${ver_min}";

pkgs/desktops/gnome-2/desktop/vte/default.nix

@@ -1,7 +1,9 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
-, pythonSupport ? false, python, pygtk}:
+, pythonSupport ? false, python27Packages}:
 
-stdenv.mkDerivation rec {
+let
+  inherit (python27Packages) python pygtk;
+in stdenv.mkDerivation rec {
   name = "vte-0.28.2";
 
   src = fetchurl {

pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix

@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "file-roller-3.20.2";
+  name = "file-roller-3.20.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.2.tar.xz;
+    url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.3.tar.xz;
-    sha256 = "93188a7ac9285cb85551c327082aeaeb51ac39a9722cb96b0e29d5ec2ae353c6";
+    sha256 = "6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9";
   };
 }

pkgs/desktops/gnome-3/3.20/core/eog/src.nix

@@ -4,7 +4,7 @@ fetchurl: {
   name = "eog-3.20.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
+    url = mirror://gnome/sources/eog/3.20/eog-3.20.4.tar.xz;
-    sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
+    sha256 = "1qsv3brhi8l8fr22nd3d0fwq5xhwspqw0bammhkkq3ga0z6791wn";
   };
 }

pkgs/desktops/gnome-3/3.20/default.nix

@@ -45,16 +45,14 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2;
+  inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
+    clutter-gst clutter_gtk;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_26;
-  clutter_gtk = pkgs.clutter_gtk_1_8.override { inherit clutter gtk3; };
-  clutter-gst_2 = pkgs.clutter-gst;
-  clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter cogl; };
   cogl = pkgs.cogl_1_22;
   gtk = gtk3;
   gtkmm = gtkmm3;
@@ -273,7 +271,7 @@ let
 
   gnome-boxes = callPackage ./apps/gnome-boxes {
     gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
+    spice_gtk = pkgs.spice_gtk;
   };
 
   gnome-calendar = callPackage ./apps/gnome-calendar { };
@@ -392,7 +390,7 @@ let
   gpaste = callPackage ./misc/gpaste { };
 
   pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
-  
+
   gtkhtml = callPackage ./misc/gtkhtml { };
 
   pomodoro = callPackage ./misc/pomodoro { };

pkgs/desktops/mate/mate-common/default.nix

@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-common-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.15";
+  major-ver = "1.16";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1r3c0i03ylrlibn4pz4j9qzbnj7b540hyhf98kkzzh680jn59iiy";
+    sha256 = "02pj5ry3c7p5sd2mp9dsshy0ij0xgv00bxr4vvmnm027hv2silrl";
   };
 
   meta = {

pkgs/desktops/mate/mate-icon-theme-faenza/default.nix

@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-faenza-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.15";
+  major-ver = "1.16";
-  minor-ver = "1";
+  minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1x2jn86gcv6spnkvhjg0mzp5qhlb5dw4h8m8qp1hdgzzrzinfr3p";
+    sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/desktops/mate/mate-icon-theme/default.nix

@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.15";
+  major-ver = "1.16";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1jpz3ihmyhyiyqlqz798xgzl3qa31ghymw3yrw6abd7ww0nkwiq9";
+    sha256 = "1zldw22p1i76iss8car39pmfagpfxxlfk1fdhvr4x5r6gf36gv7d";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

pkgs/desktops/mate/mate-themes/default.nix

@@ -6,15 +6,17 @@ stdenv.mkDerivation rec {
   version = "${major-ver}.${minor-ver}";
   major-ver = gnome3.version;
   minor-ver = {
-    "3.18" = "3";
+    "3.18" = "4";
-    "3.20" = "10";
+    "3.20" = "12";
+    "3.22" = "3";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.18" = "09vglvjnjnm95wxw5b7pn6rf5xrr3nfyqs5c3y1c72z4p3w8qqn5";
+      "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b";
-      "3.20" = "0bhhidip8qbsq69a9n0dmxfryhvzngiy59vnms6xhya9n7y19hci";
+      "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca";
+      "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k";
     }."${major-ver}";
   };
 

pkgs/development/arduino/ino/default.nix

@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom
+{ stdenv, fetchurl, pythonPackages, picocom
 , avrdude, arduino-core, avrgcclibc }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "ino-0.3.6";
   namePrefix = "";
 

pkgs/development/compilers/compcert/default.nix

@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, coq, ocamlPackages
+{ stdenv, lib, fetchurl
+, coq, ocaml, findlib, menhir
 , tools ? stdenv.cc
 }:
 
+assert lib.versionAtLeast ocaml.version "4.02";
+
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
   version = "2.7.1";
@@ -11,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
   };
 
-  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
+  buildInputs = [ coq ocaml findlib menhir ];
 
   enableParallelBuilding = true;
 

pkgs/development/compilers/mlton/default.nix

@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
   '' + stdenv.lib.optionalString stdenv.cc.isClang ''
     sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
   '';
 
   preBuild = ''
@@ -83,6 +85,11 @@ stdenv.mkDerivation rec {
     for e in mllex mlyacc ; do
       patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Patch libgmp linking
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
   '';
 
   doCheck = true;