Merge remote-tracking branch 'master' into staging.

2024-11-16 06:45:16 +01:00 · 2015-02-13 22:17:12 +01:00 · 2015-02-13 22:17:12 +01:00 · 600135bba5
commit 600135bba5
parent 7a1d132db9 54ce1a1810
124 changed files with 2676 additions and 1526 deletions
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@ -12,8 +12,7 @@ with lib;
      default = false;
      type = types.bool;
      description = ''
-        Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu
-        and iwlwifi.
+        Turn on this option if you want to enable all the firmware shipped in linux-firmware.
      '';
    };

@ -26,7 +25,6 @@ with lib;
    hardware.firmware = [
      "${pkgs.firmwareLinuxNonfree}/lib/firmware"
      "${pkgs.iwlegacy}/lib/firmware"
-      "${pkgs.iwlwifi}/lib/firmware"
    ];
  };

--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -55,6 +55,7 @@
  ./programs/atop.nix
  ./programs/bash/bash.nix
  ./programs/blcr.nix
+  ./programs/cdemu.nix
  ./programs/command-not-found/command-not-found.nix
  ./programs/dconf.nix
  ./programs/environment.nix
@ -173,6 +174,7 @@
  ./services/mail/spamassassin.nix
  ./services/misc/apache-kafka.nix
  #./services/misc/autofs.nix
+  ./services/misc/canto-daemon.nix
  ./services/misc/cpuminer-cryptonight.nix
  ./services/misc/cgminer.nix
  ./services/misc/dictd.nix
@ -287,6 +289,7 @@
  ./services/networking/searx.nix
  ./services/networking/seeks.nix
  ./services/networking/spiped.nix
+  ./services/networking/sslh.nix
  ./services/networking/ssh/lshd.nix
  ./services/networking/ssh/sshd.nix
  ./services/networking/strongswan.nix
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.programs.cdemu;
+in {
+
+  options = {
+    programs.cdemu = {
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
+      };
+      group = mkOption {
+        default = "cdrom";
+        description = "Required group for users of cdemu";
+      };
+      gui = mkOption {
+        default = true;
+        description = "Whether to install cdemu GUI (gCDEmu)";
+      };
+      image-analyzer = mkOption {
+        default = true;
+        description = "Whether to install image analyzer";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    boot = {
+      extraModulePackages = [ pkgs.linuxPackages.vhba ];
+      kernelModules = [ "vhba" ];
+    };
+
+    services = {
+      udev.extraRules = ''
+        KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="${cfg.group}"
+      '';
+      dbus.packages = [ pkgs.cdemu-daemon ];
+    };
+
+    environment.systemPackages =
+      [ pkgs.cdemu-daemon pkgs.cdemu-client ]
+      ++ optional cfg.gui pkgs.gcdemu
+      ++ optional cfg.image-analyzer pkgs.image-analyzer;
+  };
+
+}
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@ -100,6 +100,7 @@ in {
      script = "exec mpd --no-daemon ${mpdConf}";
      serviceConfig = {
        User = "mpd";
+        PermissionsStartOnly = true;
      };
    };

--- a/nixos/modules/services/misc/canto-daemon.nix
+++ b/nixos/modules/services/misc/canto-daemon.nix
@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+cfg = config.services.canto-daemon;
+
+in {
+
+##### interface
+
+  options = {
+
+    services.canto-daemon = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the canto RSS daemon.";
+      };
+    };
+
+  };
+
+##### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.user.services.canto-daemon = {
+      description = "Canto RSS Daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "default.target" ];
+      serviceConfig.ExecStart = "${pkgs.canto-daemon}/bin/canto-daemon";
+    };
+  };
+
+}
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@ -122,6 +122,34 @@ in
        '';
      };

+      alerts = {
+        enable = mkEnableOption "Whether to enable consul-alerts";
+
+        listenAddr = mkOption {
+          description = "Api listening address.";
+          default = "localhost:9000";
+          type = types.str;
+        };
+
+        consulAddr = mkOption {
+          description = "Consul api listening adddress";
+          default = "localhost:8500";
+          type = types.str;
+        };
+
+        watchChecks = mkOption {
+          description = "Whether to enable check watcher.";
+          default = true;
+          type = types.bool;
+        };
+
+        watchEvents = mkOption {
+          description = "Whether to enable event watcher.";
+          default = true;
+          type = types.bool;
+        };
+      };
+
    };

  };
@ -204,5 +232,23 @@ in
      '';
    };

+    systemd.services.consul-alerts = mkIf (cfg.alerts.enable) {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "consul.service" ];
+
+      path = [ pkgs.consul ];
+
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.consul-alerts}/bin/consul-alerts start \
+            --alert-addr=${cfg.alerts.listenAddr} \
+            --consul-addr=${cfg.alerts.consulAddr} \
+            ${optionalString cfg.alerts.watchChecks "--watch-checks"} \
+            ${optionalString cfg.alerts.watchEvents "--watch-events"}
+        '';
+        User = if cfg.dropPrivileges then "consul" else null;
+      };
+    };
+
  };
 }
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.sslh;
+  configFile = pkgs.writeText "sslh.conf" ''
+    verbose: ${if cfg.verbose then "true" else "false"};
+    foreground: true;
+    inetd: false;
+    numeric: false;
+    transparent: false;
+    timeout: "${toString cfg.timeout}";
+    user: "nobody";
+    pidfile: "${cfg.pidfile}";
+
+    listen:
+    (
+      { host: "${cfg.host}"; port: "${toString cfg.port}"; }
+    );
+
+    ${cfg.appendConfig}
+  '';
+  defaultAppendConfig = ''
+    protocols:
+    (
+      { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },
+      { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; },
+      { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; },
+      { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },
+      { name: "ssl"; host: "localhost"; port: "443"; probe: "builtin"; },
+      { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; }
+    );
+  '';
+in
+{
+  options = {
+    services.sslh = {
+      enable = mkEnableOption "sslh";
+
+      verbose = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Verbose logs.";
+      };
+
+      timeout = mkOption {
+        type = types.int;
+        default = 2;
+        description = "Timeout in seconds.";
+      };
+
+      pidfile = mkOption {
+        type = types.path;
+        default = "/run/sslh.pid";
+        description = "PID file path for sslh daemon.";
+      };
+
+      host = mkOption {
+        type = types.str;
+        default = config.networking.hostName;
+        description = "Listening hostname.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 443;
+        description = "Listening port.";
+      };
+
+      appendConfig = mkOption {
+        type = types.str;
+        default = defaultAppendConfig;
+        description = "Verbatim configuration file.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.sslh = {
+      description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F ${configFile}";
+      serviceConfig.KillMode = "process";
+      serviceConfig.PIDFile = "${cfg.pidfile}";
+    };
+  };
+}
--- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
@ -0,0 +1,196 @@
+{ config, lib, pkgs, serverInfo, php, ... }:
+
+with lib;
+
+let
+
+  httpd = serverInfo.serverConfig.package;
+
+  version24 = !versionOlder httpd.version "2.4";
+
+  allGranted = if version24 then ''
+    Require all granted
+  '' else ''
+    Order allow,deny
+    Allow from all
+  '';
+
+  limesurveyConfig = pkgs.writeText "config.php" ''
+    <?php
+    $config = array();
+    $config['name']  = "${config.siteName}";
+    $config['runtimePath'] = "${config.dataDir}/tmp/runtime";
+    $config['components'] = array();
+    $config['components']['db'] = array();
+    $config['components']['db']['connectionString'] = '${config.dbType}:host=${config.dbHost};port=${toString config.dbPort};user=${config.dbUser};password=${config.dbPassword};dbname=${config.dbName};';
+    $config['components']['db']['username'] = '${config.dbUser}';
+    $config['components']['db']['password'] = '${config.dbPassword}';
+    $config['components']['db']['charset'] = 'utf-8';
+    $config['components']['db']['tablePrefix'] = "prefix_";
+    $config['components']['assetManager'] = array();
+    $config['components']['assetManager']['basePath'] = '${config.dataDir}/tmp/assets';
+    $config['config'] = array();
+    $config['config']['debug'] = 1;
+    $config['config']['tempdir']  = "${config.dataDir}/tmp";
+    $config['config']['tempdir']  = "${config.dataDir}/tmp";
+    $config['config']['uploaddir']  = "${config.dataDir}/upload";
+    $config['config']['force_ssl'] = '${if config.forceSSL then "on" else ""}';
+    $config['config']['defaultlang'] = '${config.defaultLang}';
+    return $config;
+    ?>
+  '';
+
+  limesurveyRoot = "${pkgs.limesurvey}/share/limesurvey/";
+
+in rec {
+
+  extraConfig = ''
+    Alias ${config.urlPrefix}/tmp ${config.dataDir}/tmp
+
+    <Directory ${config.dataDir}/tmp>
+      ${allGranted}
+      Options -Indexes +FollowSymlinks
+    </Directory>
+
+    Alias ${config.urlPrefix}/upload ${config.dataDir}/upload
+
+    <Directory ${config.dataDir}/upload>
+      ${allGranted}
+      Options -Indexes
+    </Directory>
+
+    ${if config.urlPrefix != "" then ''
+      Alias ${config.urlPrefix} ${limesurveyRoot}
+    '' else ''
+      RewriteEngine On
+      RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
+      RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
+    ''}
+
+    <Directory ${limesurveyRoot}>
+      DirectoryIndex index.php
+    </Directory>
+  '';
+
+  globalEnvVars = [
+    { name = "LIMESURVEY_CONFIG"; value = limesurveyConfig; }
+  ];
+
+  documentRoot = if config.urlPrefix == "" then limesurveyRoot else null;
+
+  enablePHP = true;
+
+  options = {
+
+    id = mkOption {
+      default = "main";
+      description = ''
+        A unique identifier necessary to keep multiple owncloud server
+        instances on the same machine apart.  This is used to
+        disambiguate the administrative scripts, which get names like
+        mediawiki-$id-change-password.
+      '';
+    };
+
+    urlPrefix = mkOption {
+      default = "";
+      description = "Url prefix for site.";
+      type = types.str;
+    };
+
+    dbType = mkOption {
+      default = "pgsql";
+      description = "Type of database for limesurvey, for now, only pgsql.";
+      type = types.enum ["pgsql"];
+    };
+
+    dbName = mkOption {
+      default = "limesurvey";
+      description = "Name of the database that holds the limesurvey data.";
+      type = types.str;
+    };
+
+    dbHost = mkOption {
+      default = "localhost";
+      description = "Limesurvey database host.";
+      type = types.str;
+    };
+
+    dbPort = mkOption {
+      default = 5432;
+      description = "Limesurvey database port.";
+      type = types.int;
+    };
+
+    dbUser = mkOption {
+      default = "limesurvey";
+      description = "Limesurvey database user.";
+      type = types.str;
+    };
+
+    dbPassword = mkOption {
+      example = "foobar";
+      description = "Limesurvey database password.";
+      type = types.str;
+    };
+
+    adminUser = mkOption {
+      description = "Limesurvey admin username.";
+      default = "admin";
+      type = types.str;
+    };
+
+    adminPassword = mkOption {
+      description = "Default limesurvey admin password.";
+      default = "admin";
+      type = types.str;
+    };
+
+    adminEmail = mkOption {
+      description = "Limesurvey admin email.";
+      default = "admin@admin.com";
+      type = types.str;
+    };
+
+    forceSSL = mkOption {
+      default = false;
+      description = "Force use of HTTPS connection.";
+      type = types.bool;
+    };
+
+    siteName = mkOption {
+      default = "LimeSurvey";
+      description = "LimeSurvey name of the site.";
+      type = types.str;
+    };
+
+    defaultLang = mkOption {
+      default = "en";
+      description = "LimeSurvey default language.";
+      type = types.str;
+    };
+
+    dataDir = mkOption {
+      default = "/var/lib/limesurvey";
+      description = "LimeSurvey data directory.";
+      type = types.path;
+    };
+  };
+
+  startupScript = pkgs.writeScript "limesurvey_startup.sh" ''
+    if [ ! -f ${config.dataDir}/.created ]; then
+      mkdir -p ${config.dataDir}/{tmp/runtime,tmp/assets,tmp/upload,upload}
+      chmod -R ug+rw ${config.dataDir}
+      chmod -R o-rwx ${config.dataDir}
+      chown -R wwwrun:wwwrun ${config.dataDir}
+
+      ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
+      ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true
+      ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true
+
+      ${pkgs.limesurvey}/bin/limesurvey-console install '${config.adminUser}' '${config.adminPassword}' '${config.adminUser}' '${config.adminEmail}'
+
+      touch ${config.dataDir}/.created
+    fi
+  '';
+}
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@ -114,6 +114,9 @@ in {
          # Let nautilus find extensions
          export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/

+          # Find the mouse
+          export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+
          # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
          ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update

--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@ -55,6 +55,8 @@ in
          GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}";
          GDM_SESSIONS_DIR = "${cfg.session.desktops}";
          XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg";
+          # Find the mouse
+          XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
        };
        execCmd = "exec ${gdm}/sbin/gdm";
      };
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@ -7,19 +7,19 @@ let
 in

 {
-  imports =
-    [ ./compiz.nix
-      ./openbox.nix
-      ./metacity.nix
-      ./none.nix
-      ./twm.nix
-      ./wmii.nix
-      ./xmonad.nix
-      ./i3.nix
-      ./herbstluftwm.nix
-      ./bspwm.nix
-      ./stumpwm.nix
-    ];
+  imports = [
+    ./bspwm.nix
+    ./compiz.nix
+    ./herbstluftwm.nix
+    ./i3.nix
+    ./metacity.nix
+    ./openbox.nix
+    ./stumpwm.nix
+    ./twm.nix
+    ./windowmaker.nix
+    ./wmii.nix
+    ./xmonad.nix
+    ./none.nix ];

  options = {

@ -61,4 +61,4 @@ in
  config = {
    services.xserver.displayManager.session = cfg.session;
  };
-}
+}
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@ -193,8 +193,9 @@ in
        "ohci_hcd"
        "ohci_pci"
        "xhci_hcd"
+        "xhci_pci"
        "usbhid"
-        "hid_generic"
+        "hid_generic" "hid_lenovo"
        "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"

        # Unix domain sockets (needed by udev).
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@ -7,6 +7,8 @@ export LD_LIBRARY_PATH=@extraUtils@/lib
 export PATH=@extraUtils@/bin
 ln -s @extraUtils@/bin /bin

+# Stop LVM complaining about fd3
+export LVM_SUPPRESS_FD_WARNINGS=true

 fail() {
    if [ -n "$panicOnFail" ]; then exit 1; fi
@ -34,7 +36,7 @@ EOF
    read reply

    if [ -n "$allowShell" -a "$reply" = f ]; then
-        exec setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console"
+        exec setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console"
    elif [ -n "$allowShell" -a "$reply" = i ]; then
        echo "Starting interactive shell..."
        setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
@ -347,7 +349,8 @@ while read -u 3 mountPoint; do
    # that we don't properly recognise.
    if test -z "$pseudoDevice" -a ! -e $device; then
        echo -n "waiting for device $device to appear..."
-        for try in $(seq 1 20); do
+        try=20
+        while [ $try -gt 0 ]; do
            sleep 1
            # also re-try lvm activation now that new block devices might have appeared
            lvm vgchange -ay
@ -355,8 +358,12 @@ while read -u 3 mountPoint; do
            udevadm trigger --action=add
            if test -e $device; then break; fi
            echo -n "."
+            try=$((try - 1))
        done
        echo
+        if [ $try -eq 0 ]; then
+          echo "Timed out waiting for device $device, trying to mount anyway."
+        fi
    fi

    # Wait once more for the udev queue to empty, just in case it's
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@ -55,7 +55,8 @@ in
    boot.zfs = {
      useGit = mkOption {
        type = types.bool;
-        default = false;
+        # TODO(wkennington): Revert when 0.6.4 is out
+        default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19";
        example = true;
        description = ''
          Use the git version of the SPL and ZFS packages.
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -52,7 +52,6 @@ in rec {
        (all nixos.tests.firefox)
        (all nixos.tests.firewall)
        (all nixos.tests.gnome3)
-        (all nixos.tests.installer.grub1)
        (all nixos.tests.installer.lvm)
        (all nixos.tests.installer.separateBoot)
        (all nixos.tests.installer.simple)
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@ -26,6 +26,7 @@ let
                pkgs.docbook5_xsl
                pkgs.grub
                pkgs.perlPackages.XMLLibXML
+                pkgs.perlPackages.ListCompare
                pkgs.unionfs-fuse
                pkgs.gummiboot
              ];
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@ -17,7 +17,7 @@ import ./make-test.nix {

        users.extraUsers.jenkins.extraGroups = [ "users" ];

-        systemd.services.jenkins.serviceConfig.TimeoutStartSec = "3min";
+        systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min";
      };

    slave =
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@ -3,14 +3,14 @@
 , pyqt4, mutagen, python-libdiscid
 }:

-let version = "1.3"; in
+let version = "1.3.2"; in
 buildPythonPackage {
  name = "picard-${version}";
  namePrefix = "";

  src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
-    sha256 = "06s90w1j29qhd931dgj752k5v4pjbvxiz6g0613xzj3ms8zsrlys";
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
+    sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
  };

  buildInputs = [
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@ -1,17 +1,17 @@
-{stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2
+{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2
 , enchant, gucharmap, python
 }:

 stdenv.mkDerivation rec {
-  name = "bluefish-2.2.6";
+  name = "bluefish-2.2.7";

  src = fetchurl {
    url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
-    sha256 = "05j2mv6s2llf2pxknddhk8fzbghr7yff58xhkxy2icky64n8khjl";
+    sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3";
  };

-  buildInputs = [intltool pkgconfig gtk libxml2
-    enchant gucharmap python];
+  buildInputs = [ intltool pkgconfig gtk libxml2
+    enchant gucharmap python ];

  meta = with stdenv.lib; {
    description = "A powerful editor targeted towards programmers and webdevelopers";
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }:

 stdenv.mkDerivation rec {
-  name = "djvulibre-3.5.25.3";
+  name = "djvulibre-3.5.27";

  src = fetchurl {
    url = "mirror://sourceforge/djvu/${name}.tar.gz";
-    sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9";
+    sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6";
  };

  buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty;
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@ -3,12 +3,12 @@
 }:

 stdenv.mkDerivation rec {
-  version = "2.1.2";
+  version = "2.1.3";
  name = "lyx-${version}";

  src = fetchurl {
    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
-    sha256 = "19dvn681fz5i6zr7b1vx05sxhbsl73lb18axdcmcr58y6hi3hy68";
+    sha256 = "10jnqz7ilxppv60h0hpkq7wgc3fbcm3z19xhnqz9hwp3brz2xm9g";
  };

  configureFlags = [
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@ -1,15 +1,24 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
+{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte }:
+
 stdenv.mkDerivation rec {
  name = "sakura-${version}";
-  version = "2.4.2";
+  version = "3.2.0";
+
  src = fetchurl {
    url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "1mpsjsk7dgz56h7yagd9aq0d92vj59yrz4ri6za3mfmglhn29rn5";
+    sha256 = "1pfvc35kckrzik5wx8ywhkhclr52rfp2syg46ix2nsdm72q6dl90";
  };
-  buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
-  meta = {
-    homepage = "http://www.pleyades.net/david/sakura.php";
+
+  nativeBuildInputs = [ cmake perl pkgconfig ];
+
+  buildInputs = [ gtk3 vte ];
+
+  meta = with stdenv.lib; {
    description = "A terminal emulator based on GTK and VTE";
+    homepage    = http://www.pleyades.net/david/projects/sakura;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ astsmtl codyopel ];
+    platforms   = platforms.linux;
    longDescription = ''
      sakura is a terminal emulator based on GTK and VTE. It's a terminal
      emulator with few dependencies, so you don't need a full GNOME desktop
@ -20,8 +29,5 @@ stdenv.mkDerivation rec {
      terminals in one window and adds a contextual menu with some basic
      options. No more no less.
    '';
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
  };
 }
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "taskwarrior-${version}";
-  version = "2.3.0";
+  version = "2.4.0";

  enableParallelBuilding = true;

  src = fetchurl {
    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "0wxcfq0n96vmcbwrlk2x377k8cc5k4i64ca6p02y74g6168ji6ib";
+    sha256 = "17hiv7zld06zb5xmyp96bw9xl6vp178fhffs660fxxpxn3srb9bg";
  };

  nativeBuildInputs = [ cmake libuuid gnutls ];
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@ -4,16 +4,16 @@

 stdenv.mkDerivation rec {
  name = "vimb-${version}";
-  version = "2.8";
+  version = "2.9";

  src = fetchurl {
    url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
-    sha256 = "04ify6gqpkislsppaplvdfgs3fja9gl37j3dywg7bhz1fbkv166k";
+    sha256 = "0h9m5qfs09lb0dz8a79yccmm3a5rv6z8gi5pkyfh8fqkgkh2940p";
  };

  # Nixos default ca bundle
  patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/setting.c
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h
  '';

  buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
+
+python34Packages.buildPythonPackage rec {
+  version = "0.9.1";
+  name = "canto-curses-${version}";
+
+  src = fetchFromGitHub {
+    owner = "themoken";
+    repo = "canto-curses";
+    rev = "v${version}";
+    sha256 = "1vb5g0vdkp233r09qv0g4rgz7nprr2a625lf6nf6a51wpimdwgdy";
+  };
+
+  buildInputs = [ readline ncurses canto-daemon ];
+  propagatedBuildInputs = [ canto-daemon ];
+
+  meta = {
+    description = "An ncurses-based console Atom/RSS feed reader";
+    longDescription = ''
+      Canto is an Atom/RSS feed reader for the console that is meant to be
+      quick, concise, and colorful. It's meant to allow you to crank through
+      feeds like you've never cranked before by providing a minimal, yet
+      information packed interface. No navigating menus. No dense blocks of
+      unreadable white text. An interface with almost infinite customization
+      and extensibility using the excellent Python programming language.
+    '';
+    homepage = http://codezen.org/canto-ng/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python34Packages, }:
+
+python34Packages.buildPythonPackage rec {
+  version = "0.9.1";
+  name = "canto-daemon-${version}";
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "themoken";
+    repo = "canto-next";
+    rev = "v${version}";
+    sha256 = "14lh6x0yz2asspwdi1ims01589r79q0dv77vq61gfjk5wiwfbdwa";
+  };
+
+  propagatedBuildInputs = with python34Packages; [ feedparser ];
+
+  meta = {
+    description = "Daemon for the canto Atom/RSS feed reader";
+    longDescription = ''
+      Canto is an Atom/RSS feed reader for the console that is meant to be
+      quick, concise, and colorful. It's meant to allow you to crank through
+      feeds like you've never cranked before by providing a minimal, yet
+      information packed interface. No navigating menus. No dense blocks of
+      unreadable white text. An interface with almost infinite customization
+      and extensibility using the excellent Python programming language.
+    '';
+    homepage = http://codezen.org/canto-ng/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@ -1,15 +1,14 @@
-{ stdenv, fetchgit, libtoxcore
+{ stdenv, fetchurl, libtoxcore
 , conf ? null }:

 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "ratox-dev-20150107";
+  name = "ratox-0.2.1";

-  src = fetchgit {
-    url = "git://git.2f30.org/ratox";
-    rev = "8be76e4cc829d86b8e1cae43a0d932600d6ff9fb";
-    sha256 = "7fe492de3e69a08f9c1bb59a319d0e410905f06514abe99b4d4fe5c899650448";
+  src = fetchurl {
+    url = "nix-prefetch-url http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
+    sha256 = "1fm9b3clvnc2nf0pd1z8g08kfszwhk1ij1lyx57wl8vd51z4xsi5";
  };

  buildInputs = [ libtoxcore ];
--- a/pkgs/applications/networking/notbit/default.nix
+++ b/pkgs/applications/networking/notbit/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:

 stdenv.mkDerivation rec {
-  name = "notbit-git-faf0930";
+  name = "notbit-git-6f1ca59";

  src = fetchgit {
    url = "git://github.com/bpeel/notbit";
-    rev = "faf09304bf723e75f3d98cca93cf45236ee9d6b6";
-    sha256 = "b229f87c4c5e901bfd8b13dffe31157126d98ed02118fff6553e8b58eb9ed030";
+    rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1";
+    sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis";
  };

  buildInputs = [ autoconf automake pkgconfig openssl ];
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -4,12 +4,12 @@ with goPackages;

 buildGoPackage rec {
  name = "syncthing-${version}";
-  version = "0.10.21";
+  version = "0.10.22";
  goPackagePath = "github.com/syncthing/syncthing";
  src = fetchgit {
    url = "git://github.com/syncthing/syncthing.git";
    rev = "refs/tags/v${version}";
-    sha256 = "60cd8607cf7d2837252680f6c2879aba1f35a2c74a47c2f2ea874d6eed2adaa5";
+    sha256 = "d96eff0dac5d542388d643f4b9e29ade6f7c52a570a00a48e7b5f81882d719dc";
  };

  subPackages = [ "cmd/syncthing" ];
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
-, goffice, makeWrapper, gtk3, gnome_icon_theme
+, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3
 }:

 stdenv.mkDerivation rec {
@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
  preFixup = ''
    for f in "$out"/bin/gnumeric-*; do
      wrapProgram $f \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
    done
    rm $out/share/icons/hicolor/icon-theme.cache
  '';
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@ -2,7 +2,7 @@
 , xpdf, pil, pyopengl, pygame
 , setuptools, mesa, freeglut }:

-let version = "0.10.3";
+let version = "0.10.5";
 in
 stdenv.mkDerivation {
    # This project was formerly known as KeyJNote.
@ -12,7 +12,7 @@ in

    src = fetchurl {
      url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
-      sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v";
+      sha256 = "0fz1zahxlfjang53wn06svy4s4aw28c79v24gwadvjvv3h1g5wam";
    };

    # Note: We need to have `setuptools' in the path to be able to use
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, unzip }:

 stdenv.mkDerivation {
-  name = "weka-3.6.9";
+  name = "weka-3.6.12";
  
  src = fetchurl {
-    url = "mirror://sourceforge/weka/weka-3-6-9.zip";
-    sha256 = "0rnis4vvihhdcdvpp79hkmklcnn897paa0qrs95cbjnpgvxzbczs";
+    url = "mirror://sourceforge/weka/weka-3-6-12.zip";
+    sha256 = "0sdhiv1nr5rxgjry05srsnynsydkyny79zvaxdj6dk8m1768qksh";
  };

  buildInputs = [ unzip ];
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -195,7 +195,7 @@ rec {
  # Fedora (please only add full mirrors that carry old Fedora distributions as well).
  # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content).
  fedora = [
-    http://archives.fedoraproject.org/pub/archive/fedora/
+    http://archives.fedoraproject.org/pub/fedora/
    http://fedora.osuosl.org/
    http://ftp.nluug.nl/pub/os/Linux/distr/fedora/
    http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/
@ -204,6 +204,7 @@ rec {
    http://ftp.linux.cz/pub/linux/fedora/
    http://ftp.heanet.ie/pub/fedora/
    http://mirror.1000mbps.com/fedora/
+    http://archives.fedoraproject.org/pub/archive/fedora/
  ];

  # Old SUSE distributions.  Unfortunately there is no master site,
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -420,9 +420,10 @@ rec {
        ''}

        echo "unpacking RPMs..."
+        set +o pipefail
        for i in $rpms; do
            echo "$i..."
-            ${rpm}/bin/rpm2cpio "$i" | (chroot /mnt ${cpio}/bin/cpio -i --make-directories)
+            ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional
        done

        eval "$preInstall"
@ -437,7 +438,7 @@ rec {

        echo "installing RPMs..."
        PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
-          rpm -iv ${if runScripts then "" else "--noscripts"} $rpms
+          rpm -iv --nosignature ${if runScripts then "" else "--noscripts"} $rpms

        echo "running post-install script..."
        eval "$postInstall"
@ -1033,6 +1034,32 @@ rec {
      unifiedSystemDir = true;
    };

+    fedora21i386 = {
+      name = "fedora-21-i386";
+      fullName = "Fedora 21 (i386)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780";
+      };
+      urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora21x86_64 = {
+      name = "fedora-21-x86_64";
+      fullName = "Fedora 21 (x86_64)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96";
+      };
+      urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
    opensuse103i386 = {
      name = "opensuse-10.3-i586";
      fullName = "openSUSE 10.3 (i586)";
@ -1776,37 +1803,7 @@ rec {


  /* Default disk images generated from the `rpmDistros' and
-     `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */
+     `debDistros' sets. */
+  diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;

-  diskImages =
-    lib.mapAttrs (name: f: f {}) diskImageFuns //
-
-    { redhat9i386 = fillDiskWithRPMs {
-        name = "redhat-9-i386";
-        fullName = "Red Hat Linux 9 (i386)";
-        size = 1024;
-        rpms = import ./rpm/redhat-9-i386.nix { inherit fetchurl; };
-      };
-
-      suse90i386 = fillDiskWithRPMs {
-        name = "suse-9.0-i386";
-        fullName = "SUSE Linux 9.0 (i386)";
-        size = 1024;
-        rpms = import ./rpm/suse-9-i386.nix { inherit fetchurl; };
-        # Urgh.  The /etc/group entries are installed by aaa_base (or
-        # something) but due to dependency ordering, that package isn't
-        # installed yet by the time some other packages refer to these
-        # entries.
-        preInstall = ''
-          echo 'bin:x:1:daemon' >> /mnt/etc/group
-          echo 'tty:x:5:' >> /mnt/etc/group
-          echo 'disk:x:6:' >> /mnt/etc/group
-          echo 'lp:x:7:' >> /mnt/etc/group
-          echo 'uucp:x:14:' >> /mnt/etc/group
-          echo 'audio:x:17:' >> /mnt/etc/group
-          echo 'video:x:33:' >> /mnt/etc/group
-        '';
-      };
-
-    };
 } // import ./windows pkgs
--- a/pkgs/build-support/vm/rpm/redhat-9-i386.list
+++ b/pkgs/build-support/vm/rpm/redhat-9-i386.list
@ -1,92 +0,0 @@
-baseURL ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS
-autoconf-2.57-3.noarch.rpm cea6ded7bd395468a41e9b6380cf5c46
-automake-1.6.3-5.noarch.rpm 9a518459499504faa786b63bd88374d1
-basesystem-8.0-2.noarch.rpm 64bc91a544ed3b175e617df2b6683eec
-bash-2.05b-20.i386.rpm db4db03fc2d33e3519d72b8f54d483ef
-binutils-2.13.90.0.18-9.i386.rpm cd09dfb42d1f9cbd70eba37430762bb6
-bzip2-1.0.2-8.i386.rpm ca663b78121235bdaafeced854e8e966
-bzip2-devel-1.0.2-8.i386.rpm 1e69cd15c6288d41bf989afa579b2585
-bzip2-libs-1.0.2-8.i386.rpm 996ac1deed904c7d75960b31dfe61b01
-chkconfig-1.3.8-1.i386.rpm 8ab54c42c15b3f649174e6bfa764adde
-coreutils-4.5.3-19.i386.rpm 972cd0ff8f3e784c2bc5666e80cf354a
-cpp-3.2.2-5.i386.rpm 49d8c65dfa401b96b8018b5f6946c985
-cracklib-2.7-21.i386.rpm 31326ff8fb099f10b5d857dc10a33fa3
-cracklib-dicts-2.7-21.i386.rpm d39c8baf399b348db40f3137e93dae03
-curl-7.9.8-5.i386.rpm 4899792440ce948316546a6a85e1a2ef
-db4-4.0.14-20.i386.rpm 5fec52fddea8e7cd88cfaa34839cc4b3
-dev-3.3.2-5.i386.rpm a8a45208c6e18cac1bf897d5eb0ac07e
-diffutils-2.8.1-6.i386.rpm 772331d623e47069d464760fa68fd0d9
-e2fsprogs-1.32-6.i386.rpm 0b728dbe2d88c87951a921158a80184a
-elfutils-libelf-0.76-3.i386.rpm 1f4a143c12634884ce2a36eef141e6b3
-expat-1.95.5-2.i386.rpm 76aa046090620b8c51107a94a3e80d7c
-file-3.39-9.i386.rpm b0560e1725f28fe375f9885a7a6be684
-filesystem-2.2.1-3.i386.rpm 897e20be2729051cae7a5bc32efb6b3f
-findutils-4.1.7-9.i386.rpm be0e80cec36c3eabf172d5003dd79466
-fontconfig-2.1-9.i386.rpm 86e827ffaa502266116047e840f8eb8f
-freetype-2.1.3-6.i386.rpm 64597ef3568d30982be5c0779f062ff2
-gawk-3.1.1-9.i386.rpm 72da64dc330d5945ae80c1779390ac2e
-gcc-3.2.2-5.i386.rpm aa544de315b6ba5478d3f6e0c15d0208
-gcc-c++-3.2.2-5.i386.rpm a287f9ac6f8e2efc4965186366989684
-gdbm-1.8.0-20.i386.rpm 819986ab928712c2c3c9324d74b360b8
-glib-1.2.10-10.i386.rpm 24d900aaab3ca9561f7ff2d7e3a206bb
-glibc-2.3.2-11.9.i386.rpm d923d7a9a5ac6c25cb51517b23843f78
-glibc-common-2.3.2-11.9.i386.rpm f63000e72fc1adc2c23d4de3ba9ca2a0
-glibc-debug-2.3.2-11.9.i386.rpm ae4aa98a669c3edc7b3c97b1ef409c43
-glibc-devel-2.3.2-11.9.i386.rpm 569afc17dd5f1208407b3742a3849b1c
-glibc-kernheaders-2.4-8.10.i386.rpm 17f4befda9601ac4e3d312245affee2b
-grep-2.5.1-7.i386.rpm 0606cd6f5516817fe56d6bcc8afe179a
-gzip-1.3.3-9.i386.rpm b47a6dfbf36d55a93e3d3920e936a2a7
-info-4.3-5.i386.rpm 8ce01d5cf0287d8cb012bce443679658
-initscripts-7.14-1.i386.rpm 12258ed059d3de4d7a6abef4d4d14222
-iproute-2.4.7-7.i386.rpm b363643aa70272a146ca92c4577ebced
-iputils-20020927-2.i386.rpm 83da3128b0da1fdcfd59786451c9d5eb
-krb5-libs-1.2.7-10.i386.rpm 9865f9f50631007ecdd409a53626502c
-less-378-7.i386.rpm 608656bbe868016ea464d965e07a026c
-libgcc-3.2.2-5.i386.rpm 91cae96d5ac2f19b20cb0c07906aed06
-libjpeg-6b-26.i386.rpm 3c350fc137a973249a85671083ed508b
-libpng-1.2.2-16.i386.rpm b7d5a39ec3d2c73e0f944d0f525ce79c
-libstdc++-3.2.2-5.i386.rpm 09ffb26f39e27232d3c385f5fbc1ef1d
-libstdc++-devel-3.2.2-5.i386.rpm 31768c560244755d32185db6022a4b75
-libtermcap-2.0.8-35.i386.rpm 26883bbee99b436059bd8db85426f3d4
-libtiff-3.5.7-11.i386.rpm e29006e58367d587c0632fb77113841f
-libtool-libs-1.4.3-5.i386.rpm 5fbbdfb5e1cf43ee03fc4f8a2bc4eaba
-m4-1.4.1-13.i386.rpm 38c55c667d34492f24c5946a3374650d
-make-3.79.1-17.i386.rpm 5144104c693ee61250e8fd7d75bab866
-mingetty-1.01-1.i386.rpm d3e42b0faebc682fb3c31216786e0702
-mktemp-1.5-18.i386.rpm 28f1bf48c65ce9a5fd18a53fc71675b0
-modutils-2.4.22-8.i386.rpm db39bb8d565162e3f8608190eb7a19fa
-mount-2.11y-9.i386.rpm 280a81dfd645785fd2af9fe312788256
-ncurses-5.3-4.i386.rpm e941b37d22dc9ac4a8c37960c5fa337f
-ncurses-devel-5.3-4.i386.rpm 5b3d837bba70045ccb6fccb63ec35dc1
-net-tools-1.60-12.i386.rpm 20c2bca22ba3f63c43190b63ebd78be5
-openssl-0.9.7a-2.i386.rpm 39105ce3607fac29a5e0d227e69fea38
-pam-0.75-48.i386.rpm fe77ccc841c5fbb830c81867e8e0f164
-patch-2.5.4-16.i386.rpm 351d225da983e5684fa4c5c8d5ead90f
-pcre-3.9-10.i386.rpm b545fff04823c776e37142764e31613c
-perl-5.8.0-88.i386.rpm c00258c140d4ac1650dcaab4abbda253
-perl-Filter-1.29-3.i386.rpm 27a82686fe46c220683a447d73c42375
-pkgconfig-0.14.0-3.i386.rpm 1502d26e4fdec84cce1eee6fb329f4e7
-popt-1.8-0.69.i386.rpm 8d827ac879feb6bd5a4055a9338d86a1
-procps-2.0.11-6.i386.rpm 1068278922d4cf486d1f5d9b8109fb81
-psmisc-21.2-4.i386.rpm 457a78fac813a2779f43ee3f5f02aaec
-readline-4.3-5.i386.rpm c7b7159668d3272083585737a93628eb
-readline-devel-4.3-5.i386.rpm 79b237ff8225dd73646c347e00ca7732
-redhat-release-9-3.i386.rpm 4002643ba2e2077ccc22ef616d69c9fe
-rpm-4.2-0.69.i386.rpm 521141f6fe9a3443d7f89627a6f8c71e
-rpm-build-4.2-0.69.i386.rpm 6c8b7c4acf2562f2d12378966223856b
-sed-4.0.5-1.i386.rpm 34711aa4e9dc199ba1f617a75b68fd1f
-setup-2.5.25-1.noarch.rpm 0adc91fc02ea439db469bd27ee6609de
-shadow-utils-4.0.3-6.i386.rpm 45fd133d921a37cd36150fab9350baec
-sysklogd-1.4.1-12.i386.rpm caeb14d785b721d045e846effe7f3928
-SysVinit-2.84-13.i386.rpm 4e4a1b1fd557aa8daa4a560b4f59fe0f
-tar-1.13.25-11.i386.rpm abea2f1a14cbd9fecddf55b3f57da4c6
-termcap-11.0.1-16.noarch.rpm 2392055e8d44522ac95a050b6c30079b
-unzip-5.50-7.i386.rpm e0bba7266dba6aafd03bb362ac6424fe
-util-linux-2.11y-9.i386.rpm 4a0bc1bb3aa8eedd8ef6f4cd753dab3c
-which-2.14-5.i386.rpm cb0f37e1c1b59f6e9503844c0839314a
-words-2-21.noarch.rpm 901c74e5f71314c81d326991298f860f
-XFree86-libs-4.3.0-2.i386.rpm c1f7264692685aacba2bc05226c0eb1a
-XFree86-libs-data-4.3.0-2.i386.rpm 33030ba631e865db552d795c3490df8e
-XFree86-Mesa-libGL-4.3.0-2.i386.rpm e9f579759648cdb0492982f4ccaedc4b
-zlib-1.1.4-8.i386.rpm c8e2f95e60e75fcfe51dba704c5a6f11
-zlib-devel-1.1.4-8.i386.rpm 6e891309a0dd19b00cc8dfb9018692fd
--- a/pkgs/build-support/vm/rpm/redhat-9-i386.nix
+++ b/pkgs/build-support/vm/rpm/redhat-9-i386.nix
@ -1,93 +0,0 @@
-{fetchurl}: [
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm; md5="cea6ded7bd395468a41e9b6380cf5c46";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/automake-1.6.3-5.noarch.rpm; md5="9a518459499504faa786b63bd88374d1";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/basesystem-8.0-2.noarch.rpm; md5="64bc91a544ed3b175e617df2b6683eec";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bash-2.05b-20.i386.rpm; md5="db4db03fc2d33e3519d72b8f54d483ef";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/binutils-2.13.90.0.18-9.i386.rpm; md5="cd09dfb42d1f9cbd70eba37430762bb6";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-1.0.2-8.i386.rpm; md5="ca663b78121235bdaafeced854e8e966";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-devel-1.0.2-8.i386.rpm; md5="1e69cd15c6288d41bf989afa579b2585";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-libs-1.0.2-8.i386.rpm; md5="996ac1deed904c7d75960b31dfe61b01";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/chkconfig-1.3.8-1.i386.rpm; md5="8ab54c42c15b3f649174e6bfa764adde";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/coreutils-4.5.3-19.i386.rpm; md5="972cd0ff8f3e784c2bc5666e80cf354a";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cpp-3.2.2-5.i386.rpm; md5="49d8c65dfa401b96b8018b5f6946c985";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cracklib-2.7-21.i386.rpm; md5="31326ff8fb099f10b5d857dc10a33fa3";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cracklib-dicts-2.7-21.i386.rpm; md5="d39c8baf399b348db40f3137e93dae03";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/curl-7.9.8-5.i386.rpm; md5="4899792440ce948316546a6a85e1a2ef";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/db4-4.0.14-20.i386.rpm; md5="5fec52fddea8e7cd88cfaa34839cc4b3";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/dev-3.3.2-5.i386.rpm; md5="a8a45208c6e18cac1bf897d5eb0ac07e";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/diffutils-2.8.1-6.i386.rpm; md5="772331d623e47069d464760fa68fd0d9";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/e2fsprogs-1.32-6.i386.rpm; md5="0b728dbe2d88c87951a921158a80184a";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/elfutils-libelf-0.76-3.i386.rpm; md5="1f4a143c12634884ce2a36eef141e6b3";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/expat-1.95.5-2.i386.rpm; md5="76aa046090620b8c51107a94a3e80d7c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/file-3.39-9.i386.rpm; md5="b0560e1725f28fe375f9885a7a6be684";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/filesystem-2.2.1-3.i386.rpm; md5="897e20be2729051cae7a5bc32efb6b3f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/findutils-4.1.7-9.i386.rpm; md5="be0e80cec36c3eabf172d5003dd79466";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/fontconfig-2.1-9.i386.rpm; md5="86e827ffaa502266116047e840f8eb8f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/freetype-2.1.3-6.i386.rpm; md5="64597ef3568d30982be5c0779f062ff2";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gawk-3.1.1-9.i386.rpm; md5="72da64dc330d5945ae80c1779390ac2e";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gcc-3.2.2-5.i386.rpm; md5="aa544de315b6ba5478d3f6e0c15d0208";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gcc-c++-3.2.2-5.i386.rpm; md5="a287f9ac6f8e2efc4965186366989684";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gdbm-1.8.0-20.i386.rpm; md5="819986ab928712c2c3c9324d74b360b8";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glib-1.2.10-10.i386.rpm; md5="24d900aaab3ca9561f7ff2d7e3a206bb";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-2.3.2-11.9.i386.rpm; md5="d923d7a9a5ac6c25cb51517b23843f78";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-common-2.3.2-11.9.i386.rpm; md5="f63000e72fc1adc2c23d4de3ba9ca2a0";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-debug-2.3.2-11.9.i386.rpm; md5="ae4aa98a669c3edc7b3c97b1ef409c43";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-devel-2.3.2-11.9.i386.rpm; md5="569afc17dd5f1208407b3742a3849b1c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-kernheaders-2.4-8.10.i386.rpm; md5="17f4befda9601ac4e3d312245affee2b";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/grep-2.5.1-7.i386.rpm; md5="0606cd6f5516817fe56d6bcc8afe179a";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gzip-1.3.3-9.i386.rpm; md5="b47a6dfbf36d55a93e3d3920e936a2a7";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/info-4.3-5.i386.rpm; md5="8ce01d5cf0287d8cb012bce443679658";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/initscripts-7.14-1.i386.rpm; md5="12258ed059d3de4d7a6abef4d4d14222";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/iproute-2.4.7-7.i386.rpm; md5="b363643aa70272a146ca92c4577ebced";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/iputils-20020927-2.i386.rpm; md5="83da3128b0da1fdcfd59786451c9d5eb";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/krb5-libs-1.2.7-10.i386.rpm; md5="9865f9f50631007ecdd409a53626502c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/less-378-7.i386.rpm; md5="608656bbe868016ea464d965e07a026c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libgcc-3.2.2-5.i386.rpm; md5="91cae96d5ac2f19b20cb0c07906aed06";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libjpeg-6b-26.i386.rpm; md5="3c350fc137a973249a85671083ed508b";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libpng-1.2.2-16.i386.rpm; md5="b7d5a39ec3d2c73e0f944d0f525ce79c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libstdc++-3.2.2-5.i386.rpm; md5="09ffb26f39e27232d3c385f5fbc1ef1d";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libstdc++-devel-3.2.2-5.i386.rpm; md5="31768c560244755d32185db6022a4b75";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtermcap-2.0.8-35.i386.rpm; md5="26883bbee99b436059bd8db85426f3d4";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtiff-3.5.7-11.i386.rpm; md5="e29006e58367d587c0632fb77113841f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtool-libs-1.4.3-5.i386.rpm; md5="5fbbdfb5e1cf43ee03fc4f8a2bc4eaba";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/m4-1.4.1-13.i386.rpm; md5="38c55c667d34492f24c5946a3374650d";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/make-3.79.1-17.i386.rpm; md5="5144104c693ee61250e8fd7d75bab866";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mingetty-1.01-1.i386.rpm; md5="d3e42b0faebc682fb3c31216786e0702";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mktemp-1.5-18.i386.rpm; md5="28f1bf48c65ce9a5fd18a53fc71675b0";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/modutils-2.4.22-8.i386.rpm; md5="db39bb8d565162e3f8608190eb7a19fa";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mount-2.11y-9.i386.rpm; md5="280a81dfd645785fd2af9fe312788256";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/ncurses-5.3-4.i386.rpm; md5="e941b37d22dc9ac4a8c37960c5fa337f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/ncurses-devel-5.3-4.i386.rpm; md5="5b3d837bba70045ccb6fccb63ec35dc1";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/net-tools-1.60-12.i386.rpm; md5="20c2bca22ba3f63c43190b63ebd78be5";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/openssl-0.9.7a-2.i386.rpm; md5="39105ce3607fac29a5e0d227e69fea38";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pam-0.75-48.i386.rpm; md5="fe77ccc841c5fbb830c81867e8e0f164";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/patch-2.5.4-16.i386.rpm; md5="351d225da983e5684fa4c5c8d5ead90f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pcre-3.9-10.i386.rpm; md5="b545fff04823c776e37142764e31613c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/perl-5.8.0-88.i386.rpm; md5="c00258c140d4ac1650dcaab4abbda253";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/perl-Filter-1.29-3.i386.rpm; md5="27a82686fe46c220683a447d73c42375";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pkgconfig-0.14.0-3.i386.rpm; md5="1502d26e4fdec84cce1eee6fb329f4e7";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/popt-1.8-0.69.i386.rpm; md5="8d827ac879feb6bd5a4055a9338d86a1";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/procps-2.0.11-6.i386.rpm; md5="1068278922d4cf486d1f5d9b8109fb81";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/psmisc-21.2-4.i386.rpm; md5="457a78fac813a2779f43ee3f5f02aaec";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/readline-4.3-5.i386.rpm; md5="c7b7159668d3272083585737a93628eb";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/readline-devel-4.3-5.i386.rpm; md5="79b237ff8225dd73646c347e00ca7732";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/redhat-release-9-3.i386.rpm; md5="4002643ba2e2077ccc22ef616d69c9fe";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/rpm-4.2-0.69.i386.rpm; md5="521141f6fe9a3443d7f89627a6f8c71e";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/rpm-build-4.2-0.69.i386.rpm; md5="6c8b7c4acf2562f2d12378966223856b";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/sed-4.0.5-1.i386.rpm; md5="34711aa4e9dc199ba1f617a75b68fd1f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/setup-2.5.25-1.noarch.rpm; md5="0adc91fc02ea439db469bd27ee6609de";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/shadow-utils-4.0.3-6.i386.rpm; md5="45fd133d921a37cd36150fab9350baec";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/sysklogd-1.4.1-12.i386.rpm; md5="caeb14d785b721d045e846effe7f3928";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/SysVinit-2.84-13.i386.rpm; md5="4e4a1b1fd557aa8daa4a560b4f59fe0f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/tar-1.13.25-11.i386.rpm; md5="abea2f1a14cbd9fecddf55b3f57da4c6";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/termcap-11.0.1-16.noarch.rpm; md5="2392055e8d44522ac95a050b6c30079b";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/unzip-5.50-7.i386.rpm; md5="e0bba7266dba6aafd03bb362ac6424fe";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/util-linux-2.11y-9.i386.rpm; md5="4a0bc1bb3aa8eedd8ef6f4cd753dab3c";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/which-2.14-5.i386.rpm; md5="cb0f37e1c1b59f6e9503844c0839314a";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/words-2-21.noarch.rpm; md5="901c74e5f71314c81d326991298f860f";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-libs-4.3.0-2.i386.rpm; md5="c1f7264692685aacba2bc05226c0eb1a";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-libs-data-4.3.0-2.i386.rpm; md5="33030ba631e865db552d795c3490df8e";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-Mesa-libGL-4.3.0-2.i386.rpm; md5="e9f579759648cdb0492982f4ccaedc4b";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/zlib-1.1.4-8.i386.rpm; md5="c8e2f95e60e75fcfe51dba704c5a6f11";})
-  (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/zlib-devel-1.1.4-8.i386.rpm; md5="6e891309a0dd19b00cc8dfb9018692fd";})
-]
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@ -28,20 +28,20 @@ sub rpmvercmp {
        my $v2 = $vercmps2[$i];

        if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) {
-	    if ( int($v1) > int($v2) ) {
-		return 1;
-	    }
-	    elsif ( int($v1) < int($v2) ) {
-		return -1;
-	    }
-	} else {
-	    if ( $v1 gt $v2 ) {
-		return 1;
-	    }
-	    elsif ( $v1 lt $v2 ) {
-		return -1;
-	    }
-	}
+            if ( int($v1) > int($v2) ) {
+                return 1;
+            }
+            elsif ( int($v1) < int($v2) ) {
+                return -1;
+            }
+        } else {
+            if ( $v1 gt $v2 ) {
+                return 1;
+            }
+            elsif ( $v1 lt $v2 ) {
+                return -1;
+            }
+        }
    }
    if($l1 == $l2) {
        return 0;
@ -90,19 +90,25 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
 }

 my %provides;
-foreach my $pkgName (keys %pkgs) {
+PKG: foreach my $pkgName (keys %pkgs) {
    #print STDERR "looking at $pkgName\n";
    my $pkg = $pkgs{$pkgName};
-    
-    #print STDERR keys %{$pkg->{format}}, "\n";

-    #print STDERR $pkg->{format}->{'rpm:provides'}, "\n";
-    
+    # Skip packages that conflict with a required package.
+    my $conflicts = $pkg->{format}->{'rpm:conflicts'}->{'rpm:entry'} // [];
+    foreach my $conflict (@{$conflicts}) {
+        next if $conflict->{flags} // "" eq "LT" || $conflict->{flags} // "" eq "LE";
+        #print STDERR "  $pkgName conflicts with $conflict->{name}\n";
+        if (grep { $_ eq $conflict->{name} } @toplevelPkgs) {
+            print STDERR "skipping package $pkgName because it conflicts with a required package\n";
+            next PKG;
+        }
+    }
+
    my $provides = $pkg->{format}->{'rpm:provides'}->{'rpm:entry'} or die;
    foreach my $req (@{$provides}) {
-        #print "$req->{name}\n";
-        #print STDERR "  provides $req\n";
-        #die "multiple provides for $req" if defined $provides{$req};
+        #print STDERR "  $pkgName provides $req->{name}\n";
+        #die "multiple provides for $req->{name}" if defined $provides{$req->{name}};
        $provides{$req->{name}} = $pkgName;
    }

@ -123,9 +129,9 @@ sub closePackage {

    return if defined $donePkgs{$pkgName};
    $donePkgs{$pkgName} = 1;
-    
+
    print STDERR ">>> $pkgName\n";
-    
+
    my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist";

    my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || [];
@ -133,14 +139,14 @@ sub closePackage {
    my @deps = ();
    foreach my $req (@{$requires}) {
        next if $req->{name} =~ /^rpmlib\(/;
-        print STDERR "  needs $req->{name}\n";
+        #print STDERR "  needs $req->{name}\n";
        my $provider = $provides{$req->{name}};
        if (!defined $provider) {
            print STDERR "    WARNING: no provider for $req->{name}\n";
            next;
        }
-        print STDERR "    satisfied by $provider\n";
-        push @deps, $provider; 
+        #print STDERR "    satisfied by $provider\n";
+        push @deps, $provider;
    }

    closePackage($_) foreach @deps;
--- a/pkgs/build-support/vm/rpm/rpm-list-to-nix.pl
+++ b/pkgs/build-support/vm/rpm/rpm-list-to-nix.pl
@ -1,51 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-
-my $list = shift;
-my $expr = shift;
-
-open LIST, "<$list";
-open NEW, ">$list.tmp";
-open EXPR, ">$expr";
-
-print EXPR "{fetchurl}: [\n";
-
-my $baseURL;
-
-while (<LIST>) {
-
-    if (/^\s*baseURL\s+(\S+)\s*$/) {
-        $baseURL = $1;
-        print NEW "baseURL $baseURL\n";
-    } 
-    
-    elsif (/^\s*(\S+)(\s+([a-z0-9]+))?\s*$/) {
-        my $pkgName = $1;
-        my $url = "$baseURL/$pkgName";
-        my $hash = $3;
-        if (!defined $hash) {
-            $hash = `nix-prefetch-url '$url'`;
-            die "fetch of `$url' failed" if ($? != 0);
-            chomp $hash;
-        }
-        print NEW "$pkgName $hash\n";
-        if (length $hash == 32) {
-            print EXPR "  (fetchurl {url=$url; md5=\"$hash\";})\n";
-        } else {
-            print EXPR "  (fetchurl {url=$url; sha256=\"$hash\";})\n";
-        }
-    }
-
-    else {
-        die "invalid line"
-    }
-}
-
-print EXPR "]\n";
-
-close LIST;
-close NEW;
-close EXPR;
-
-rename "$list\.tmp", "$list" or die "cannot rename";
--- a/pkgs/build-support/vm/rpm/suse-9-i386.list
+++ b/pkgs/build-support/vm/rpm/suse-9-i386.list
@ -1,90 +0,0 @@
-baseURL mirror://oldsuse/9.0/suse/i586
-glibc-2.3.2-92.i586.rpm d5396400c92d4085e536b708ddce265c
-zlib-1.1.4-232.i586.rpm ba1a8342757071dfd7e52a2c69c86584
-readline-4.3-212.i586.rpm c18b059909f3debca772a8f5b7d3aee7
-ncurses-5.3-115.i586.rpm 48c4f77acdbf2ef9aee807466d0fec88
-aaa_base-9.0-7.i586.rpm 1xj9k6b3s0zrdac52q1mw6l7ms55nzmdkfda1s1jbz9laijijppn
-aaa_skel-2003.9.18-8.i586.rpm 1cp9kyg8ksqk0hixdkzd454jhymqdpln9x2y2izdifzsc9wzbsz3
-sysconfig-0.23.30-39.i586.rpm 1dmn95b9yb7rcbgxscw7nspjrdw67v4gdn7kmy5pqq3jxnpmhzi8
-permissions-2003.9.18-8.i586.rpm 0z0n89jh63lqsa0sg6z7f7mn1n6bh1qnxd1h9s5ypmpkazfdhhib
-ash-0.2-804.i586.rpm 01m2nl5jmy206va26fx7w3p9zvmmvd5jkng19vjdw556a74h9saz
-autoconf-2.57-142.i586.rpm 1e360a37d4db4c87e07d15c88f0c12e2
-automake-1.7.6-44.i586.rpm 2c7f1335e73751008f594a68eb515290
-bash-2.05b-212.i586.rpm 1a0fd51a36144dbe89c16553a71899e0
-binutils-2.14.90.0.5-47.i586.rpm 63d69aeb190304f3ddba2d34fcbb5087
-bzip2-1.0.2-232.i586.rpm d667ffc252d983f27eeb041775503438
-coreutils-5.0-90.i586.rpm 121abfc07a9035329b781fdd46e8b600
-compat-2003.5.12-60.i586.rpm e78e5e2e78a2e29c90c3edbf51c8789e
-cpp-3.3.1-29.i586.rpm 2df0da5848fbc59e322167cf7bf1b2bd
-cracklib-2.7-903.i586.rpm 0c5d1c68796906c035a58cf9e4ce1e64
-curl-7.10.5-42.i586.rpm 17ca3725c110e267127b08bd0a1d59a7
-db-4.1.25-76.i586.rpm 9656c5d737d5d6db5a4a320a98590479
-devs-9.0-5.i586.rpm 81e0daafae9d5c75cf6826518dcb9c0f
-diffutils-2.8.1-207.i586.rpm 7d2aed3fe2d8a3e94076695d32c745fb
-e2fsprogs-1.34-34.i586.rpm 5acb02c211196891382927dd8a197899
-expat-1.95.6-84.i586.rpm 357ceb9a50240da9143ccc8d616f8a34
-file-4.03-45.i586.rpm 7c239f1f0695363c6a0dc2dc5d6e82cf
-filesystem-9.0-7.i586.rpm e4d1ed219ea5c8f39dafa30f3749f900
-fillup-1.42-13.i586.rpm 9d9a32946df392999a0bfd42f7faa7a1
-findutils-4.1.7-748.i586.rpm 10318b40691717786e7092395d63533a
-fontconfig-2.2.1-29.i586.rpm 0113c057d8d658b5301e4ce526820f8b
-freetype2-2.1.4-68.i586.rpm c101e3205fdfa22e912f9dc21cd24d12
-gawk-3.1.3-82.i586.rpm 9181c9078ad77b582b9e77f0323417df
-gcc-3.3.1-29.i586.rpm e32b4b631483ab5d22a12900e070890b
-gcc-c++-3.3.1-29.i586.rpm 7e6ee0a475b23bbf1c0e57087f682e43
-gdbm-1.8.3-124.i586.rpm 414fc63a785ee589e40908763b7fb18d
-glib-1.2.10-488.i586.rpm 018f711f294f1a54f9a5b625748f7b22
-glibc-devel-2.3.2-92.i586.rpm 705d90c6a8a7b7eaab8632c343d4e173
-glibc-i18ndata-2.3.2-92.i586.rpm fc719866325ef22c27ac07e366f8b854
-glibc-locale-2.3.2-92.i586.rpm 657164f38227450e5b0bde2892804f21
-gnome-filesystem-0.1-80.i586.rpm f42a958db0291f04af16a7ab50efedca
-gpm-1.20.1-204.i586.rpm 1mmrydfwl8ivlqhxx9l99w9f6vs0f7gnpc3r7j6qfcszm8ql77w6
-gpg-1.2.2-88.i586.rpm 5734134e5b699eacc227672bcb7fdb62
-grep-2.5.1-302.i586.rpm 553eea58a317a068b2bdbd279066f023
-gzip-1.3.5-51.i586.rpm 011ad84c3d935647e639bba34f9c9726
-info-4.5-92.i586.rpm 0da6ec81011700f2dc0db7f8c62d5436
-insserv-1.00.1-18.i586.rpm 708cee980fe3748f161b64aec372adfb
-iproute2-2.4.7-697.i586.rpm 5b8265f3f5f6a23a212b12700664cc91
-iputils-ss021109-60.i586.rpm b7744924b0d4ee20880cee83965d2c9d
-less-381-32.i586.rpm 2092ca409eeb6c479d345a5a6d19ca3e
-libacl-2.2.15-27.i586.rpm e4e246b6e57e39f68d7eea111daa86c9
-libattr-2.4.8-27.i586.rpm f49e5423a1cd8425f78fe8e2c0846404
-liblcms-1.10-37.i586.rpm 79c8494af052c5032c70ea2a394c7a0e
-libgcc-3.3.1-29.i586.rpm 7ba930b645729570c8b8f768490c7e90
-libjpeg-6.2.0-634.i586.rpm 0a8b28e57514c439a0314c89327b0783
-libpng-1.2.5-97.i586.rpm 09f7bfb235dc205074b2c81a60aaa2bf
-libstdc++-3.3.1-29.i586.rpm fe9e66884f3c6ec73a57c44868c749dd
-libstdc++-devel-3.3.1-29.i586.rpm bb69c86478476fee2fd327a54b5790c9
-libtiff-3.5.7-307.i586.rpm 53152a337d2f540f1b7a61e6b11ae41f
-libtool-1.5-85.i586.rpm dfc1992dc92bef0bcdef7273d2cd70fb
-libxcrypt-2.0-36.i586.rpm 022c44bdfb02c926ad6499506f9e8525
-logrotate-3.6.6-95.i586.rpm 0i8pj3rdnxf4ig1zghsbi63s3ss0mvnv4mvyjjxcnilnmg6qjnqj
-m4-1.4o-512.i586.rpm 141d24f90c907841a8a24ceb8e6cb94d
-make-3.80-101.i586.rpm 4f358bda24d2cefc78c3c744d2bd01da
-mktemp-1.5-637.i586.rpm 3f444e864a5b167472192de89957f47a
-modutils-2.4.25-56.i586.rpm 2d64e9b80a10f945e58a5a70e8859fc9
-ncurses-devel-5.3-115.i586.rpm 747d41d77cfacc3ea3874a6ddebc1862
-net-tools-1.60-448.i586.rpm e92f3a22f4595e97e72d8a6ac2e19959
-openssl-0.9.7b-74.i586.rpm 18e0fa1e8168217f6dea90c1954b5a50
-pam-0.77-129.i586.rpm 7b4e04a641d74fb7f3650100c03b258f
-pam-modules-9.0-6.i586.rpm b93f72a778d19ad9bc42d4c3c1ab5bcb
-patch-2.5.9-56.i586.rpm f9b39a18023a4661dd715e28022ac9d2
-pcre-4.4-24.i586.rpm 9cd20ad696e815b9a93be0015d6373d1
-perl-5.8.1-51.i586.rpm 24c046fc2d03464f61c26c014b715bf2
-perl-Filter-1.29-100.i586.rpm 7674bae9c1a7890a8553854b4933bc50
-pkgconfig-0.15.0-108.i586.rpm 31db551f2fcc901a25da746110584e2d
-popt-1.7-76.i586.rpm 66f310eee498958f83e223845b776746
-readline-devel-4.3-212.i586.rpm c9d0c8cd5ea825beb997c70b6ea95101
-rpm-4.1.1-77.i586.rpm 341f5dfdc85070d91da5fb2774d8c886
-sed-4.0.6-73.i586.rpm c95e7a25899d4d927785cb9cb165fca1
-suse-release-9.0-7.i586.rpm f9965de2e346d02acd56ca963c2ec7ae
-syslogd-1.4.1-424.i586.rpm 3713eb72cc56eef8aed49337efeb3611
-sysvinit-2.82-367.i586.rpm 6dfff9b498c7cb98cff660d0d71f24ec
-tar-1.13.25-204.i586.rpm 4e7808b8b691eb639115db0f88527571
-termcap-2.0.8-781.i586.rpm 755c8d17157be28822a940689ab3c1c7
-unzip-5.50-250.i586.rpm 423d68022a4e5e78aa2a88c1642471a7
-util-linux-2.11z-95.i586.rpm 2174767b2e2e6e4e3cdd8fc569dc3c6e
-XFree86-libs-4.3.0.1-29.i586.rpm 77b0e1d5974703b3fc6621d862b4b038
-zlib-devel-1.1.4-232.i586.rpm 7c60d8432793517236f64b0f79d7f20f
-baseURL mirror://oldsuse/9.0/suse/noarch
-suse-build-key-1.0-472.noarch.rpm 8e34a1af09d66b66ea353685f4a84dfc
--- a/pkgs/build-support/vm/rpm/suse-9-i386.nix
+++ b/pkgs/build-support/vm/rpm/suse-9-i386.nix
@ -1,90 +0,0 @@
-{fetchurl}: [
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-2.3.2-92.i586.rpm; md5="d5396400c92d4085e536b708ddce265c";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/zlib-1.1.4-232.i586.rpm; md5="ba1a8342757071dfd7e52a2c69c86584";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/readline-4.3-212.i586.rpm; md5="c18b059909f3debca772a8f5b7d3aee7";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ncurses-5.3-115.i586.rpm; md5="48c4f77acdbf2ef9aee807466d0fec88";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/aaa_base-9.0-7.i586.rpm; sha256="1xj9k6b3s0zrdac52q1mw6l7ms55nzmdkfda1s1jbz9laijijppn";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/aaa_skel-2003.9.18-8.i586.rpm; sha256="1cp9kyg8ksqk0hixdkzd454jhymqdpln9x2y2izdifzsc9wzbsz3";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sysconfig-0.23.30-39.i586.rpm; sha256="1dmn95b9yb7rcbgxscw7nspjrdw67v4gdn7kmy5pqq3jxnpmhzi8";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/permissions-2003.9.18-8.i586.rpm; sha256="0z0n89jh63lqsa0sg6z7f7mn1n6bh1qnxd1h9s5ypmpkazfdhhib";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ash-0.2-804.i586.rpm; sha256="01m2nl5jmy206va26fx7w3p9zvmmvd5jkng19vjdw556a74h9saz";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/autoconf-2.57-142.i586.rpm; md5="1e360a37d4db4c87e07d15c88f0c12e2";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/automake-1.7.6-44.i586.rpm; md5="2c7f1335e73751008f594a68eb515290";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/bash-2.05b-212.i586.rpm; md5="1a0fd51a36144dbe89c16553a71899e0";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/binutils-2.14.90.0.5-47.i586.rpm; md5="63d69aeb190304f3ddba2d34fcbb5087";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/bzip2-1.0.2-232.i586.rpm; md5="d667ffc252d983f27eeb041775503438";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/coreutils-5.0-90.i586.rpm; md5="121abfc07a9035329b781fdd46e8b600";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/compat-2003.5.12-60.i586.rpm; md5="e78e5e2e78a2e29c90c3edbf51c8789e";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/cpp-3.3.1-29.i586.rpm; md5="2df0da5848fbc59e322167cf7bf1b2bd";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/cracklib-2.7-903.i586.rpm; md5="0c5d1c68796906c035a58cf9e4ce1e64";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/curl-7.10.5-42.i586.rpm; md5="17ca3725c110e267127b08bd0a1d59a7";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/db-4.1.25-76.i586.rpm; md5="9656c5d737d5d6db5a4a320a98590479";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/devs-9.0-5.i586.rpm; md5="81e0daafae9d5c75cf6826518dcb9c0f";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/diffutils-2.8.1-207.i586.rpm; md5="7d2aed3fe2d8a3e94076695d32c745fb";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/e2fsprogs-1.34-34.i586.rpm; md5="5acb02c211196891382927dd8a197899";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/expat-1.95.6-84.i586.rpm; md5="357ceb9a50240da9143ccc8d616f8a34";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/file-4.03-45.i586.rpm; md5="7c239f1f0695363c6a0dc2dc5d6e82cf";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/filesystem-9.0-7.i586.rpm; md5="e4d1ed219ea5c8f39dafa30f3749f900";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/fillup-1.42-13.i586.rpm; md5="9d9a32946df392999a0bfd42f7faa7a1";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/findutils-4.1.7-748.i586.rpm; md5="10318b40691717786e7092395d63533a";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/fontconfig-2.2.1-29.i586.rpm; md5="0113c057d8d658b5301e4ce526820f8b";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/freetype2-2.1.4-68.i586.rpm; md5="c101e3205fdfa22e912f9dc21cd24d12";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gawk-3.1.3-82.i586.rpm; md5="9181c9078ad77b582b9e77f0323417df";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gcc-3.3.1-29.i586.rpm; md5="e32b4b631483ab5d22a12900e070890b";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gcc-c++-3.3.1-29.i586.rpm; md5="7e6ee0a475b23bbf1c0e57087f682e43";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gdbm-1.8.3-124.i586.rpm; md5="414fc63a785ee589e40908763b7fb18d";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glib-1.2.10-488.i586.rpm; md5="018f711f294f1a54f9a5b625748f7b22";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-devel-2.3.2-92.i586.rpm; md5="705d90c6a8a7b7eaab8632c343d4e173";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-i18ndata-2.3.2-92.i586.rpm; md5="fc719866325ef22c27ac07e366f8b854";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-locale-2.3.2-92.i586.rpm; md5="657164f38227450e5b0bde2892804f21";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gnome-filesystem-0.1-80.i586.rpm; md5="f42a958db0291f04af16a7ab50efedca";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gpm-1.20.1-204.i586.rpm; sha256="1mmrydfwl8ivlqhxx9l99w9f6vs0f7gnpc3r7j6qfcszm8ql77w6";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gpg-1.2.2-88.i586.rpm; md5="5734134e5b699eacc227672bcb7fdb62";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/grep-2.5.1-302.i586.rpm; md5="553eea58a317a068b2bdbd279066f023";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gzip-1.3.5-51.i586.rpm; md5="011ad84c3d935647e639bba34f9c9726";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/info-4.5-92.i586.rpm; md5="0da6ec81011700f2dc0db7f8c62d5436";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/insserv-1.00.1-18.i586.rpm; md5="708cee980fe3748f161b64aec372adfb";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/iproute2-2.4.7-697.i586.rpm; md5="5b8265f3f5f6a23a212b12700664cc91";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/iputils-ss021109-60.i586.rpm; md5="b7744924b0d4ee20880cee83965d2c9d";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/less-381-32.i586.rpm; md5="2092ca409eeb6c479d345a5a6d19ca3e";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libacl-2.2.15-27.i586.rpm; md5="e4e246b6e57e39f68d7eea111daa86c9";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libattr-2.4.8-27.i586.rpm; md5="f49e5423a1cd8425f78fe8e2c0846404";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/liblcms-1.10-37.i586.rpm; md5="79c8494af052c5032c70ea2a394c7a0e";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libgcc-3.3.1-29.i586.rpm; md5="7ba930b645729570c8b8f768490c7e90";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libjpeg-6.2.0-634.i586.rpm; md5="0a8b28e57514c439a0314c89327b0783";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libpng-1.2.5-97.i586.rpm; md5="09f7bfb235dc205074b2c81a60aaa2bf";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libstdc++-3.3.1-29.i586.rpm; md5="fe9e66884f3c6ec73a57c44868c749dd";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libstdc++-devel-3.3.1-29.i586.rpm; md5="bb69c86478476fee2fd327a54b5790c9";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libtiff-3.5.7-307.i586.rpm; md5="53152a337d2f540f1b7a61e6b11ae41f";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libtool-1.5-85.i586.rpm; md5="dfc1992dc92bef0bcdef7273d2cd70fb";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libxcrypt-2.0-36.i586.rpm; md5="022c44bdfb02c926ad6499506f9e8525";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/logrotate-3.6.6-95.i586.rpm; sha256="0i8pj3rdnxf4ig1zghsbi63s3ss0mvnv4mvyjjxcnilnmg6qjnqj";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/m4-1.4o-512.i586.rpm; md5="141d24f90c907841a8a24ceb8e6cb94d";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/make-3.80-101.i586.rpm; md5="4f358bda24d2cefc78c3c744d2bd01da";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/mktemp-1.5-637.i586.rpm; md5="3f444e864a5b167472192de89957f47a";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/modutils-2.4.25-56.i586.rpm; md5="2d64e9b80a10f945e58a5a70e8859fc9";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ncurses-devel-5.3-115.i586.rpm; md5="747d41d77cfacc3ea3874a6ddebc1862";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/net-tools-1.60-448.i586.rpm; md5="e92f3a22f4595e97e72d8a6ac2e19959";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/openssl-0.9.7b-74.i586.rpm; md5="18e0fa1e8168217f6dea90c1954b5a50";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pam-0.77-129.i586.rpm; md5="7b4e04a641d74fb7f3650100c03b258f";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pam-modules-9.0-6.i586.rpm; md5="b93f72a778d19ad9bc42d4c3c1ab5bcb";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/patch-2.5.9-56.i586.rpm; md5="f9b39a18023a4661dd715e28022ac9d2";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pcre-4.4-24.i586.rpm; md5="9cd20ad696e815b9a93be0015d6373d1";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/perl-5.8.1-51.i586.rpm; md5="24c046fc2d03464f61c26c014b715bf2";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/perl-Filter-1.29-100.i586.rpm; md5="7674bae9c1a7890a8553854b4933bc50";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pkgconfig-0.15.0-108.i586.rpm; md5="31db551f2fcc901a25da746110584e2d";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/popt-1.7-76.i586.rpm; md5="66f310eee498958f83e223845b776746";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/readline-devel-4.3-212.i586.rpm; md5="c9d0c8cd5ea825beb997c70b6ea95101";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/rpm-4.1.1-77.i586.rpm; md5="341f5dfdc85070d91da5fb2774d8c886";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sed-4.0.6-73.i586.rpm; md5="c95e7a25899d4d927785cb9cb165fca1";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/suse-release-9.0-7.i586.rpm; md5="f9965de2e346d02acd56ca963c2ec7ae";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/syslogd-1.4.1-424.i586.rpm; md5="3713eb72cc56eef8aed49337efeb3611";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sysvinit-2.82-367.i586.rpm; md5="6dfff9b498c7cb98cff660d0d71f24ec";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/tar-1.13.25-204.i586.rpm; md5="4e7808b8b691eb639115db0f88527571";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/termcap-2.0.8-781.i586.rpm; md5="755c8d17157be28822a940689ab3c1c7";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/unzip-5.50-250.i586.rpm; md5="423d68022a4e5e78aa2a88c1642471a7";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/util-linux-2.11z-95.i586.rpm; md5="2174767b2e2e6e4e3cdd8fc569dc3c6e";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/XFree86-libs-4.3.0.1-29.i586.rpm; md5="77b0e1d5974703b3fc6621d862b4b038";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/i586/zlib-devel-1.1.4-232.i586.rpm; md5="7c60d8432793517236f64b0f79d7f20f";})
-  (fetchurl {url=mirror://oldsuse/9.0/suse/noarch/suse-build-key-1.0-472.noarch.rpm; md5="8e34a1af09d66b66ea353685f4a84dfc";})
-]
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  '';

  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_xdgconfigdirs.patch ];
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_env.patch ];

  meta = with stdenv.lib; {
    homepage = https://wiki.gnome.org/Projects/GDM;
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
@ -0,0 +1,13 @@
+--- a/daemon/gdm-launch-environment.c	2014-11-24 15:43:55.532879804 +0100
+++ a/daemon/gdm-launch-environment.c	2014-11-28 18:22:42.636313967 +0100
+@@ -220,8 +220,8 @@ 
+                 "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
+                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
+                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
+-                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
+-                NULL
+                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
+                "XDG_CONFIG_DIRS", NULL
+         };
+         char *system_data_dirs;
+         int i;
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch
@ -1,26 +0,0 @@
--- a/daemon/gdm-launch-environment.c	2014-08-03 12:05:39.380178964 +0200
-+++ b/daemon/gdm-launch-environment.c	2014-08-03 12:08:26.570182517 +0200
-@@ -224,6 +224,7 @@
-                 NULL
-         };
-         char *system_data_dirs;
-+        char *system_config_dirs;
-         int i;
- 
-         load_lang_config_file (LANG_CONFIG_FILE,
-@@ -251,6 +252,15 @@
-                                               system_data_dirs));
-         g_free (system_data_dirs);
- 
-+        system_config_dirs = g_strjoinv (":", (char **) g_get_system_config_dirs ());
-+
-+        g_hash_table_insert (hash,
-+                             g_strdup ("XDG_CONFIG_DIRS"),
-+                             g_strdup_printf ("%s",
-+                                              system_config_dirs));
-+        g_free (system_config_dirs);
-+
-+
-         g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (launch_environment->priv->x11_authority_file));
- 
-         g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name));
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:

 let

@ -18,18 +18,22 @@ in
 stdenv.mkDerivation rec {
  version = "7.11.20150118";
  name = "ghc-${version}";
+  rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4";

-  src = fetchurl {
-    url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2";
-    sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20";
+  src = fetchgit {
+    url = "git://git.haskell.org/ghc.git";
+    inherit rev;
+    sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6";
  };

  postUnpack = ''
-    # tarball includes many already-compiled files
-    find . \( -name '*.dyn_o' -o -name '*.dyn_hi' -o -name haddock \) -type f -exec rm {} \;
+    pushd ghc-${builtins.substring 0 7 rev}
+    patchShebangs .
+    ./boot
+    popd
  '';

-  buildInputs = [ ghc perl ];
+  buildInputs = [ ghc perl autoconf automake happy alex ];

  preConfigure = ''
    echo >mk/build.mk "${buildMK}"
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "nim-0.10.2";
+
+  buildInputs = [ unzip ];
+
+  src = fetchurl {
+    url = "http://nim-lang.org/download/${name}.zip";
+    sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg";
+  };
+
+  buildPhase   = "sh build.sh";
+  installPhase =
+    ''
+      substituteInPlace install.sh --replace '$1/nim' "$out"
+      sh install.sh $out
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Statically typed, imperative programming language";
+      homepage = http://nim-lang.org/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ emery ];
+      platforms = platforms.linux; # arbitrary
+    };
+}
--- a/pkgs/development/compilers/sbcl/1.2.0.nix
+++ b/pkgs/development/compilers/sbcl/1.2.0.nix
@ -50,6 +50,9 @@ stdenv.mkDerivation rec {

    # Use whatever `cc` the stdenv provides
    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
+
+    substituteInPlace src/runtime/Config.x86-64-darwin \
+      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
  '';

  preBuild = ''
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@ -53,6 +53,9 @@ stdenv.mkDerivation rec {

    # Use whatever `cc` the stdenv provides
    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
+
+    substituteInPlace src/runtime/Config.x86-64-darwin \
+      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
  '';

  preBuild = ''
--- a/pkgs/development/compilers/vala/0.26.nix
+++ b/pkgs/development/compilers/vala/0.26.nix
@ -4,8 +4,8 @@

 let
  major = "0.26";
-  minor = "1";
-  sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b";
+  minor = "2";
+  sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4";
 in
 stdenv.mkDerivation rec {
  name = "vala-${major}.${minor}";
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -449,9 +449,6 @@ self: super: {
  rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
  rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6

-  # https://github.com/Twinside/Rasterific/issues/20
-  Rasterific = dontCheck super.Rasterific;
-
  # Upstream notified by e-mail.
  MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose;

@ -462,6 +459,12 @@ self: super: {
    doHaddock = false;
  });

+  # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
+  CHXHtml = dontDistribute super.CHXHtml;
+
+  # https://github.com/bos/bloomfilter/issues/7
+  bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; });
+
 } // {

  # Not on Hackage.
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@ -40,7 +40,7 @@ self: super: {
  transformers-compat = disableCabalFlag super.transformers-compat "three";

  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_1_0; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; };

  # https://github.com/tibbe/hashable/issues/85
  hashable = dontCheck super.hashable;
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@ -75,6 +75,9 @@ self: super: {
  hosc = dontDistribute super.hosc;
  tidal-midi = dontDistribute super.tidal-midi;

+  # Needs mtl 2.2.x due to "plailude".
+  clac = dontDistribute super.clac;
+
 }

 // # packages relating to amazonka
@ -103,7 +106,7 @@ self: super: {
    time = self.time_1_5_0_1;
    unix = self.unix_2_7_1_0;
    directory = self.directory_1_2_1_0;
-    process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; });
+    process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; });
    inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
  };
  amazonka = super.amazonka.overrideScope amazonkaEnv;
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Open source MPEG-4 and MPEG-2 AAC encoder";
    homepage    = http://www.audiocoding.com/faac.html;
-    license     = licenses.unfree;
+    license     = licenses.unfreeRedistributable;
    maintainers = with maintainers; [ codyopel ];
    platforms   = platforms.all;
  };
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, exampleSupport ? true # Example encoding program
+, exampleSupport ? false # Example encoding program
 }:

 with stdenv.lib;
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
  };

  preConfigure = ''
-    sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/includes,' -i Makefile
-    mkdir -p "$out/"{bin,lib,man/man1,man/man3,include}
+    sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
+    mkdir -p "$out/"{bin,lib,man/man1,man/man3,include/gsm}
    makeFlags="$makeFlags INSTALL_ROOT=$out"
  '';

+  NIX_CFLAGS_COMPILE = "-fPIC";
+
  parallelBuild = false;

  meta = {
--- a/pkgs/development/libraries/haskell/servant-server/default.nix
+++ b/pkgs/development/libraries/haskell/servant-server/default.nix
@ -8,8 +8,8 @@

 cabal.mkDerivation (self: {
  pname = "servant-server";
-  version = "0.2.1";
-  sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj";
+  version = "0.2.3";
+  sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "xml-conduit";
-  version = "1.2.3";
-  sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v";
+  version = "1.2.3.1";
+  sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8";
  buildDepends = [
    attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra
    dataDefault deepseq monadControl resourcet systemFilepath text
@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
    blazeMarkup conduit hspec HUnit resourcet text transformers
    xmlTypes
  ];
-  jailbreak = true;
  meta = {
    homepage = "http://github.com/snoyberg/xml";
    description = "Pure-Haskell utilities for dealing with XML with the conduit package";
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "ldb-1.1.19";
+  name = "ldb-1.1.20";

  src = fetchurl {
    url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "1p2815z9sjack08pcdbv4xzp1fvr4lxcn30rj0wh3py4ly6ji1h0";
+    sha256 = "1ckplfvr8rp5y632w5j0abdgkj3irbzjh1wn0yxadnhz4ymknjds";
  };

  buildInputs = [
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libevent, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "libasr-${version}";
+  version=  "1.0.1";
+
+  src = fetchurl {
+    url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+    sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916";
+  };
+
+  buildInputs = [ libevent openssl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/OpenSMTPD/libasr;
+    description = "Free, simple and portable asynchronous resolver library";
+    license = licenses.isc;
+    maintainers = [ maintainers.koral ];
+  };
+}
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@ -1,34 +1,53 @@
 { stdenv, fetchurl, pkgconfig, yasm
-, freetype, fribidi, fontconfig
-, enca ? null
-, harfbuzz ? null
+, freetype ? null
+, fribidi ? null
+, encaSupport ? true, enca ? null # enca support
+, fontconfigSupport ? true, fontconfig ? null # fontconfig support
+, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
+, rasterizerSupport ? false # Internal rasterizer
+, largeTilesSupport ? false # Use larger tiles in the rasterizer
 }:

+assert ((freetype != null) && (fribidi != null));
+assert encaSupport -> (enca != null);
+assert fontconfigSupport -> (fontconfig != null);
+assert harfbuzzSupport -> (harfbuzz != null);
+
 let
-  version = "0.11.1";
-  sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx";
-  baseurl = "https://github.com/libass/libass/releases/download";
-in stdenv.mkDerivation rec {
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
  name = "libass-${version}";
+  version = "0.12.1";

  src = fetchurl {
-    url = "${baseurl}/${version}/${name}.tar.xz";
-    inherit sha256;
+    url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
+    sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7";
  };

+  configureFlags = [
+    (mkFlag encaSupport "enca")
+    (mkFlag fontconfigSupport "fontconfig")
+    (mkFlag harfbuzzSupport "harfbuzz")
+    (mkFlag rasterizerSupport "rasterizer")
+    (mkFlag largeTilesSupport "large-tiles")
+  ];
+
  nativeBuildInputs = [ pkgconfig yasm ];

-  buildInputs = [
-    freetype fribidi fontconfig
-    enca harfbuzz
-  ];
+  buildInputs = [ freetype fribidi ]
+    ++ optional encaSupport enca
+    ++ optional fontconfigSupport fontconfig
+    ++ optional harfbuzzSupport harfbuzz;

  meta = {
    description = "Portable ASS/SSA subtitle renderer";
-    homepage = http://code.google.com/p/libass/;
-    license = stdenv.lib.licenses.isc;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    homepage    = https://github.com/libass/libass;
+    license     = licenses.isc;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ codyopel urkud ];
    repositories.git = git://github.com/libass/libass.git;
  };
 }
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
  };

-  NIX_LDFLAGS = "-lssp";
+  NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp";

  doCheck = true;

--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@ -1,47 +1,184 @@
-{stdenv, fetchurl, bash, yasm, which, perl, binutils}:
+{stdenv, fetchurl, bash, perl, yasm
+, vp8Support ? true # VP8
+, vp8DecoderSupport ? true # VP8 decoder
+, vp8EncoderSupport ? true # VP8 encoder
+, vp9Support ? true # VP9
+, vp9DecoderSupport ? true # VP9 decoder
+, vp9EncoderSupport ? true # VP9 encoder
+, extraWarningsSupport ? false # emit non-fatal warnings
+, werrorSupport ? false # treat warnings as errors (not available with all compilers)
+, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
+, installLibsSupport ? true # install libraries
+, installSrcsSupport ? false # install sources
+, debugSupport ? false # debug mode
+, gprofSupport ? false # gprof profiling instrumentation
+, gcovSupport ? false # gcov coverage instrumentation
+, optimizationsSupport ? true # compiler optimization flags
+, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
+, thumbSupport ? false # build arm assembly in thumb mode
+, libsSupport ? true # build librares
+, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
+, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
+, codecSrcsSupport ? false # codec library source code
+, debugLibsSupport ? false # include debug version of each library
+, md5Support ? true # support for output of checksum data
+, postprocSupport ? true # postprocessing
+, vp9PostprocSupport ? true # VP9 specific postprocessing
+, multithreadSupport ? true # multithreaded decoding & encoding
+, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
+, memTrackerSupport ? false # track memory usage
+, realtimeOnlySupport ? false # build for real-time encoding
+, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
+, errorConcealmentSupport ? false # decoder conceals losses
+, smallSupport ? false # favor smaller binary over speed
+, postprocVisualizerSupport ? false # macro block/block level visualizers
+, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
+, multiResEncodingSupport ? false # multiple-resolution encoding
+, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
+, decryptSupport ? false
+, experimentalSupport ? false # experimental features
+# Experimental features
+, experimentalMultipleArfSupport ? false
+, experimentalNon420Support ? false
+, experimentalAlphaSupport ? false
+}:

-let version = "1.3.0";
+assert (vp8Support || vp9Support);
+assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
+assert vp8DecoderSupport -> vp8Support;
+assert vp8EncoderSupport -> vp8Support;
+assert vp9DecoderSupport -> vp9Support;
+assert vp9EncoderSupport -> vp9Support;
+assert installLibsSupport -> libsSupport;
+# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
+assert installBinsSupport -> examplesSupport;
+assert examplesSupport -> md5Support;
+assert vp9PostprocSupport -> (vp9Support && postprocSupport);
+assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
+assert postprocVisualizerSupport -> postprocSupport;
+assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
+assert unitTestsSupport -> ((curl != null) && (coreutils != null));
+assert (experimentalMultipleArfSupport || experimentalNon420Support || experimentalAlphaSupport) -> experimentalSupport;
+assert stdenv.isCygwin -> unitTestsSupport;
+
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
-stdenv.mkDerivation rec {
-  name = "libvpx-" + version;

-  src = fetchurl { # sadly, there's no official tarball for this release
-    url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2";
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "libvpx-${version}";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2";
    sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc";
  };

  patchPhase = ''
-    sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \
-      examples/gen_example_code.sh build/make/gen_asm_deps.sh
-    sed -e '/enable linux/d' -i configure
+    patchShebangs .
  '';

-  buildInputs = [ yasm which perl ]
-    ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support
+  nativeBuildInputs = [ bash perl yasm ];

-  preConfigure = ''
-    mkdir -p build
-    cd build
-    substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64"
-  '';
+  buildInputs = [ ]
+    ++ optional unitTestsSupport coreutils
+    ++ optional unitTestsSupport curl;

-  configureScript = "../configure";
-  configureFlags =
-    [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
-      "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
-    # --enable-shared is only supported on ELF
-    ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared";
+  configureFlags = [
+    (mkFlag vp8Support "vp8")
+    (mkFlag vp8EncoderSupport "vp8-encoder")
+    (mkFlag vp8DecoderSupport "vp8-decoder")
+    (mkFlag vp9Support "vp9")
+    (mkFlag vp9EncoderSupport "vp9-encoder")
+    (mkFlag vp9DecoderSupport "vp9-decoder")
+    (mkFlag extraWarningsSupport "extra-warnings")
+    (mkFlag werrorSupport "werror")
+    "--disable-install-docs"
+    (mkFlag installBinsSupport "install-bins")
+    (mkFlag installLibsSupport "install-libs")
+    (mkFlag installSrcsSupport "install-srcs")
+    (mkFlag debugSupport "debug")
+    (mkFlag gprofSupport "gprof")
+    (mkFlag gcovSupport "gcov")
+    # Required to build shared libraries
+    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
+    (mkFlag (stdenv.isx86_64 || !stdenv.isDarwin || stdenv.isCygwin) "use-x86inc")
+    (mkFlag optimizationsSupport "optimizations")
+    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
+    (mkFlag thumbSupport "thumb")
+    (mkFlag libsSupport "libs")
+    (mkFlag examplesSupport "examples")
+    "--disable-docs"
+    "--as=yasm"
+    (mkFlag fastUnalignedSupport "fast-unaligned")
+    (mkFlag codecSrcsSupport "codec-srcs")
+    (mkFlag debugLibsSupport "debug-libs")
+    (mkFlag md5Support "md5")
+    (mkFlag stdenv.isMips "dequant-tokens")
+    (mkFlag stdenv.isMips "dc-recon")
+    (mkFlag postprocSupport "postproc")
+    (mkFlag vp9PostprocSupport "vp9-postproc")
+    (mkFlag multithreadSupport "multithread")
+    (mkFlag internalStatsSupport "internal-stats")
+    (mkFlag memTrackerSupport "mem-tracker")
+    /* If --enable-spatial-resampling not enabled, build will fail with undeclared variable errors.
+       Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
+       but is only executed if --enable-spatial-resampling is enabled */
+    "--enable-spatial-resampling"
+    (mkFlag realtimeOnlySupport "realtime-only")
+    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
+    (mkFlag errorConcealmentSupport "error-concealment")
+    # Shared libraries are only supported on ELF platforms
+    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
+    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
+    (mkFlag smallSupport "small")
+    (mkFlag postprocVisualizerSupport "postproc-visualizer")
+    (mkFlag unitTestsSupport "unit-tests")
+    (mkFlag multiResEncodingSupport "multi-res-encoding")
+    (mkFlag temporalDenoisingSupport "temporal-denoising")
+    (mkFlag decryptSupport "decrypt")
+    (mkFlag experimentalSupport "experimental")
+    # Experimental features
+    (mkFlag experimentalMultipleArfSupport "multiple-arf")
+    (mkFlag experimentalNon420Support "non420")
+    (mkFlag experimentalAlphaSupport "alpha")
+  ];

-  installPhase = ''
-    make quiet=false DIST_DIR=$out install
-  '';
+  enableParallelBuilding = true;

-  meta = with stdenv.lib; {
-    description = "VP8 video encoder";
-    homepage    = http://code.google.com/p/webm;
+  crossAttrs = let
+    isCygwin = stdenv.cross.libc == "msvcrt";
+    isDarwin = stdenv.cross.libc == "libSystem";
+  in {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      #"--extra-cflags="
+      #"--prefix="
+      #"--libc="
+      #"--libdir="
+      "--enable-external-build"
+      # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
+      # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
+      # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
+      "--force-target=${stdenv.cross.config}${(
+              if isDarwin then (
+                if stdenv.cross.osxMinVersion == "10.9"  then "13"
+                else if stdenv.cross.osxMinVersion == "10.8"  then "12"
+                else if stdenv.cross.osxMinVersion == "10.7"  then "11"
+                else if stdenv.cross.osxMinVersion == "10.6"  then "10"
+                else if stdenv.cross.osxMinVersion == "10.5"  then "9"
+                else "8")
+              else "")}-gcc"
+      (if isCygwin then "--enable-static-msvcrt" else "")
+    ];
+  };
+
+  meta = {
+    description = "WebM VP8/VP9 codec SDK";
+    homepage    = http://www.webmproject.org/;
    license     = licenses.bsd3;
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
+    maintainers = with maintainers; [ codyopel lovek323 ];
+    platforms   = platforms.all;
  };
 }
-
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@ -0,0 +1,203 @@
+{stdenv, fetchgit, perl, yasm
+, vp8Support ? true # VP8
+, vp8DecoderSupport ? true # VP8 decoder
+, vp8EncoderSupport ? true # VP8 encoder
+, vp9Support ? true # VP9
+, vp9DecoderSupport ? true # VP9 decoder
+, vp9EncoderSupport ? true # VP9 encoder
+, extraWarningsSupport ? false # emit non-fatal warnings
+, werrorSupport ? false # treat warnings as errors (not available with all compilers)
+, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
+, installLibsSupport ? true # install libraries
+, installSrcsSupport ? false # install sources
+, debugSupport ? false # debug mode
+, gprofSupport ? false # gprof profiling instrumentation
+, gcovSupport ? false # gcov coverage instrumentation
+, sizeLimitSupport ? true # limit max size to allow in the decoder
+, optimizationsSupport ? true # compiler optimization flags
+, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
+, thumbSupport ? false # build arm assembly in thumb mode
+, libsSupport ? true # build librares
+, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
+, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
+, codecSrcsSupport ? false # codec library source code
+, debugLibsSupport ? false # include debug version of each library
+, postprocSupport ? true # postprocessing
+, vp9PostprocSupport ? true # VP9 specific postprocessing
+, multithreadSupport ? true # multithreaded decoding & encoding
+, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
+, memTrackerSupport ? false # track memory usage
+, spatialResamplingSupport ? true # spatial sampling (scaling)
+, realtimeOnlySupport ? false # build for real-time encoding
+, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
+, errorConcealmentSupport ? false # decoder conceals losses
+, smallSupport ? false # favor smaller binary over speed
+, postprocVisualizerSupport ? false # macro block/block level visualizers
+, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
+, webmIOSupport ? true # input from and output to webm container
+, libyuvSupport ? true # libyuv
+, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
+, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
+, multiResEncodingSupport ? false # multiple-resolution encoding
+, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
+, vp9TemporalDenoisingSupport ? true # VP9 specific temporal denoising
+, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
+, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
+, experimentalSupport ? false # experimental features
+# Experimental features
+, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
+, experimentalFpMbStatsSupport ? false
+, experimentalEmulateHardwareSupport ? false
+}:
+
+assert (vp8Support || vp9Support);
+assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
+assert vp8DecoderSupport -> vp8Support;
+assert vp8EncoderSupport -> vp8Support;
+assert vp9DecoderSupport -> vp9Support;
+assert vp9EncoderSupport -> vp9Support;
+assert installLibsSupport -> libsSupport;
+# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
+assert installBinsSupport -> examplesSupport;
+assert vp9PostprocSupport -> (vp9Support && postprocSupport);
+assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
+/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
+   Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
+   but is only executed if spatialResamplingSupport is enabled */
+assert spatialResamplingSupport;
+assert postprocVisualizerSupport -> postprocSupport;
+assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
+assert unitTestsSupport -> ((curl != null) && (coreutils != null));
+assert vp9TemporalDenoisingSupport -> (vp9Support && temporalDenoisingSupport);
+assert vp9HighbitdepthSupport -> vp9Support;
+assert (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) -> experimentalSupport;
+assert stdenv.isCygwin -> (unitTestsSupport && webmIOSupport && libyuvSupport);
+
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "libvpx-git";
+
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/webm/libvpx";
+  /* DO NOT under any circumstance ever just bump the git commit without
+     confirming changes have not been made to the configure system */
+    rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; # 2015-2-12
+    sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x";
+  };
+
+  patchPhase = ''
+    patchShebangs .
+  '';
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optional unitTestsSupport coreutils
+    ++ optional unitTestsSupport curl;
+
+  configureFlags = [
+    (mkFlag vp8Support "vp8")
+    (mkFlag vp8EncoderSupport "vp8-encoder")
+    (mkFlag vp8DecoderSupport "vp8-decoder")
+    (mkFlag vp9Support "vp9")
+    (mkFlag vp9EncoderSupport "vp9-encoder")
+    (mkFlag vp9DecoderSupport "vp9-decoder")
+    (mkFlag extraWarningsSupport "extra-warnings")
+    (mkFlag werrorSupport "werror")
+    "--disable-install-docs"
+    (mkFlag installBinsSupport "install-bins")
+    (mkFlag installLibsSupport "install-libs")
+    (mkFlag installSrcsSupport "install-srcs")
+    (mkFlag debugSupport "debug")
+    (mkFlag gprofSupport "gprof")
+    (mkFlag gcovSupport "gcov")
+    # Required to build shared libraries
+    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
+    (mkFlag (stdenv.isi686 || stdenv.isx86_64) "use-x86inc")
+    (mkFlag optimizationsSupport "optimizations")
+    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
+    (mkFlag thumbSupport "thumb")
+    (mkFlag libsSupport "libs")
+    (mkFlag examplesSupport "examples")
+    "--disable-docs"
+    "--as=yasm"
+    # Limit default decoder max to WHXGA
+    (if sizeLimitSupport then "--size-limit=5120x3200" else "")
+    (mkFlag fastUnalignedSupport "fast-unaligned")
+    (mkFlag codecSrcsSupport "codec-srcs")
+    (mkFlag debugLibsSupport "debug-libs")
+    (mkFlag stdenv.isMips "dequant-tokens")
+    (mkFlag stdenv.isMips "dc-recon")
+    (mkFlag postprocSupport "postproc")
+    (mkFlag vp9PostprocSupport "vp9-postproc")
+    (mkFlag multithreadSupport "multithread")
+    (mkFlag internalStatsSupport "internal-stats")
+    (mkFlag memTrackerSupport "mem-tracker")
+    (mkFlag spatialResamplingSupport "spatial-resampling")
+    (mkFlag realtimeOnlySupport "realtime-only")
+    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
+    (mkFlag errorConcealmentSupport "error-concealment")
+    # Shared libraries are only supported on ELF platforms
+    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
+    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
+    (mkFlag smallSupport "small")
+    (mkFlag postprocVisualizerSupport "postproc-visualizer")
+    (mkFlag unitTestsSupport "unit-tests")
+    (mkFlag webmIOSupport "webm-io")
+    (mkFlag libyuvSupport "libyuv")
+    (mkFlag decodePerfTestsSupport "decode-perf-tests")
+    (mkFlag encodePerfTestsSupport "encode-perf-tests")
+    (mkFlag multiResEncodingSupport "multi-res-encoding")
+    (mkFlag temporalDenoisingSupport "temporal-denoising")
+    (mkFlag vp9TemporalDenoisingSupport "vp9-temporal-denoising")
+    (mkFlag coefficientRangeCheckingSupport "coefficient-range-checking")
+    (mkFlag (vp9HighbitdepthSupport && !stdenv.isi686) "vp9-highbitdepth")
+    (mkFlag experimentalSupport "experimental")
+    # Experimental features
+    (mkFlag experimentalSpatialSvcSupport "spatial-svc")
+    (mkFlag experimentalFpMbStatsSupport "fp-mb-stats")
+    (mkFlag experimentalEmulateHardwareSupport "emulate-hardware")
+  ];
+
+  enableParallelBuilding = true;
+
+  crossAttrs = let
+    isCygwin = stdenv.cross.libc == "msvcrt";
+    isDarwin = stdenv.cross.libc == "libSystem";
+  in {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      #"--extra-cflags="
+      #"--prefix="
+      #"--libc="
+      #"--libdir="
+      "--enable-external-build"
+      # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
+      # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
+      # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
+      "--force-target=${stdenv.cross.config}${(
+              if isDarwin then (
+                if      stdenv.cross.osxMinVersion == "10.10" then "14"
+                else if stdenv.cross.osxMinVersion == "10.9"  then "13"
+                else if stdenv.cross.osxMinVersion == "10.8"  then "12"
+                else if stdenv.cross.osxMinVersion == "10.7"  then "11"
+                else if stdenv.cross.osxMinVersion == "10.6"  then "10"
+                else if stdenv.cross.osxMinVersion == "10.5"  then "9"
+                else "8")
+              else "")}-gcc"
+      (if isCygwin then "--enable-static-msvcrt" else "")
+    ];
+  };
+
+  meta = {
+    description = "WebM VP8/VP9 codec SDK";
+    homepage    = http://www.webmproject.org/;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/protobuf/2.5.nix
+++ b/pkgs/development/libraries/protobuf/2.5.nix
@ -2,6 +2,7 @@

 callPackage ./generic.nix (args // rec {
  version = "2.5.0";
+  # make sure you test also -A pythonPackages.protobuf
  src = fetchurl {
    url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
--- a/pkgs/development/libraries/protobuf/2.6.nix
+++ b/pkgs/development/libraries/protobuf/2.6.nix
@ -2,6 +2,7 @@

 callPackage ./generic.nix (args // rec {
  version = "2.6.1";
+  # make sure you test also -A pythonPackages.protobuf
  src = fetchFromGitHub {
    owner = "google";
    repo = "protobuf";
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  name = "protobuf-v${version}";

  inherit src;

--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@ -1,7 +1,7 @@
 { callPackage, ... } @ args:

 callPackage ./generic.nix (args // {
-  version = "1.4";
-  rev = "5e604833c5aa605d0b6efbe5234492b5e7d8ac61";
-  sha256 = "1aqksqi1qmjpva5cal6j7h0hzk298wk3nhqv73wnyqdchq2sa8v5";
+  version = "1.5";
+  rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4";
+  sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7";
 })
--- a/pkgs/development/libraries/x265/generic.nix
+++ b/pkgs/development/libraries/x265/generic.nix
@ -1,12 +1,21 @@
-{ stdenv, cmake, fetchhg, mercurial, yasm
+{ stdenv, fetchhg, cmake, yasm
 , rev , sha256, version
-, highBitDepth ? false
-, debuggingSupport ? false
-, enableCli ? true
-, testSupport ? false
+, debugSupport ? false # Run-time sanity checks (debugging)
+, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
+, werrorSupport ? false # Warnings as errors
+, ppaSupport ? false # PPA profiling instrumentation
+, vtuneSupport ? false # Vtune profiling instrumentation
+, custatsSupport ? false # Internal profiling of encoder work
+, cliSupport ? true # Build standalone CLI application
+, unittestsSupport ? false # Unit tests
 , ...
 }:

+let
+  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+in
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
  name = "x265-${version}";

@ -20,39 +29,28 @@ stdenv.mkDerivation rec {
    sed -i 's/unknown/${version}/g' source/cmake/version.cmake
  '';

-  cmakeFlags = with stdenv.lib; 
-    ''
-      ${if debuggingSupport
-        then "-DCHECKED_BUILD=ON"
-        else "-DCHECKED_BUILD=OFF"
-      }
-      -DSTATIC_LINK_CRT=OFF
-      ${if (stdenv.system == "x86_64-linux" && highBitDepth)
-        then "-DHIGH_BIT_DEPTH=ON"
-        else "-DHIGH_BIT_DEPTH=OFF"
-      }
-      -DWARNINGS_AS_ERRORS=OFF
-      -DENABLE_PPA=OFF
-      -DENABLE_SHARED=ON
-      ${if enableCli
-        then "-DENABLE_CLI=ON"
-        else "-DENABLE_CLI=OFF"
-      }
-      ${if testSupport
-        then "-DENABLE_TESTS=ON"
-        else "-DENABLE_TESTS=OFF"
-      }
-    '';
+  cmakeFlags = with stdenv.lib; [
+    (mkFlag debugSupport "CHECKED_BUILD")
+    "-DSTATIC_LINK_CRT=OFF"
+    (mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH")
+    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
+    (mkFlag ppaSupport "ENABLE_PPA")
+    "-DENABLE_SHARED=ON"
+    (mkFlag cliSupport "ENABLE_CLI")
+    (mkFlag unittestsSupport "ENABLE_TESTS")
+  ];

-  preConfigure = "cd source";
+  preConfigure = ''
+    cd source
+  '';

-  buildInputs = [ cmake yasm ];
+  nativeBuildInputs = [ cmake yasm ];

-  meta = with stdenv.lib; {
-    homepage = "http://x265.org";
+  meta = {
    description = "Library for encoding h.265/HEVC video streams";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    homepage    = http://x265.org;
+    license     = licenses.gpl2;
    maintainers = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
  };
 }
--- a/pkgs/development/libraries/x265/hg.nix
+++ b/pkgs/development/libraries/x265/hg.nix
@ -1,7 +1,7 @@
 { callPackage, ... } @ args:

 callPackage ./generic.nix (args // rec {
-  version = "hg";
-  rev = "5f9f7194267b76f733e9ffb0f9e8b474dfe89a71";
-  sha256 = "056ng8nsadmjf6s7igbgbxmiapjcxpfy6pbayl764xbhpkv4md88";
+  version = "2015-2-11"; # Date of commit used Y-M-D
+  rev = "9ab104096834f51bd799ea1cf1160092f8182944";
+  sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6";
 })
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@ -2,7 +2,7 @@

 let
  pname = "cmdliner";
-  version = "0.9.6";
+  version = "0.9.7";
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in

@ -14,7 +14,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p";
+    sha256 = "0ymzy1l6z85b6779lfxk179igfpf7rgfik70kr3c7lxmzwy8j6cw";
  };

  unpackCmd = "tar xjf $src";
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:

-let version = "0.3.1"; in
+let version = "0.4.1"; in

 stdenv.mkDerivation {
  name = "ocaml-ezjsonm-${version}";

  src = fetchzip {
    url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz";
-    sha256 = "0cz1v75j8j5y4vfcgylp5zaxiy7541qg6pm4wrgmvy6fmh82654f";
+    sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095";
  };

  buildInputs = [ ocaml findlib ];
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchgit, ocaml, findlib }:

 stdenv.mkDerivation rec {
-  name = "ocaml-re-1.2.2";
+  name = "ocaml-re-1.3.0";

  src = fetchgit {
    url = https://github.com/ocaml/ocaml-re.git;
    rev = "refs/tags/${name}";
-    sha256 = "1556i1zc6nrg4hxlvidllfhkjwl6n74biyjbvjlby8304n84jrk7";
+    sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx";
  };

  buildInputs = [ ocaml findlib ];
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@ -1,14 +1,15 @@
-{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}:
+{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }:

-stdenv.mkDerivation {
-  name = "ocaml-sqlite3-2.0.7";
+stdenv.mkDerivation rec {
+  name = "ocaml-sqlite3-${version}";
+  version = "2.0.9";

  src = fetchurl {
-    url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz;
-    sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq";
+    url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/v${version}/sqlite3-ocaml-${version}.tar.gz";
+    sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551";
  };

-  buildInputs = [ocaml findlib pkgconfig sqlite];
+  buildInputs = [ ocaml findlib pkgconfig sqlite ];

  createFindlibDestdir = true;

--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:

 stdenv.mkDerivation rec {
-  version = "0.2.1-2014.09.29";
+  version = "0.2.4-2015.02.13";
  name = "pharo-launcher-${version}";
  src = fetchurl {
    url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    md5 = "10945989c2b323c7f09a3b4e42ee7f2d";
+    md5 = "064f53cd20c7f189ba2d01f9e4b17d36";
  };

  executable-name = "pharo-launcher";
@ -68,4 +68,4 @@ stdenv.mkDerivation rec {
    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
    platforms = pharo-vm.meta.platforms;
  };
-}
+}
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@ -51,7 +51,7 @@


 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
+python.stdenv.mkDerivation (attrs // {
  inherit doCheck;

  name = namePrefix + name;
@ -118,7 +118,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
    # work as expected

    # --old-and-unmanagable:
-    # instruct setuptools not to use eggs but fallback to plan package install 
+    # instruct setuptools not to use eggs but fallback to plan package install
    # this also reduces one .pth file in the chain, but the main reason is to
    # force install process to install only scripts for the package we are
    # installing (otherwise it will install scripts also for dependencies)
@ -167,6 +167,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
  meta = with lib.maintainers; {
    # default to python's platforms
    platforms = python.meta.platforms;
+    broken = disabled;
  } // meta // {
    # add extra maintainer(s) to every package
    maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, cmake, llvmPackages }:
+
+with llvmPackages;
+
+let version = "3.5"; in
+stdenv.mkDerivation rec {
+  name = "include-what-you-use-${version}";
+
+  src = fetchurl {
+    sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w";
+    url = "${meta.homepage}/downloads/${name}.src.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Analyze #includes in C/C++ source files with clang";
+    longDescription = ''
+      For every symbol (type, function variable, or macro) that you use in
+      foo.cc, either foo.cc or foo.h should #include a .h file that exports the
+      declaration of that symbol. The include-what-you-use tool is a program
+      that can be built with the clang libraries in order to analyze #includes
+      of source files to find include-what-you-use violations, and suggest
+      fixes for them. The main goal of include-what-you-use is to remove
+      superfluous #includes. It does this both by figuring out what #includes
+      are not actually needed for this file (for both .cc and .h files), and
+      replacing #includes with forward-declares when possible.
+    '';
+    homepage = http://include-what-you-use.com;
+    license = with licenses; bsd3;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ clang cmake llvm ];
+
+  cmakeFlags = [ "-DLLVM_PATH=${llvm}" ];
+  enableParallelBuilding = true;
+}
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@ -5,8 +5,8 @@ stdenv.mkDerivation {
  name = "ocp-build-1.99.8-beta";

  src = fetchurl {
-    url = "https://github.com/OCamlPro/ocp-build/archive/ocp-build.1.99.8-beta.tar.gz";
-    sha256 = "06qh8v7k5m52xbivas08lblspsnvdl0vd7ghfj6wvpnfl8qvqabn";
+    url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.8-beta.tar.gz;
+    sha256 = "03zqpl73ah0fji5baxmk8w0h7waamlnhhysi128yap4abzsh5w87";
  };

  buildInputs = [ ocaml findlib ncurses ];
@ -24,7 +24,7 @@ stdenv.mkDerivation {
  TERM = "xterm";

  meta = with stdenv.lib; {
-    homepage = "http://typerex.ocamlpro.com/ocp-build.html";
+    homepage = http://www.typerex.org/ocp-build.html;
    description = "A build tool for OCaml";
    longDescription = ''
      ocp-build is a build system for OCaml application, based on simple
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@ -64,8 +64,8 @@ let
    patchShebangs = dir: ''
        node=`type -p node`
        coffee=`type -p coffee || true`
-        find -L ${dir} -type f -print0 | \
-        xargs -0 sed --follow-symlinks -i \
+        find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \
+        xargs sed --follow-symlinks -i \
            -e 's@#!/usr/bin/env node@#!'"$node"'@' \
            -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
            -e 's@#!/.*/node@#!'"$node"'@' \
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@ -0,0 +1,15 @@
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "image-analyzer";
+  pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
+};
+in callPackage pkg {
+  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/image-analyzer \
+        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    '';
+  };
+}
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@ -0,0 +1,37 @@
+{ pkgName, version, pkgSha256 }:
+{ stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }:
+let name = "${pkgName}-${version}";
+in stdenv.mkDerivation ({
+  inherit name buildInputs;
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/cdemu/${name}.tar.bz2";
+    sha256 = pkgSha256;
+  };
+  nativeBuildInputs = [ pkgconfig cmake ];
+  setSourceRoot = ''
+    mkdir build
+    cd build
+    sourceRoot="`pwd`"
+  '';
+  configurePhase = ''
+    cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
+  '';
+  meta = {
+    description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system.";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "http://cdemu.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ "Rok Mandeljc <mrok AT users DOT sourceforge DOT net>" ];
+  };
+} // drvParams)
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/pkgs/misc/emulators/cdemu/client.nix
@ -0,0 +1,15 @@
+{ callPackage, python, dbus_python, intltool, makeWrapper }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "cdemu-client";
+  pkgSha256 = "125f6j7c52a0c7smbx323vdpwhx24yl0vglkiyfcbm92fjji14rm";
+};
+in callPackage pkg {
+  buildInputs = [ python dbus_python intltool makeWrapper ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/cdemu \
+        --set PYTHONPATH "$PYTHONPATH"
+    '';
+  };
+}
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@ -0,0 +1,9 @@
+{ callPackage, glib, libao }:
+let pkg = import ./base.nix {
+  version = "3.0.2";
+  pkgName = "cdemu-daemon";
+  pkgSha256 = "01jg9b1nkqrbh6binfcbyraz83s9yjavgwi3y4w1bmqg5qlhv6lc";
+};
+in callPackage pkg {
+  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ];
+}
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@ -0,0 +1,18 @@
+{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "gcdemu";
+  pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk";
+};
+in callPackage pkg {
+  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/gcdemu \
+        --set PYTHONPATH "$PYTHONPATH" \
+        --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
+        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    '';
+    # TODO AppIndicator
+  };
+}
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@ -0,0 +1,9 @@
+{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }:
+let pkg = import ./base.nix {
+  version = "3.0.3";
+  pkgName = "libmirage";
+  pkgSha256 = "03idg94h5qhmnnc8g9dw8yqf14yv2paph5n77dfmg925f3z70nyn";
+};
+in callPackage pkg {
+  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ];
+}
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@ -0,0 +1,12 @@
+{ stdenv, fetchurl, kernel }:
+let version = "20140928";
+in stdenv.mkDerivation {
+  name = "vhba-${version}";
+  src  = fetchurl {
+    url = "http://downloads.sourceforge.net/cdemu/vhba-module-${version}.tar.bz2";
+    sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5";
+  };
+  preBuild = ''
+    makeFlags="KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out";
+  '';
+}
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.cc.cc.isGNU or false;

 let
-    version = "1.7.35";
+    version = "1.7.36";
    name = "wine-${version}";

    src = fetchurl {
      url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1yqwwfapv7vdhmdcnhnl2c4iqaqn1xwib4zfyv9ndhq2ld9gcbpb";
+      sha256 = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1";
    };

    gecko = fetchurl {
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@ -1,72 +1,29 @@
-# The firmware bundle as packaged by Debian. This should be "all" firmware that is not shipped
-# as part of the kernel itself.
-# You can either install the complete bundle, or write a separate package for individual
-# devices that copies the firmware from this package.
-
-{ stdenv, fetchurl, dpkg }:
+{ stdenv, fetchgit }:

 let
-  version = "0.43";
+  version = "17657c35869baa999b454e868cd3d5a7e1656425";
+  shortVersion = stdenv.lib.substring 0 7 version;
+in
+stdenv.mkDerivation {
+  name = "firmware-linux-nonfree-${shortVersion}";

-  packages = [
-    { name = "adi"; sha256 = "13cwnbispivpd73k928l1i818ylhpahp6xh7d6pw59sswrsx6inw"; }
-    { name = "atheros"; sha256 = "0sw9d52k3ynx1cxg7cq49pmm8y6vlqyhb9843hbyf6nbmjqj72bx"; }
-    { name = "bnx2"; sha256 = "1r8scys27qj5shdbgl8ag9vi4hiidx4bp8yw4n4dcp288d9x7bbh"; }
-    { name = "bnx2x"; sha256 = "03jx4vnn8irlwswydf4h3ya1kf064jkaj67jry2hr6qwpd4l8pgq"; }
-    { name = "brcm80211"; sha256 = "01mkmjkg16kdd26pwlg4a1s1717fh0j602mwqhwh46k8zakg2lkh"; }
-    { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; }
-    { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; }
-    { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; }
-    { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; }
-    { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; }
-    { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; }
-    { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; }
-    { name = "myricom"; sha256 = "17cdl885jlnja5m60l35xr2f84hv8z4cvg3d25vpp171s1vf1ks1"; }
-    { name = "netxen"; sha256 = "122nava9ld1v8gcnqbdpx0kffv0rxm9glp4xg09ssvldy4myfgl7"; }
-    { name = "qlogic"; sha256 = "02pgmprz1qwij7lw1lgmb8clgxj8v3mx0fyy1l4z7bffnpvip863"; }
-    { name = "ralink"; sha256 = "0yw9gf9gm3jxmsndr8kcsf6829smm88kshfb4c8jn0n6f4yy9l7x"; }
-    { name = "realtek"; sha256 = "0gay9x47pimdqj665sr1416l3bdyca9grsqpj0s9n6k1lmywrqx1"; }
-    { name = "ti-connectivity"; sha256 = "1m6yk0827991hs46l8pp8iiwh1ms0rwlmwn64k2wr725k5yzg29b"; }
-  ];
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    rev = version;
+    sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb";
+  };

-  fetchPackage =
-    { name, sha256 }: fetchurl {
-      url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-${name}_${version}_all.deb";
-      inherit sha256;
-    };
-
-  srcs = map fetchPackage packages;
-
-in stdenv.mkDerivation {
-  name = "firmware-linux-nonfree-${version}";
-  inherit srcs;
-
-  unpackPhase = ''
-    mkdir -p ./firmware
+  preInstall = ''
+    mkdir -p $out
  '';

-  buildPhase = ''
-    for src in $srcs; do
-      dpkg-deb -W $src
-      dpkg-deb -x $src .
-    done
-  '';
+  installFlags = [ "DESTDIR=$(out)" ];

-  buildInputs = [ dpkg ];
-
-  installPhase = ''
-    mkdir -p $out/share $out/lib/firmware
-    cp -r lib/firmware/* "$out/lib/firmware/"
-    # iwlwifi is packaged separately, but we need Bluetooth fw
-    rm $out/lib/firmware/iwlwifi*
-    cp -r usr/share/doc $out/share/
-    find $out/share -name changelog.gz | xargs rm
-  '';
-
-  meta = {
-    description = "Binary firmware collection packaged by Debian";
+  meta = with stdenv.lib; {
+    description = "Binary firmware collection packaged by kernel.org";
    homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.unfreeRedistributableFirmware;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
  };
 }
--- a/pkgs/os-specific/linux/firmware/iwlwifi/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi/default.nix
@ -1,81 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  packages = [
-    # Kernel 2.6.29+
-    { name = "5150-ucode-8.24.2.2"; sha256 = "1y8cah9xa8a9c7alh220cvmncjmwnacdz0kwsvg9lqr4cvzyclyj"; }
-
-    # Kernel 2.6.30+
-    { name = "6000-ucode-9.221.4.1"; sha256 = "0sw3v9807agx4mxdrfgsw7f195gs1f4zscnzcgpc8gb664r6413z"; }
-
-    # Kernel 2.6.37+
-    { name = "6050-ucode-41.28.5.1"; sha256 = "1i10rfn3kc07s2iqz79wvsrblhm360yz6v231dcz8sabvcyrlzar"; }
-    { name = "100-ucode-39.31.5.1"; sha256 = "1jvzdaiklnw613c4drkjkcdlnnk6c9kk7f0jqdxfkgppydwssnc2"; }
-
-    # Kernel 2.6.38+
-    { name = "5000-ucode-8.83.5.1-1"; sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg"; }
-
-    # Kernel 3.2+
-    { name = "6000g2b-ucode-18.168.6.1"; sha256 = "1shby6s9h4kfwmvg89505p61yq88ml1qccvw8h2m4l63a9mwg0qn"; }
-    { name = "6000g2a-ucode-18.168.6.1"; sha256 = "1sdv4lkpfd87c95zbk8wgn0b4l4nbwkb0b4iwvrzpnmdarbn3wm7"; }
-    { name = "1000-ucode-39.31.5.1"; sha256 = "0w69hfpwx79cph0517a6mkhsk51li2l0yhfr1jddmj3i4ny1y3zd"; }
-    { name = "135-ucode-18.168.6.1"; sha256 = "1dvyzwkyzsmvlp13z84g2lzkr0w0p8mj7c98fwh3pwv0cmglf04c"; }
-    { name = "105-ucode-18.168.6.1"; sha256 = "11z67ippn4hlmsnyv1lxknysrl3m5v908i9wf1nkm7kxw76biz04"; }
-    { name = "2000-ucode-18.168.6.1"; sha256 = "0ax98hlmz11hqi0k81j5cizp2hwaah7j6s3hw7jdfsmwpzy9lwrm"; }
-    { name = "2030-ucode-18.168.6.1"; sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; }
-
-    # Kernel 3.10+
-    { name = "7260-ucode-22.1.7.0"; sha256 = "0m31p98zwr70k3b9akha0d8n7x9ym43yg992jk8zd94159g37k0y"; }
-    { name = "3160-ucode-22.1.7.0"; sha256 = "0qfm854xv6dc6kqj0vym1avrirrshnxp9yqnlx356zvfnqyx4l33"; }
-
-    # Kernel 3.13+
-    { name = "7260-ucode-22.24.8.0"; sha256 = "1zvw5dj3kv7rdnypcmp6na8mlfw735nzahy8qz35zrmda8b6gvqi"; }
-    { name = "3160-ucode-22.24.8.0"; sha256 = "1jv3bhds3a3y2r719fqpc5cwb674hm3lwq9df11i6473f0xjs224"; }
-    { name = "7265-ucode-22.24.8.0"; sha256 = "1pvmc58gyr62akzdj8gx02y3i3d67zwawm8zdvpg2q615721wjp9"; }
-
-    # Kernel 3.14.9+
-    { name = "7260-ucode-25.228.9.0"; sha256 = "0ppx9lpkc2l9aggdadw4y2cpdz5zqyckshzhlb1qj60jbajiny36"; }
-    { name = "3160-ucode-25.228.9.0"; sha256 = "125kh5p21bx808l2al8v9a1g63396d1a1chf4amqa9zrp2aajmk8"; }
-    { name = "7265-ucode-25.228.9.0"; sha256 = "1dv9bai1s6vdigsahbrxjwlndnp2dsgkqz8j7021d34s99kbi6z8"; }
-
-    # Kernel 3.17+
-    { name = "7260-ucode-23.11.10.0"; sha256 = "1d9w7kd3h3632qmwb44943lxdafjn3ii8ha9wdvqri3b8fjfn7sa"; }
-    { name = "3160-ucode-23.11.10.0"; sha256 = "0ijpgfzz8735rsbkc6mvk3w7f1v9rr9dgy1l79vzmzc1vh2zpbdm"; }
-    { name = "7265-ucode-23.11.10.0"; sha256 = "1az8nq6z1ns1220309wp8jq1sc5flz2ac5k41pgj50503h54rlvi"; }
-  ];
-
-  fetchPackage =
-    { name, sha256 }: fetchurl {
-      name = "iwlwifi-${name}.tgz";
-      url = "https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-${name}.tgz";
-      inherit sha256;
-    };
-
-  srcs = map fetchPackage packages;
-
-in stdenv.mkDerivation {
-  name = "iwlwifi";
-  inherit srcs;
-
-  unpackPhase = ''
-    mkdir -p ./firmware
-  '';
-
-  buildPhase = ''
-    for src in $srcs; do
-      tar zxf $src
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/firmware
-    cp -r iwlwifi-*/*.ucode "$out/lib/firmware/"
-  '';
-
-  meta = {
-    description = "Binary firmware collection from intel";
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@ -49,7 +49,6 @@ with stdenv.lib;
  NUMA? y

  # Disable some expensive (?) features.
-  FTRACE n
  KPROBES n
  PM_TRACE_RTC n

@ -148,6 +147,7 @@ with stdenv.lib;

  # Filesystem options - in particular, enable extended attributes and
  # ACLs for all filesystems that support them.
+  FANOTIFY y
  EXT2_FS_XATTR y
  EXT2_FS_POSIX_ACL y
  EXT2_FS_SECURITY y
--- a/pkgs/os-specific/linux/kernel/crc-regression.patch
+++ b/pkgs/os-specific/linux/kernel/crc-regression.patch
@ -0,0 +1,24 @@
+See https://github.com/NixOS/nixpkgs/issues/6231
+
+v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c").
+That's probably because crypto/crc32c.c was renamed to
+crypto/crc32c_generic.c in commit
+06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through
+the cracks when backporting commit
+5d26a105b5a73e5635eae0629b42fa0a90e07b7b.
+
+So the affected kernels (all that backported the "crypto-" prefix
+patches) need this additional patch:
+
+diff --git a/crypto/crc32c.c b/crypto/crc32c.c
+index 06f7018c9d95..aae5829eb681 100644
+--- a/crypto/crc32c.c
+++ b/crypto/crc32c.c
+@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void)
+ module_init(crc32c_mod_init);
+ module_exit(crc32c_mod_fini);
+
+MODULE_ALIAS_CRYPTO("crc32c");
+ MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
+ MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c");
+ MODULE_LICENSE("GPL");
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.19";
+  modDirVersion = "3.19.0";
+  # Remember to update grsecurity!
+  extraMeta.branch = "3.19";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@ -82,4 +82,9 @@ rec {
    { name = "grsec-fix-path";
      patch = ./grsec-path.patch;
    };
+
+  crc_regression =
+    { name = "crc-backport-regression";
+      patch = ./crc-regression.patch;
+    };
 }
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;

 let

-  versionNumber = "343.36";
+  versionNumber = "346.35";
  # Policy: use the highest stable version as the default (on our master).
  inherit (stdenv.lib) makeLibraryPath;
 in
@ -26,12 +26,12 @@ stdenv.mkDerivation {
    if stdenv.system == "i686-linux" then
      fetchurl {
        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "17l23dp725883xcyy1n178pcl6lj27psrgbxymc356x2pngwkhcc";
+        sha256 = "09fz8nydi8ip3yv7dmbwnpwvjql5wp582z57022ppb9hqwq3r9mv";
      }
    else if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0djvh9wmazrfvpgyiqrz81kjk2war20xyjjr2kncxyplzk28mw97";
+        sha256 = "1z9a69a9xbcrz925mj02l2qaqcnhxzh2msbq4hf73p7x4h94ibkx";
      }
    else throw "nvidia-x11 does not support platform ${stdenv.system}";

--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@ -3,10 +3,10 @@ let
  inherit (stdenv.lib) optional optionalString;
  s = rec {
    baseName="sysdig";
-    version = "0.1.95";
+    version = "0.1.96";
    name="${baseName}-${version}";
    url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "1h7yjfpgnhmzvc9862k7salc80sw7chmxx5chh4xw1lzsjz1nz5s";
+    sha256 = "0fw5km1ms5faa9hlhzb6nba79m59443zblv43gpzsq1pwvpg7r94";
  };
  buildInputs = [
    cmake zlib luajit
--- a/pkgs/os-specific/linux/zfs/3.19-compat-git.patch
+++ b/pkgs/os-specific/linux/zfs/3.19-compat-git.patch
@ -1,146 +0,0 @@
-From 5a562310d706c3c2f2adc067fe73f1061c4fc386 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
-Date: Sat, 7 Feb 2015 13:41:01 +0100
-Subject: [PATCH] Linux 3.19 compat: file_inode was added
-
-struct access f->f_dentry->d_inode was replaced by accessor function
-file_inode(f)
---
- config/kernel-file-inode.m4 | 20 ++++++++++++++++++++
- config/kernel.m4            |  1 +
- include/linux/Makefile.am   |  1 +
- include/linux/fs_compat.h   | 38 ++++++++++++++++++++++++++++++++++++++
- include/sys/zpl.h           |  1 +
- module/zfs/zpl_file.c       |  4 ++--
- 6 files changed, 63 insertions(+), 2 deletions(-)
- create mode 100644 config/kernel-file-inode.m4
- create mode 100644 include/linux/fs_compat.h
-
-diff --git a/config/kernel-file-inode.m4 b/config/kernel-file-inode.m4
-new file mode 100644
-index 0000000..13af4e6
--- /dev/null
-+++ b/config/kernel-file-inode.m4
-@@ -0,0 +1,20 @@
-+dnl #
-+dnl # 3.19 API change
-+dnl # struct access f->f_dentry->d_inode was replaced by accessor function
-+dnl # file_inode(f)
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_FILE_INODE], [
-+	AC_MSG_CHECKING([whether file_inode() is available])
-+	ZFS_LINUX_TRY_COMPILE([
-+		#include <linux/fs.h>
-+	],[
-+		struct file *f = NULL;
-+		file_inode(f);
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_FILE_INODE, 1,
-+		          [file_inode() is available])
-+	],[
-+		AC_MSG_RESULT(no)
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index bdfb19c..e0b7954 100644
--- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -61,6 +61,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- 	ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL
- 	ZFS_AC_KERNEL_CURRENT_UMASK
- 	ZFS_AC_KERNEL_SHOW_OPTIONS
-+	ZFS_AC_KERNEL_FILE_INODE
- 	ZFS_AC_KERNEL_FSYNC
- 	ZFS_AC_KERNEL_EVICT_INODE
- 	ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index d00b1c8..480af26 100644
--- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -4,6 +4,7 @@ KERNEL_H = \
- 	$(top_srcdir)/include/linux/dcache_compat.h \
- 	$(top_srcdir)/include/linux/xattr_compat.h \
- 	$(top_srcdir)/include/linux/vfs_compat.h \
-+	$(top_srcdir)/include/linux/fs_compat.h \
- 	$(top_srcdir)/include/linux/blkdev_compat.h \
- 	$(top_srcdir)/include/linux/utsname_compat.h
- 
-diff --git a/include/linux/fs_compat.h b/include/linux/fs_compat.h
-new file mode 100644
-index 0000000..7860d75
--- /dev/null
-+++ b/include/linux/fs_compat.h
-@@ -0,0 +1,38 @@
-+/*
-+ * CDDL HEADER START
-+ *
-+ * The contents of this file are subject to the terms of the
-+ * Common Development and Distribution License (the "License").
-+ * You may not use this file except in compliance with the License.
-+ *
-+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-+ * or http://www.opensolaris.org/os/licensing.
-+ * See the License for the specific language governing permissions
-+ * and limitations under the License.
-+ *
-+ * When distributing Covered Code, include this CDDL HEADER in each
-+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-+ * If applicable, add the following below this CDDL HEADER, with the
-+ * fields enclosed by brackets "[]" replaced with your own identifying
-+ * information: Portions Copyright [yyyy] [name of copyright owner]
-+ *
-+ * CDDL HEADER END
-+ */
-+
-+/*
-+ * Copyright (C) 2015 Jörg Thalheim.
-+ */
-+
-+#ifndef _ZFS_FS_H
-+#define	_ZFS_FS_H
-+
-+#include <linux/fs.h>
-+
-+#ifndef HAVE_FILE_INODE
-+static inline struct inode *file_inode(const struct file *f)
-+{
-+    return f->f_dentry->d_inode;
-+}
-+#endif /* HAVE_FILE_INODE */
-+
-+#endif /* _ZFS_FS_H */
-diff --git a/include/sys/zpl.h b/include/sys/zpl.h
-index 3fc5d97..20eb27b 100644
--- a/include/sys/zpl.h
-+++ b/include/sys/zpl.h
-@@ -31,6 +31,7 @@
- #include <linux/exportfs.h>
- #include <linux/falloc.h>
- #include <linux/file_compat.h>
-+#include <linux/fs_compat.h>
- #include <linux/task_io_accounting_ops.h>
- #include <linux/vfs_compat.h>
- #include <linux/writeback.h>
-diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
-index 1f4f219..5f5bbba 100644
--- a/module/zfs/zpl_file.c
-+++ b/module/zfs/zpl_file.c
-@@ -617,7 +617,7 @@ zpl_fallocate(struct file *filp, int mode, loff_t offset, loff_t len)
- static int
- zpl_ioctl_getflags(struct file *filp, void __user *arg)
- {
-	struct inode *ip = filp->f_dentry->d_inode;
-+	struct inode *ip = file_inode(filp);
- 	unsigned int ioctl_flags = 0;
- 	uint64_t zfs_flags = ITOZ(ip)->z_pflags;
- 	int error;
-@@ -653,7 +653,7 @@ zpl_ioctl_getflags(struct file *filp, void __user *arg)
- static int
- zpl_ioctl_setflags(struct file *filp, void __user *arg)
- {
-	struct inode	*ip = filp->f_dentry->d_inode;
-+	struct inode	*ip = file_inode(filp);
- 	uint64_t	zfs_flags = ITOZ(ip)->z_pflags;
- 	unsigned int	ioctl_flags;
- 	cred_t		*cr = CRED();
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@ -5,13 +5,12 @@ callPackage ./generic.nix (args // rec {

  src = fetchgit {
    url = git://github.com/zfsonlinux/zfs.git;
-    rev = "33b4de513ee81c2a87e1b954a9544a5eec1f8f94";
-    sha256 = "07kdml65l22z1xi8jif5hr7zr7a8mykyms4f5yrf8nyad20kp6il";
+    rev = "5f15fa22167ff665d0db0159551eb90759683984";
+    sha256 = "14l1s1rfykj5dz1ssh5c8d1k98qn19l48sd31lwshiczx63zjygw";
  };

  patches = [
    ./nix-build-git.patch
-    ./3.19-compat-git.patch # Remove once PR-3084 is mainlined
  ];

  spl = spl_git;
--- a/pkgs/servers/limesurvey/default.nix
+++ b/pkgs/servers/limesurvey/default.nix
@ -0,0 +1,41 @@
+{ stdenv, lib, fetchFromGitHub, writeText, makeWrapper, php }:
+
+stdenv.mkDerivation rec {
+  name = "limesurvey-${version}";
+  version = "2.05_plus_141210";
+
+  src = fetchFromGitHub {
+    owner = "LimeSurvey";
+    repo = "LimeSurvey";
+    rev = version;
+    sha256 = "1b5yixrlrjm055ag07c7phk84mk1892v20nsss1y0xzvgn6s14gq";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phpConfig = writeText "config.php" ''
+  <?php
+    return require(getenv('LIMESURVEY_CONFIG'));
+  ?>
+  '';
+
+  patchPhase = ''
+    substituteInPlace application/core/LSYii_Application.php \
+      --replace "'basePath" "//'basePath"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/limesurvey}
+    cp -R . $out/share/limesurvey
+    cp ${phpConfig} $out/share/limesurvey/application/config/config.php
+    makeWrapper ${php}/bin/php $out/bin/limesurvey-console \
+      --add-flags "$out/share/limesurvey/application/commands/console.php"
+  '';
+
+  meta = with lib; {
+    description = "Open source survey application";
+    license = licenses.gpl2;
+    homepage = https://www.limesurvey.org;
+    maintainers = with maintainers; [offline];
+  };
+}
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@ -1,17 +1,17 @@
-{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }:
+{ stdenv, fetchurl, libasr, libevent, zlib, openssl, db, bison, pam }:

 stdenv.mkDerivation rec {
  name = "opensmtpd-${version}";
-  version = "5.4.2p1";
+  version = "5.4.4p1";

-  buildInputs = [ libevent zlib openssl db bison pam ];
+  buildInputs = [ libasr libevent zlib openssl db bison pam ];

  src = fetchurl {
    url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg";
-  };  
+    sha256 = "1gcfdmpkk892wnnhwc2nb559bwl3k892w7saj4q8m6jfll53660i";
+  };

-  configureFlags = [ 
+  configureFlags = [
    "--with-mantype=doc"
    "--with-pam"
    "--without-bsd-auth"
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    "--with-privsep-user=smtpd"
    "--with-queue-user=smtpq"
    "--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
-  ];  
+  ];

  meta = {
    homepage = https://www.opensmtpd.org/;
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ b/pkgs/servers/nosql/redis/3.0.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.0-rc3";
+  name = "redis-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
+    sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://redis.io;
+    description = "An open source, advanced key-value store";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.berdario ];
+  };
+}
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  version = "5.5.40";

  src = fetchurl {
-    url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
+    url = "http://cdn.mysql.com/archives/mysql-5.5/${name}.tar.gz";
    sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd";
  };

--- a/Show more
+++ b/Show more