From 0144849f678f9ff611c2a2f1538a455bb8ebdf69 Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Tue, 14 Apr 2015 12:34:26 +0000 Subject: [PATCH 001/412] Allow allowing local access to mysql socket --- nixos/modules/services/databases/mysql.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 05b13492052..30d7a77c58b 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -77,6 +77,14 @@ in description = "Location of the file which stores the PID of the MySQL server"; }; + enableSocketAccess = mkOption { + type = types.bool; + default = true; + description = '' + Whether to grant local processes access to the mysqld socket. + ''; + }; + extraOptions = mkOption { default = ""; example = '' @@ -180,7 +188,8 @@ in chown -R ${cfg.user} ${cfg.pidDir} # Make the socket directory - mkdir -m 0700 -p /run/mysqld + mkdir -p /run/mysqld + chmod ${if cfg.enableSocketAccess then "0755" else "0700"} /run/mysqld chown -R ${cfg.user} /run/mysqld ''; From b7cb0420ca68fde36a715649b91920fb8d79c322 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:23:31 +0200 Subject: [PATCH 002/412] nixos/docker-registry: docker independant docker registry --- nixos/modules/services/misc/docker-registry.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index d25fd13a77d..f472e530a70 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -29,7 +29,7 @@ in { storagePath = mkOption { type = types.path; - default = "/var/lib/docker/registry"; + default = "/var/lib/docker-registry"; description = "Docker registry storage path."; }; @@ -61,14 +61,9 @@ in { User = "docker-registry"; Group = "docker"; PermissionsStartOnly = true; + WorkingDirectory = cfg.storagePath; }; - preStart = '' - mkdir -p ${cfg.storagePath} - if [ "$(id -u)" = 0 ]; then - chown -R docker-registry:docker ${cfg.storagePath} - fi - ''; postStart = '' until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do sleep 1; @@ -77,6 +72,10 @@ in { }; users.extraGroups.docker.gid = mkDefault config.ids.gids.docker; - users.extraUsers.docker-registry.uid = config.ids.uids.docker-registry; + users.extraUsers.docker-registry = { + createHome = true; + home = cfg.storagePath; + uid = config.ids.uids.docker-registry; + }; }; } From b7d8d5dd30a6cdcccc15707eb56d80373366ecee Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 15:13:38 +0200 Subject: [PATCH 003/412] Add graphite beacon package and module --- .../modules/services/monitoring/graphite.nix | 27 +++++++++++++++++- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index bbbbcbccb9b..2a572a6a065 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -354,6 +354,16 @@ in { type = types.lines; }; }; + + beacon = { + enable = mkEnableOption "Whether to enable graphite beacon."; + + config = mkOption { + description = "Graphite beacon configuration."; + default = {}; + type = types.attrs; + }; + }; }; ###### implementation @@ -535,10 +545,25 @@ in { environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; }) + (mkIf cfg.beacon.enable { + systemd.services.graphite-beacon = { + description = "Grpahite Beacon Alerting Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \ + --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} + ''; + User = "graphite"; + Group = "graphite"; + }; + }; + }) + (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable || - cfg.seyren.enable || cfg.pager.enable + cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { users.extraUsers = singleton { name = "graphite"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d3ba25347b..9594b171e4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4307,7 +4307,7 @@ let }; propagatedBuildInputs = with self; [ django_1_7 ]; - + # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); @@ -6956,12 +6956,12 @@ let nameparser = buildPythonPackage rec { name = "nameparser-${version}"; version = "0.3.4"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nameparser/${name}.tar.gz"; sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; }; - + meta = { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; @@ -13867,6 +13867,26 @@ let }; }; + graphite_beacon = buildPythonPackage rec { + name = "graphite_beacon-0.22.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/graphite_beacon/${name}.tar.gz"; + md5 = "3d7b2bf8a41b6c3ec5ba2c14db321096"; + }; + + propagatedBuildInputs = [ self.tornado ]; + + preBuild = "> requirements.txt"; + + meta = { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/klen/graphite-beacon; + maintainers = [ maintainers.offline ]; + license = licenses.mit; + }; + }; + graphite_influxdb = buildPythonPackage rec { name = "graphite-influxdb-0.3"; @@ -14715,7 +14735,7 @@ let licences = [ licenses.mit licenses.gpl2 ]; }; }; - + dicttoxml = buildPythonPackage rec { name = "dicttoxml-1.6.4"; From b2dc40401b06c6089f31b748aa94caed26702848 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Sun, 17 May 2015 18:06:49 +0000 Subject: [PATCH 004/412] updated digikam to version 4.10.0 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 70966196b07..47528ecad62 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "digikam-4.6.0"; + name = "digikam-4.10.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh"; + sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; From 86cfcabfbb8df17515fba2713565415a4740ce13 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Mon, 18 May 2015 09:56:06 +0000 Subject: [PATCH 005/412] digikam: enable face recognition --- pkgs/applications/graphics/digikam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 47528ecad62..f86d3056db9 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { KDEDIRS="${marble}:${qjson}"; # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; enableParallelBuilding = true; From 77c790fc0e5778a99718bd50e32cd671a154cc7f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 28 May 2015 22:03:35 +0200 Subject: [PATCH 006/412] Bump ibus, ibus-anthy, and ibus-qt to their latest versions. --- pkgs/tools/inputmethods/ibus-anthy/default.nix | 10 +++++----- pkgs/tools/inputmethods/ibus-qt/default.nix | 8 ++++---- pkgs/tools/inputmethods/ibus/default.nix | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix index df0790877ac..1b0201c4b17 100644 --- a/pkgs/tools/inputmethods/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }: -let version = "1.5.4"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; + version = "1.5.6"; meta = with stdenv.lib; { description = "IBus interface to the anthy input method"; - homepace = https://code.google.com/p/ibus/; + homepage = http://wiki.github.com/fujiwarat/ibus-anthy; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { ''; src = fetchurl { - url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz"; - sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031"; + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; + sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03"; }; } diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix index c538d36ec59..95c32532e40 100644 --- a/pkgs/tools/inputmethods/ibus-qt/default.nix +++ b/pkgs/tools/inputmethods/ibus-qt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ibus-qt-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76"; + url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz"; + sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; buildInputs = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/ibus/; + homepage = https://github.com/ibus/ibus-qt/; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 6b426169a70..97a8c3e7d1c 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.5"; + version = "1.5.10"; src = fetchurl { - url = "http://ibus.googlecode.com/files/${name}.tar.gz"; - sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; + url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; + sha256 = "152mdzi9hr246spnn7bkb4gy16x30082xwq460gmm1q2cs0bf08x"; }; configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { libnotify isocodes gobjectIntrospection ]; - preBuild = '' - patchShebangs ./scripts - substituteInPlace data/dconf/Makefile --replace "dconf update" "echo" + preConfigure = '' + substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" + sed -i "s|PYTHON2_LIBDIR=.*|PYTHON2_LIBDIR=$out/lib/${python.libPrefix}|" configure ''; preFixup = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/ibus/; + homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; platforms = stdenv.lib.platforms.linux; }; From c1f5748983ab0e71af4421030a40ac424e666b45 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 May 2015 15:10:30 +0000 Subject: [PATCH 007/412] agda: Provide a `.env` like Haskell instead of `.extras` --- pkgs/build-support/agda/default.nix | 32 ++++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 69c4897d1a4..a404bbcf634 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -22,9 +22,6 @@ in propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; - - passthru = { inherit (x) extras; }; - extras = null; }; defaults = self : { @@ -81,22 +78,19 @@ in runHook postInstall ''; - # Optionally-built conveniences - extras = { - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeScriptBin "agda" '' - ${self.agdaWithArgs} "$@" - ''; - - # Use this to stick `agdaWrapper` at the front of the PATH: - # - # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; }) - # - # Not sure this is the best way to handle conflicts.... - agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH"; - - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + passthru = { + env = stdenv.mkDerivation { + name = "interactive-${self.name}"; + inherit (self) LANG LOCALE_ARCHIVE; + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + buildInputs = let + # Makes a wrapper available to the user. Very useful in + # nix-shell where all dependencies are -i'd. + agdaWrapper = writeScriptBin "agda" '' + ${self.agdaWithArgs} "$@" + ''; + in [agdaWrapper] ++ self.buildDepends; + }; }; }; in stdenv.mkDerivation From 21b10ab44fa8f28f36990085853d9d2708d694db Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 May 2015 19:22:32 +0000 Subject: [PATCH 008/412] agda: `postprocess` and `defaults` need not be in the scope of args --- pkgs/build-support/agda/default.nix | 163 ++++++++++++++-------------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index a404bbcf634..74debe79efc 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -14,87 +14,86 @@ let concatMapStrings = stdenv.lib.strings.concatMapStrings; unwords = stdenv.lib.strings.concatStringsSep " "; mapInside = xs: unwords (map (x: x + "/*") xs); + + defaults = self : { + # There is no Hackage for Agda so we require src. + inherit (self) src name; + + isAgdaPackage = true; + + buildInputs = [ Agda ] ++ self.buildDepends; + buildDepends = []; + + buildDependsAgda = filter + (dep: dep ? isAgdaPackage && dep.isAgdaPackage) + self.buildDepends; + buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; + + # Not much choice here ;) + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + + everythingFile = "Everything.agda"; + + propagatedBuildInputs = self.buildDependsAgda; + propagatedUserEnvPkgs = self.buildDependsAgda; + + # Immediate source directories under which modules can be found. + sourceDirectories = [ ]; + + # This is used if we have a top-level element that only serves + # as the container for the source and we only care about its + # contents. The directories put here will have their + # *contents* copied over as opposed to sourceDirectories which + # would make a direct copy of the whole thing. + topSourceDirectories = [ "src" ]; + + # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" + includeDirs = self.buildDependsAgdaShareAgda + ++ self.sourceDirectories ++ self.topSourceDirectories + ++ [ "." ]; + buildFlags = unwords (map (x: "-i " + x) self.includeDirs); + + agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; + + buildPhase = '' + runHook preBuild + ${self.agdaWithArgs} ${self.everythingFile} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/agda + cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda + runHook postInstall + ''; + + passthru = { + env = stdenv.mkDerivation { + name = "interactive-${self.name}"; + inherit (self) LANG LOCALE_ARCHIVE; + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + buildInputs = let + # Makes a wrapper available to the user. Very useful in + # nix-shell where all dependencies are -i'd. + agdaWrapper = writeScriptBin "agda" '' + ${self.agdaWithArgs} "$@" + ''; + in [agdaWrapper] ++ self.buildDepends; + }; + }; + }; + + postprocess = x: x // { + sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; + propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; + propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; + everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; + }; in -{ mkDerivation = args: - let - postprocess = x: x // { - sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; - propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; - propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; - }; - - defaults = self : { - # There is no Hackage for Agda so we require src. - inherit (self) src name; - - isAgdaPackage = true; - - buildInputs = [ Agda ] ++ self.buildDepends; - buildDepends = []; - - buildDependsAgda = filter - (dep: dep ? isAgdaPackage && dep.isAgdaPackage) - self.buildDepends; - buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; - - # Not much choice here ;) - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; - - everythingFile = "Everything.agda"; - - propagatedBuildInputs = self.buildDependsAgda; - propagatedUserEnvPkgs = self.buildDependsAgda; - - # Immediate source directories under which modules can be found. - sourceDirectories = [ ]; - - # This is used if we have a top-level element that only serves - # as the container for the source and we only care about its - # contents. The directories put here will have their - # *contents* copied over as opposed to sourceDirectories which - # would make a direct copy of the whole thing. - topSourceDirectories = [ "src" ]; - - # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = self.buildDependsAgdaShareAgda - ++ self.sourceDirectories ++ self.topSourceDirectories - ++ [ "." ]; - buildFlags = unwords (map (x: "-i " + x) self.includeDirs); - - agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; - - buildPhase = '' - runHook preBuild - ${self.agdaWithArgs} ${self.everythingFile} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/agda - cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda - runHook postInstall - ''; - - passthru = { - env = stdenv.mkDerivation { - name = "interactive-${self.name}"; - inherit (self) LANG LOCALE_ARCHIVE; - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - buildInputs = let - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeScriptBin "agda" '' - ${self.agdaWithArgs} "$@" - ''; - in [agdaWrapper] ++ self.buildDepends; - }; - }; - }; - in stdenv.mkDerivation - (postprocess (let super = defaults self // args self; - self = super // extension self super; - in self)); +{ mkDerivation = args: let + super = defaults self // args self; + self = super // extension self super; + in stdenv.mkDerivation (postprocess self); } From 9b31a07b0de58b5996ecc6b953350af3838d1706 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 May 2015 19:30:24 +0000 Subject: [PATCH 009/412] agda: Just `with` all of the string helper functions --- pkgs/build-support/agda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 74debe79efc..0bdc049934a 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -7,12 +7,12 @@ , extension ? (self: super: {}) }: +with stdenv.lib.strings; + let optionalString = stdenv.lib.optionalString; filter = stdenv.lib.filter; - concatMapStringsSep = stdenv.lib.strings.concatMapStringsSep; - concatMapStrings = stdenv.lib.strings.concatMapStrings; - unwords = stdenv.lib.strings.concatStringsSep " "; + unwords = concatStringsSep " "; mapInside = xs: unwords (map (x: x + "/*") xs); defaults = self : { From be2cba690ce6614768cae065d37ffffb9d4181d7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 May 2015 19:33:20 +0000 Subject: [PATCH 010/412] agda: Remove unused/uneeded abstractions, including `postprocess` --- pkgs/build-support/agda/default.nix | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 0bdc049934a..8a871cfeb51 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -10,11 +10,6 @@ with stdenv.lib.strings; let - optionalString = stdenv.lib.optionalString; - filter = stdenv.lib.filter; - unwords = concatStringsSep " "; - mapInside = xs: unwords (map (x: x + "/*") xs); - defaults = self : { # There is no Hackage for Agda so we require src. inherit (self) src name; @@ -24,14 +19,16 @@ let buildInputs = [ Agda ] ++ self.buildDepends; buildDepends = []; - buildDependsAgda = filter + buildDependsAgda = stdenv.lib.filter (dep: dep ? isAgdaPackage && dep.isAgdaPackage) self.buildDepends; buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; # Not much choice here ;) LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = stdenv.lib.optionalString + stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; everythingFile = "Everything.agda"; @@ -52,7 +49,7 @@ let includeDirs = self.buildDependsAgdaShareAgda ++ self.sourceDirectories ++ self.topSourceDirectories ++ [ "." ]; - buildFlags = unwords (map (x: "-i " + x) self.includeDirs); + buildFlags = concatStringsSep " " (map (x: "-i " + x) self.includeDirs); agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; @@ -62,10 +59,13 @@ let runHook postBuild ''; - installPhase = '' + installPhase = let + srcFiles = self.sourceDirectories + ++ map (x: x + "/*") self.topSourceDirectories; + in '' runHook preInstall mkdir -p $out/share/agda - cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda + cp -pR ${concatStringsSep " " srcFiles} $out/share/agda runHook postInstall ''; @@ -84,16 +84,9 @@ let }; }; }; - - postprocess = x: x // { - sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; - propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; - propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; - }; in { mkDerivation = args: let super = defaults self // args self; self = super // extension self super; - in stdenv.mkDerivation (postprocess self); + in stdenv.mkDerivation self; } From 0eca39174b8b52e87ec25a2e55425cdb055b0948 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2015 22:17:03 +0200 Subject: [PATCH 011/412] init CharacterCompressor CompBus RhythmDelay constant-detune-chorus Basically the same pkg,but with different sources --- .../audio/CharacterCompressor/default.nix | 33 ++++++++++++++++ pkgs/applications/audio/CompBus/default.nix | 39 +++++++++++++++++++ .../audio/RhythmDelay/default.nix | 33 ++++++++++++++++ .../audio/constant-detune-chorus/default.nix | 33 ++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++ 5 files changed, 146 insertions(+) create mode 100644 pkgs/applications/audio/CharacterCompressor/default.nix create mode 100644 pkgs/applications/audio/CompBus/default.nix create mode 100644 pkgs/applications/audio/RhythmDelay/default.nix create mode 100644 pkgs/applications/audio/constant-detune-chorus/default.nix diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/CharacterCompressor/default.nix new file mode 100644 index 00000000000..3501e04aa97 --- /dev/null +++ b/pkgs/applications/audio/CharacterCompressor/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "CharacterCompressor-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "CharacterCompressor"; + rev = "v${version}"; + sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 CharacterCompressor.dsp + faust2lv2 -t 99999 CharacterCompressor.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp CharacterCompressor $out/bin/ + mkdir -p $out/lib/lv2 + cp -r CharacterCompressor.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A compressor with character. For jack and lv2"; + homepage = https://github.com/magnetophon/CharacterCompressor; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/CompBus/default.nix new file mode 100644 index 00000000000..497d1ef5243 --- /dev/null +++ b/pkgs/applications/audio/CompBus/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "CompBus-${version}"; + version = "1.1.02"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "CompBus"; + rev = "v${version}"; + sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + for f in *.dsp; + do + faust2jack -t 99999 $f + faust2lv2 -t 99999 $f + done + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 + mv *.lv2/ $out/lib/lv2 + mkdir -p $out/bin + for f in $(find . -executable -type f); + do + cp $f $out/bin/ + done + ''; + + meta = { + description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2"; + homepage = https://github.com/magnetophon/CompBus; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/RhythmDelay/default.nix new file mode 100644 index 00000000000..e0cfff7c906 --- /dev/null +++ b/pkgs/applications/audio/RhythmDelay/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "RhythmDelay-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "RhythmDelay"; + rev = "v${version}"; + sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 RhythmDelay.dsp + faust2lv2 -t 99999 RhythmDelay.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp RhythmDelay $out/bin/ + mkdir -p $out/lib/lv2 + cp -r RhythmDelay.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Tap a rhythm into your delay! For jack and lv2"; + homepage = https://github.com/magnetophon/RhythmDelay; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/constant-detune-chorus/default.nix new file mode 100644 index 00000000000..54fe4c866d5 --- /dev/null +++ b/pkgs/applications/audio/constant-detune-chorus/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "constant-detune-chorus-${version}"; + version = "0.1.01"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "constant-detune-chorus"; + rev = "v${version}"; + sha256 = "1z8aj1a36ix9jizk9wl06b3i98hrkg47qxqp8vx930r624pc5z86"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 constant-detune-chorus.dsp + faust2lv2 -t 99999 constant-detune-chorus.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp constant-detune-chorus $out/bin/ + mkdir -p $out/lib/lv2 + cp -r constant-detune-chorus.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2"; + homepage = https://github.com/magnetophon/constant-detune-chorus; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915a07ffca5..4b58f90fcd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10614,6 +10614,8 @@ let amdappsdk = amdappsdk28; }; + CharacterCompressor = callPackage ../applications/audio/CharacterCompressor { }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chromium = callPackage ../applications/networking/browsers/chromium { @@ -10649,10 +10651,14 @@ let cmus = callPackage ../applications/audio/cmus { }; + CompBus = callPackage ../applications/audio/CompBus { }; + compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; }; + constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; + coriander = callPackage ../applications/video/coriander { inherit (gnome) libgnomeui GConf; }; @@ -12216,6 +12222,8 @@ let qt = qt4; }); + RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; + rofi = callPackage ../applications/misc/rofi { automake = automake114x; }; From b4a99530d1d9028f7b174bea3570885730dfd0ff Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:39:02 -0400 Subject: [PATCH 012/412] cookies: add python package --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab452a562d9..db4c2e70c92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2008,6 +2008,23 @@ let }; }; + cookies = buildPythonPackage rec { + name = "cookies-2.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz"; + sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + }; + + doCheck = false; + + meta = { + description = "Friendlier RFC 6265-compliant cookie parser/renderer"; + homepage = https://github.com/sashahart/cookies; + license = licenses.mit; + }; + }; + coverage = buildPythonPackage rec { name = "coverage-3.7.1"; From f70582e3341d84d3715d09d6d1a277be7d652c1c Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:42:53 -0400 Subject: [PATCH 013/412] responses: 0.2.2 -> 0.4.0 --- pkgs/top-level/python-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4c2e70c92..8805c49ead3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1057,17 +1057,17 @@ let }; responses = self.buildPythonPackage rec { - name = "responses-0.2.2"; - - propagatedBuildInputs = with self; [ requests mock six pytest flake8 ]; - - doCheck = false; + name = "responses-0.4.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; - md5 = "5d79fd425cf8d858dfc8afa6475395d3"; + url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz"; + sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; }; + propagatedBuildInputs = with self; [ cookies mock requests2 six ]; + + doCheck = false; + }; rarfile = self.buildPythonPackage rec { From cdf49bb47af6809ed3c51fa991c63233a0a602f5 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:47:31 -0400 Subject: [PATCH 014/412] requests2: 2.6.0 -> 2.7.0 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8805c49ead3..3327ed44a9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10584,16 +10584,17 @@ let requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw"; + sha256 = "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"; }; meta = { description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; + license = licenses.asl20; }; }; From dd6946dcbba7e5501c2d7ac4f89641520c137d1e Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 23:51:04 -0400 Subject: [PATCH 015/412] beets: 1.3.11 -> 1.3.13 --- pkgs/tools/audio/beets/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index dc859b49736..0af0b427bf2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonPackage, pythonPackages, python +, buildPythonPackage, pythonPackages, python, imagemagick , enableAcoustid ? true , enableDiscogs ? true @@ -45,8 +45,9 @@ let "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" - "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random" - "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" + "mbcollection" "mbsync" "metasync" "missing" "permissions" "play" + "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" + "types" "zero" ]; enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); @@ -59,18 +60,19 @@ let in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.11"; + version = "1.3.13"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m"; + sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl"; }; propagatedBuildInputs = [ pythonPackages.enum34 + pythonPackages.jellyfish pythonPackages.munkres pythonPackages.musicbrainzngs pythonPackages.mutagen @@ -91,13 +93,10 @@ in buildPythonPackage rec { buildInputs = with pythonPackages; [ beautifulsoup4 - flask + imagemagick mock nose - pyechonest - pylast rarfile - requests2 responses ]; @@ -165,9 +164,9 @@ in buildPythonPackage rec { ''; meta = { - homepage = http://beets.radbox.org; description = "Music tagger and library organizer"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ]; + homepage = http://beets.radbox.org; + license = licenses.mit; + maintainers = with maintainers; [ aszlig iElectric pjones ]; }; } From d866d4616dc41dac93f3c6c90383c205dae7e10a Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 1 Jun 2015 06:56:42 -0400 Subject: [PATCH 016/412] musescore: 2.0.0 -> 2.0.1 --- pkgs/applications/audio/musescore/default.nix | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9dbebe31a38..bfbfa577531 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,27 +1,47 @@ -{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2 -, lame, libsndfile, libvorbis }: +{ stdenv, fetchurl, cmake, pkgconfig +, alsaLib, freetype, jack2, lame, libogg, libpulseaudio, libsndfile, libvorbis +, portaudio, qt5 #, tesseract +}: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w"; + sha256 = "0n4xk35jggdq2dcizqjq1kdpclih4scpl93ymmxahvfa1vvwn5iw"; }; - buildInputs = [ - makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis + makeFlags = [ + "PREFIX=$(out)" ]; - patchPhase = '' - sed s,"/usr/local",$out, -i Makefile + cmakeFlags = [ + "-DAEOLUS=OFF" + "-DZERBERUS=ON" + "-DOSC=ON=ON" + "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error + "-DOCR=OFF" # Not necessary without OMR + "-DSOUNDFONT3=ON" + "-DHAS_AUDIOFILE=ON" + "-DBUILD_JACK=ON" + ]; + + preBuild = '' + make lupdate + make lrelease ''; - preBuild = "make lrelease"; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + alsaLib jack2 freetype lame libogg libpulseaudio libsndfile libvorbis + portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools + qt5.webkit qt5.xmlpatterns #tesseract + ]; meta = with stdenv.lib; { - description = "Qt-based score editor"; + description = "Music notation and composition software"; homepage = http://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; From 1847e204e0236e09f9936103c3145ff1b7f4d496 Mon Sep 17 00:00:00 2001 From: Richard Zetterberg Date: Sun, 31 May 2015 21:18:17 +0200 Subject: [PATCH 017/412] Adds antimony 0.8.0b CAD program --- .../graphics/antimony/default.nix | 41 ++++++++ .../graphics/antimony/paths-fix.patch | 99 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 142 insertions(+) create mode 100644 pkgs/applications/graphics/antimony/default.nix create mode 100644 pkgs/applications/graphics/antimony/paths-fix.patch diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix new file mode 100644 index 00000000000..589d20cb126 --- /dev/null +++ b/pkgs/applications/graphics/antimony/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchgit, libpng, python3, boost, mesa, qt5, ncurses }: + +let + gitRev = "745eca3a2d2657c495d5509e9083c884e021d09c"; + gitBranch = "master"; + gitTag = "0.8.0b"; +in + stdenv.mkDerivation rec { + name = "antimony-${version}"; + version = gitTag; + + src = fetchgit { + url = "git://github.com/mkeeter/antimony.git"; + rev = gitRev; + sha256 = "19ir3y5ipmfyygcn8mbxika4j3af6dfrv54dvhn6maz7dy8h30f4"; + }; + + patches = [ ./paths-fix.patch ]; + + buildInputs = [ + libpng python3 (boost.override { python = python3; }) + mesa qt5.base ncurses + ]; + + configurePhase = '' + export GITREV=${gitRev} + export GITBRANCH=${gitBranch} + export GITTAG=${gitTag} + + cd qt + export sourceRoot=$sourceRoot/qt + qmake antimony.pro PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "A computer-aided design (CAD) tool from a parallel universe"; + homepage = "https://github.com/mkeeter/antimony"; + license = licenses.mit; + platforms = platforms.linux; + }; + } diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/pkgs/applications/graphics/antimony/paths-fix.patch new file mode 100644 index 00000000000..de8d9e7beb0 --- /dev/null +++ b/pkgs/applications/graphics/antimony/paths-fix.patch @@ -0,0 +1,99 @@ +diff --git a/qt/antimony.pro b/qt/antimony.pro +index 9d586f4..b055a6d 100644 +--- a/qt/antimony.pro ++++ b/qt/antimony.pro +@@ -12,14 +12,9 @@ QMAKE_CXXFLAGS_RELEASE += -O3 + + QMAKE_CXXFLAGS += -Werror=switch + +-GITREV = $$system(git log --pretty=format:'%h' -n 1) +-GITDIFF = $$system(git diff --quiet --exit-code || echo "+") +-GITTAG = $$system(git describe --exact-match --tags 2> /dev/null) +-GITBRANCH = $$system(git rev-parse --abbrev-ref HEAD) +- +-QMAKE_CXXFLAGS += "-D'GITREV=\"$${GITREV}$${GITDIFF}\"'" +-QMAKE_CXXFLAGS += "-D'GITTAG=\"$${GITTAG}\"'" +-QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$${GITBRANCH}\"'" ++QMAKE_CXXFLAGS += "-D'GITREV=\"$$(GITREV)\"'" ++QMAKE_CXXFLAGS += "-D'GITTAG=\"$$(GITTAG)\"'" ++QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$$(GITBRANCH)\"'" + + OLD_GL_SET = $$(OLD_GL) + equals(OLD_GL_SET, "true") { +@@ -125,11 +120,11 @@ macx { + } + + linux { +- executable.path = /usr/local/bin ++ executable.path = $$(out)/bin + executable.files = antimony +- nodes_folder.path = /usr/local/bin/sb/nodes ++ nodes_folder.path = $$(out)/bin/sb/nodes + nodes_folder.files = ../py/nodes/* +- fab_folder.path = /usr/local/bin/sb/fab ++ fab_folder.path = $$(out)/bin/sb/fab + fab_folder.files = ../py/fab/* + INSTALLS += executable nodes_folder fab_folder + } +diff --git a/qt/fab.pri b/qt/fab.pri +index a54813b..b500536 100644 +--- a/qt/fab.pri ++++ b/qt/fab.pri +@@ -54,7 +54,7 @@ DEFINES += '_STATIC_= ' + + linux { + QMAKE_CFLAGS += -std=gnu99 +- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) ++ QMAKE_CXXFLAGS += $$system(python3-config --includes) + LIBS += -lpng + } + +diff --git a/qt/shared.pri b/qt/shared.pri +index e7d0e3a..026eae3 100644 +--- a/qt/shared.pri ++++ b/qt/shared.pri +@@ -39,41 +39,11 @@ macx { + } + + linux { +- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) +- QMAKE_LFLAGS += $$system(/usr/bin/python3-config --ldflags) ++ QMAKE_CXXFLAGS += $$system(python3-config --includes) ++ QMAKE_LFLAGS += $$system(python3-config --ldflags) + + # Even though this is in QMAKE_LFLAGS, the linker is picky about + # library ordering (so it needs to be here too). + LIBS += -lpython3.4m +- +- # ldconfig is being used to find libboost_python, but it's in a different +- # place in different distros (and is not in the default $PATH on Debian). +- # First, check to see if it's on the default $PATH. +- system(which ldconfig > /dev/null) { +- LDCONFIG_BIN = "ldconfig" +- } +- # If that failed, then search for it in its usual places. +- isEmpty(LDCONFIG_BIN) { +- for(p, $$list(/sbin/ldconfig /usr/bin/ldconfig)) { +- exists($$p): LDCONFIG_BIN = $$p +- } +- } +- # If that search failed too, then exit with an error. +- isEmpty(LDCONFIG_BIN) { +- error("Could not find ldconfig!") +- } +- +- # Check for different boost::python naming schemes +- LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python) +- for (b, $$list(boost_python-py34 boost_python3)) { +- contains(LDCONFIG_OUT, "lib$${b}.so") { +- LIBS += "-l$$b" +- GOT_BOOST_PYTHON = True +- } +- } +- +- # If we couldn't find boost::python, exit with an error. +- isEmpty(GOT_BOOST_PYTHON) { +- error("Could not find boost::python3") +- } ++ LIBS += -lboost_python3 + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78be647f15a..1eebdf8492d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10451,6 +10451,8 @@ let amsn = callPackage ../applications/networking/instant-messengers/amsn { }; + antimony = callPackage ../applications/graphics/antimony {}; + antiword = callPackage ../applications/office/antiword {}; ardour = ardour4; From 6214a521c91f697c7ed314d7c8e4a1d63381f108 Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Wed, 3 Jun 2015 19:33:59 -0700 Subject: [PATCH 018/412] Fix firefox-bin icon path --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 23726f5c3d1..a71b158b74a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation { [Desktop Entry] Type=Application Exec=$out/bin/firefox - Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png + Icon=$out/usr/lib/firefox-bin-${version}/browser/icons/mozicon128.png Name=Firefox GenericName=Web Browser Categories=Application;Network; From 9c2f2bc89334a0c824d83c0d50072580f77b365c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 3 Jun 2015 23:43:17 +0300 Subject: [PATCH 019/412] kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS systems to start in non-text mode as well. Enable FB_VESA to get a framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y' instead of the default 'm' to so the user doesn't need to manually load the fbcon module anymore. Other distros have similar defaults, at least on Arch: CONFIG_FB_VESA=y CONFIG_FRAMEBUFFER_CONSOLE=y and on Ubuntu (12.04): CONFIG_FB_VESA=m CONFIG_FRAMEBUFFER_CONSOLE=y Fixes #8139 --- nixos/doc/manual/installation/installing-uefi.xml | 4 ---- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index dbd5606c4a5..90d18695447 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -41,10 +41,6 @@ changes: and as well. - - To see console messages during early boot, add "fbcon" - to your . - diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 446d79ce220..a660199cbe0 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -42,9 +42,6 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Get a console as soon as the initrd loads fbcon on EFI boot. - boot.initrd.kernelModules = [ "fbcon" ]; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 25b707614ed..cfe77792f85 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -131,6 +131,8 @@ with stdenv.lib; FB_SIS_300 y FB_SIS_315 y FB_3DFX_ACCEL y + FB_VESA y + FRAMEBUFFER_CONSOLE y ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' FB_GEODE y ''} From 6be70d17c0f43368b008f54e3c3f2aa093249e63 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 4 Jun 2015 11:15:31 +0300 Subject: [PATCH 020/412] kernel-config: Enable IKCONFIG so ARM gets /proc/config.gz IKCONFIG must be enabled so IKCONFIG_PROC can be set. On x86 IKCONFIG gets implicitly enabled by kernelAutoModules in platforms.nix. But ARM doesn't use kernelAutoModules, so IKCONFIG_PROC won't get enabled without this patch. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cfe77792f85..a972c4e60f8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -54,6 +54,7 @@ with stdenv.lib; STANDALONE n # Make /proc/config.gz available. + IKCONFIG y IKCONFIG_PROC y # Optimize with -O2, not -Os. From 3afae4037b7deac7af54f45dc4b2e027c4335e48 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 4 Jun 2015 17:31:30 +0200 Subject: [PATCH 021/412] zfs: Fix systemd warning The `zfs-share` service was trying to execute the `rm` binary, but it was providing an invalid `/bin` path. This should fix #8171. --- pkgs/os-specific/linux/zfs/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b040201cf33..1613dcb311a 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils , configFile ? "all" # Userspace dependencies @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " ./autogen.sh ''; From 80e98ba00a308c5f5d0e212c07b82e889264f3d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 10:38:18 +0200 Subject: [PATCH 022/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/25f7b30351dfe1a8403f70bb5b9d1abebd6ac2fc with hackage2nix revision d8b7e62373ad16bdc2a5a93d0870bc05b814ac39 --- .../haskell-modules/hackage-packages.nix | 1028 ++++++++++++----- 1 file changed, 723 insertions(+), 305 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 934fc10fc06..e049946d44a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8,8 +8,8 @@ self: { ({ mkDerivation, base, GLUT, OpenGL, random }: mkDerivation { pname = "3d-graphics-examples"; - version = "0.0.0.0"; - sha256 = "1v2zv94npviggqfqabfzp7ab54nnw9wdb60y20f1lzw13an0a14q"; + version = "0.0.0.1"; + sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGL random ]; @@ -3202,8 +3202,8 @@ self: { }: mkDerivation { pname = "DSH"; - version = "0.12.0.0"; - sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv"; + version = "0.12.0.1"; + sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -3958,12 +3958,17 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, containers, ListLike }: + ({ mkDerivation, base, containers, ListLike, tasty, tasty-hunit + , tasty-quickcheck, unordered-containers + }: mkDerivation { pname = "Earley"; - version = "0.8.0"; - sha256 = "0vg672jfj9a814pcbx19hkb2nsy0zndm1a98z5ygssy7m098cvgh"; - buildDepends = [ base containers ListLike ]; + version = "0.8.1"; + sha256 = "0bzm6pwim3fv0d1fv6k3078661vlpc0pcrds4ywsqvgc4hd91myk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers ListLike unordered-containers ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6755,8 +6760,8 @@ self: { ({ mkDerivation, base, hashable, mtl, unordered-containers }: mkDerivation { pname = "HMap"; - version = "1.2.3"; - sha256 = "0gxs0l5v2kzgy8lfyz0l3ivv1w6cb8sm30h6yv91np1nvj231nf3"; + version = "1.2.4"; + sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13"; buildDepends = [ base hashable mtl unordered-containers ]; homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; @@ -10078,6 +10083,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MissingK" = callPackage + ({ mkDerivation, base, glib, template-haskell }: + mkDerivation { + pname = "MissingK"; + version = "0.0.0.2"; + sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03"; + buildDepends = [ base glib template-haskell ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Useful types and definitions missing from other libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "MissingM" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers @@ -17051,6 +17068,7 @@ self: { transformers ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -18536,14 +18554,15 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.4"; - sha256 = "19fzhsrlsqrncngcmdl8wr0rbv8ff0k8y91dn6j1hacz0dv1whhk"; + version = "0.3.5"; + sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers transformers-base transformers-compat ]; + jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -18553,8 +18572,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.4"; - sha256 = "0kndkj4x7wmmxpsr3a42ck2zq7amm33axxlhwzlgi1gnv8v2v4y4"; + version = "0.3.5"; + sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -18565,8 +18584,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.4"; - sha256 = "0nhy1qn8abhnmr85n1ddshwjwns0gc0l1syznfg6g6cmazwq7809"; + version = "0.3.5"; + sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -18577,8 +18596,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.4"; - sha256 = "1yp59hdxnnvjsdpaw4c311p30bg9xyj231hn2r1zis3awck8jlkk"; + version = "0.3.5"; + sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -18589,8 +18608,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.4"; - sha256 = "1f26vpfxqkkm1yli42xhbhhzya07gvg9kjhq5p51p32500aax4my"; + version = "0.3.5"; + sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -18601,8 +18620,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.4"; - sha256 = "0lp09i3h527g8l7xcxqk6n1pjlbdhxncpgdsrd8bv91an39cnj12"; + version = "0.3.5"; + sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -18613,8 +18632,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.4"; - sha256 = "06sb1zmgvsbshndix9gdx8vq4378p8sgwnnkwhzm1sr92yzfv4is"; + version = "0.3.5"; + sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -18625,8 +18644,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.4"; - sha256 = "125vn9vk4mk61r4r5c3parhrqdxkmlvqprly1x0chd044nx5ai80"; + version = "0.3.5"; + sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -18637,8 +18656,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.4"; - sha256 = "1lsdy65cg3wrhpzsaiir0mq510dilia1m0lqwg1fnrcl62xlcsd9"; + version = "0.3.5"; + sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -18649,8 +18668,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.4"; - sha256 = "1wxrxak7l8drba6hckhx0idqj26fbppnxw5hj4cnmjrg4pvjpnmn"; + version = "0.3.5"; + sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -18661,8 +18680,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.4"; - sha256 = "1sws6d2a21r7wwd2dyf4k7g2n2f0r5azydj7pg6g5a2sjfazimi0"; + version = "0.3.5"; + sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -18673,8 +18692,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.4"; - sha256 = "0vp1r171myahkx8n5mndjabggy219mzbzxyfz93mwpnyf1z7cdvm"; + version = "0.3.5"; + sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -18685,8 +18704,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.4"; - sha256 = "04mc8cjn1hdprki0hvbbyb7gzsdxdr7lci41vnmhw6ic3gcy2mhv"; + version = "0.3.5"; + sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -18697,8 +18716,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.4"; - sha256 = "1qxkzqvfid2g7hcc427zhy8llfa25wpimi7cfdzl9dqmmkqlxinm"; + version = "0.3.5"; + sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -18716,8 +18735,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.4"; - sha256 = "0sih0wvncrz6v4xcn34ckhxc7b15bx87qbr7icwk1w6zs08809jz"; + version = "0.3.5"; + sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -18738,8 +18757,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.4"; - sha256 = "0f7y3wb9ijd8hjxbzav63zdwrjhzh000xqc4n2cnx0lrcrssvs2i"; + version = "0.3.5"; + sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18750,8 +18769,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.4"; - sha256 = "1y6nyjf8m2py5wnk3cbypi0ckqv7nyr2la3h8nm1wj8njwh359jn"; + version = "0.3.5"; + sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18762,8 +18781,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.4"; - sha256 = "160nk75112sdnf834gpc0y1fzsbb0lrp98g9zim38rd4v7pz2ax9"; + version = "0.3.5"; + sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18774,8 +18793,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.4"; - sha256 = "0chfyyryyk8vd1783021awvwwla5fdm04x3w500157xvazhk286m"; + version = "0.3.5"; + sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18786,8 +18805,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.4"; - sha256 = "1pv79b0865gqpf89abjjk4y24d6nr2lk45xpn0n7ckri0b54dga4"; + version = "0.3.5"; + sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18798,8 +18817,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.4"; - sha256 = "01mg116sqxa4z7ss0fwzvsgkmxrqs52ac9z6mrsfymjspyd9fbli"; + version = "0.3.5"; + sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18810,8 +18829,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.4"; - sha256 = "13lzdnwg9x2jrhk251b0vrg4y2avg77ppq4wdgjzmbb2myp618ll"; + version = "0.3.5"; + sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18822,8 +18841,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.4"; - sha256 = "1wi1h07pp8n45ynn9lqvjfz265k0bp7qqxk5qmqlg93yajgjfkcl"; + version = "0.3.5"; + sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18834,8 +18853,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.4"; - sha256 = "11ky0g8cgnd6lcjdc6a9087ka5f6hc3x08xnvjjfwipmdhps4k9r"; + version = "0.3.5"; + sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18846,8 +18865,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.4"; - sha256 = "1dq1xs7simxcag3c2bcr22k1595avl69jz6zv3nrsn1rvzj9milv"; + version = "0.3.5"; + sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18858,8 +18877,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.4"; - sha256 = "1dd635s0i9imj62dg9rqvfrx2aqw6593z61ckqixlb247jii82i6"; + version = "0.3.5"; + sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18870,8 +18889,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.4"; - sha256 = "1snh7xs2f2mjr3ln24xj73y5idmb45in1ykaz3v5wbqdb19m4w94"; + version = "0.3.5"; + sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18882,8 +18901,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.4"; - sha256 = "15xgfxlrjhn8inl5a0rfsyyy8sp0rinlwll9snpdl7nrnqvmn00s"; + version = "0.3.5"; + sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18894,8 +18913,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.4"; - sha256 = "0fag3xr9w2gi038hh9kiqmqgbsn53x48h9jwj49cr1r9qrrs86wa"; + version = "0.3.5"; + sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18906,8 +18925,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.4"; - sha256 = "0ds97lk5ifc529199lmvijs5gif4bzh8lwczpz1xspin37bjiz62"; + version = "0.3.5"; + sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18918,8 +18937,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.4"; - sha256 = "1njdwml6mp8phd323cgyfw7v2iv8l4k7r6pi4vq4mygpa2gx0dn1"; + version = "0.3.5"; + sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18930,8 +18949,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ml"; - version = "0.3.4"; - sha256 = "1sv6a74gk30rhsh98j2f6xsad6hfcr3cjyi8ahz1qjh4nqjrrssc"; + version = "0.3.5"; + sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; @@ -18942,8 +18961,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.4"; - sha256 = "07l7a4v7s380vj8348bgv1m1hk1ldc41aphl67f17v2cndys3ml0"; + version = "0.3.5"; + sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18954,8 +18973,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.4"; - sha256 = "1ji80nn9k10l9w5k5dqwhc0i2aaxa4l6bl995im5lrihilmazqgw"; + version = "0.3.5"; + sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18966,8 +18985,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.4"; - sha256 = "18sd3abhpifwb4ylz35bnxzappgslpvzkrv9wh3hxqzs4mvxdj1n"; + version = "0.3.5"; + sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18978,8 +18997,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.4"; - sha256 = "05a77qcjlkjk0mv2ry25dlci43h5b9hh50f32ngqccjqmg4128ky"; + version = "0.3.5"; + sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18990,8 +19009,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.4"; - sha256 = "15qvmw6fgfcqgkqafywpai5i1in9iibl1r8m8pfxfdckmrbzaxz2"; + version = "0.3.5"; + sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -19002,8 +19021,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.4"; - sha256 = "0miyf7nnkxwybps3yg5fyqpxq5hkz4kllks5w4r7c62hd7sjq9dn"; + version = "0.3.5"; + sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -19014,8 +19033,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.4"; - sha256 = "0jsg4g911qm3r8saxwax4rhdmg1kgfmagnnyzjv4rb02jkdfr7i1"; + version = "0.3.5"; + sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -19026,8 +19045,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.4"; - sha256 = "0s0aa3fryvqwmp0zzmlzd0mk591i1c63qds0si3svf85zgl3slr4"; + version = "0.3.5"; + sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -19038,8 +19057,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.4"; - sha256 = "1plrzqlvfn2aa0c4l2dh4nlygnv0biykz414yblcrj53w03yhqs2"; + version = "0.3.5"; + sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -19050,8 +19069,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.4"; - sha256 = "0bc0n71vhmcirij5agxy7h0zvqvm4psw5h3kzrnbib9wa2hkq8m4"; + version = "0.3.5"; + sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -19062,8 +19081,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.4"; - sha256 = "03p76rska5gl2ic7vjyhhdb89ikl17n8xkiwcb4184jzsvnscqzi"; + version = "0.3.5"; + sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -19074,8 +19093,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.4"; - sha256 = "016wi9cq86z0giv68kzfdg2ia0m4kvlcsl6dj9d3cnvbcsg7s6xy"; + version = "0.3.5"; + sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -19086,8 +19105,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.4"; - sha256 = "1fmjsvcxjrls98jd3vcldjy9wvsdkyi614rzs1d5bi11b6db202z"; + version = "0.3.5"; + sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -19098,8 +19117,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.4"; - sha256 = "1kzy3nbc17dbbhi2k60da7rl6k2zbahzd9rjshvmn1fdsb61piq5"; + version = "0.3.5"; + sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -19110,8 +19129,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.4"; - sha256 = "1w7ac4d7gj53hjvlk0sldww67gkgsbi8vmqhbcbqrbg2mrqr6l9d"; + version = "0.3.5"; + sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -19122,8 +19141,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-workspaces"; - version = "0.3.4"; - sha256 = "00gdahix24cm3qan11a9n2l1n9x0cnnxgid2gf4zhjqmvc3342sa"; + version = "0.3.5"; + sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; @@ -21324,11 +21343,11 @@ self: { ({ mkDerivation, base, bimap, containers, mtl, process, syb }: mkDerivation { pname = "atom"; - version = "1.0.12"; - sha256 = "0mavmgaw9wb7sjrmr49h2xw4xvzywgbflvvxym0l9wc91dd3zhrp"; + version = "1.0.13"; + sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807"; buildDepends = [ base bimap containers mtl process syb ]; homepage = "http://tomahawkins.org"; - description = "A DSL for embedded hard realtime applications"; + description = "An EDSL for embedded hard realtime applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -24941,8 +24960,8 @@ self: { }: mkDerivation { pname = "bindings-nettle"; - version = "0.2"; - sha256 = "1pk2gwd5wbs1bhna5npwrzrvd6cxss8sbigsa8lsqsarh8mbd5sr"; + version = "0.4"; + sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph"; buildDepends = [ base bindings-DSL ]; testDepends = [ base bytestring hspec HUnit QuickCheck quickcheck-io @@ -26691,6 +26710,7 @@ self: { testDepends = [ base directory doctest filepath prelude-extras transformers vector ]; + jailbreak = true; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; @@ -27321,22 +27341,22 @@ self: { "bustle" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, dbus - , directory, filepath, glib, gtk, hgettext, HUnit, mtl, pango + , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango , parsec, pcap, process, QuickCheck, setlocale, test-framework , test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; - version = "0.4.8"; - sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq"; + version = "0.5.0"; + sha256 = "0wj3abvkpalr40zyqwxi2bwgrfzmnjjg7y577qj2fzv8l5bl2mn0"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring cairo containers dbus directory filepath glib gtk - hgettext mtl pango parsec pcap process setlocale text time + base bytestring cairo containers dbus directory filepath gio glib + gtk3 hgettext mtl pango parsec pcap process setlocale text time ]; testDepends = [ - base bytestring cairo containers dbus directory filepath gtk + base bytestring cairo containers dbus directory filepath gtk3 hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; @@ -27664,6 +27684,7 @@ self: { sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; + jailbreak = true; homepage = "https://github.com/philopon/bytestring-read"; description = "fast ByteString to number converting library"; license = stdenv.lib.licenses.mit; @@ -29617,20 +29638,22 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, HUnit, QuickCheck, test-framework + , containers, deepseq, hashable, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.4.2.4"; - sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a"; + version = "0.4.3.0"; + revision = "1"; + sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3"; + editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq - text unordered-containers vector + hashable text unordered-containers vector ]; testDepends = [ - attoparsec base bytestring HUnit QuickCheck test-framework + attoparsec base bytestring hashable HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; @@ -29677,6 +29700,7 @@ self: { homepage = "https://github.com/pjones/cassava-streams"; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassette" = callPackage @@ -29758,10 +29782,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.5.0.1"; - sha256 = "1zdjsd6dqkcpnm8w6macn0v5y48nycc4g2i4rz3gg57v1hlyqrh6"; + version = "0.5.1.0"; + sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq"; buildDepends = [ base template-haskell ]; - homepage = "http://github.com/frerich/catamorphism"; + homepage = "https://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -31378,22 +31402,23 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-vhdl, containers - , directory, filepath, ghc, ghc-typelits-natnormalise, hashable - , haskeline, lens, mtl, process, text, transformers + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-natnormalise + , hashable, haskeline, lens, mtl, process, text, transformers , unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.5.6"; - sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9"; + version = "0.5.7"; + sha256 = "0bia1yqww40prj2n6x4chvfkx05la73056mlpsgilakxwqsab2m7"; isLibrary = false; isExecutable = true; buildDepends = [ array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-vhdl containers directory filepath ghc - ghc-typelits-natnormalise hashable haskeline lens mtl process text - transformers unbound-generics unix unordered-containers + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl + process text transformers unbound-generics unix + unordered-containers ]; jailbreak = true; homepage = "http://www.clash-lang.org/"; @@ -31411,8 +31436,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.5"; - sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx"; + version = "0.5.6"; + sha256 = "1dgcnxzk7l7hywv1p268xrm2dfbgfgcvjs5w14vmsfxv1rfzkad0"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31426,16 +31451,18 @@ self: { "clash-prelude" = callPackage ({ mkDerivation, base, data-default, doctest, ghc-prim - , ghc-typelits-natnormalise, Glob, integer-gmp, singletons - , template-haskell, th-lift + , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.7.5"; - sha256 = "0li9y6cb56yf28yrma2c1japhl6c4rk0x9d8wnf3wq9n499bj6iv"; + version = "0.8"; + revision = "1"; + sha256 = "0hd8faq69wvm679gyplbzccz3k4iyp1108xm0hc4x7cdrkmg01r1"; + editedCabalFile = "e549747128c6452eca30da937a03b8d0ff2577466a5a242f50754db3d3f6a648"; buildDepends = [ base data-default ghc-prim ghc-typelits-natnormalise integer-gmp - singletons template-haskell th-lift + lens QuickCheck singletons template-haskell th-lift ]; testDepends = [ base doctest Glob ]; homepage = "http://www.clash-lang.org/"; @@ -31451,6 +31478,7 @@ self: { version = "0.1.2.1"; sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w"; buildDepends = [ base clash-prelude QuickCheck ]; + jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -31462,8 +31490,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.5.4"; - sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289"; + version = "0.5.5"; + sha256 = "1dks6saxp24xm478bgx2bkzx4qq6yv79f92z8kw6a2y29c3bjfrg"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -31474,14 +31502,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.5.5"; + sha256 = "0wjnjdl9slcrxnd0vz7m6y5jhs6gcaij7f9jjrgfcljq4wmk05rf"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.4"; - sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc"; + version = "0.5.5"; + sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -31619,8 +31664,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.7"; - sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba"; + version = "0.23.8"; + sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd"; buildDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -31634,7 +31679,6 @@ self: { ]; buildTools = [ hsx2hs ]; extraLibraries = [ openssl ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -31677,6 +31721,7 @@ self: { text web-plugins ]; buildTools = [ hsx2hs ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; @@ -31719,8 +31764,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.12"; - sha256 = "1pi8qrm71zdszc1fkwyvdx0qnlj4gzsyajw70w4s6sgmn7mgny69"; + version = "0.6.14"; + sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2"; buildDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -31728,7 +31773,6 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31769,8 +31813,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.3.10"; - sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb"; + version = "0.4.0"; + sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws"; buildDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -31779,7 +31823,6 @@ self: { web-plugins web-routes web-routes-happstack web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -32553,6 +32596,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "codec" = callPackage + ({ mkDerivation, aeson, base, binary, binary-bits, bytestring + , data-default-class, mtl, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "codec"; + version = "0.1.1"; + sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k"; + buildDepends = [ + aeson base binary binary-bits bytestring data-default-class mtl + template-haskell text transformers unordered-containers + ]; + testDepends = [ + aeson base binary binary-bits bytestring data-default-class mtl + template-haskell text transformers unordered-containers + ]; + homepage = "https://github.com/chpatrick/codec"; + description = "First-class record construction and bidirectional serialization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "codec-libevent" = callPackage ({ mkDerivation, array, base, binary, binary-strict, bytestring , containers, parsec, QuickCheck, regex-compat @@ -33163,15 +33228,16 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.6"; + version = "4.2.7"; revision = "1"; - sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i"; - editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556"; + sha256 = "03h36hr7vgxxyxfp9yc87vahbm3d6chvrkcrjh5abxg6i42aflma"; + editedCabalFile = "70542238a847c5b973832fa7e5623a76a485df25b36d511bfd5f5116e4014619"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/comonad/"; description = "Comonads"; license = stdenv.lib.licenses.bsd3; @@ -34172,6 +34238,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conduit-parse" = callPackage + ({ mkDerivation, base, conduit, exceptions, hlint, parsers + , resourcet, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "conduit-parse"; + version = "0.1.0.0"; + sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3"; + buildDepends = [ + base conduit exceptions parsers text transformers + ]; + testDepends = [ + base conduit exceptions hlint parsers resourcet tasty tasty-hunit + ]; + homepage = "https://github.com/k0ral/conduit-parse"; + description = "Parsing framework based on conduit"; + license = "unknown"; + }) {}; + "conduit-resumablesink" = callPackage ({ mkDerivation, base, bytestring, conduit, hspec, transformers , void @@ -34554,18 +34639,22 @@ self: { "consul-haskell" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , http-client, HUnit, network, tasty, tasty-hunit, text + , http-client, http-types, HUnit, lifted-async, lifted-base + , monad-control, network, stm, tasty, tasty-hunit, text , transformers }: mkDerivation { pname = "consul-haskell"; - version = "0.1"; - sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6"; + version = "0.2.1"; + sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7"; buildDepends = [ - aeson base base64-bytestring bytestring http-client network text + aeson base base64-bytestring bytestring http-client http-types + lifted-async lifted-base monad-control network stm text transformers ]; - testDepends = [ base http-client HUnit network tasty tasty-hunit ]; + testDepends = [ + base http-client HUnit network tasty tasty-hunit text transformers + ]; homepage = "https://github.com/alphaHeavy/consul-haskell"; description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -36680,8 +36769,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.2.3"; - sha256 = "0g8xf65v255z8qm30n3d1h4fval763lns14vb36cyrp1gp48rf2i"; + version = "2.2.4"; + sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42550,8 +42639,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "1.4.5"; - sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5"; + version = "2.0.0"; + sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay"; buildDepends = [ attoparsec base binary blaze-builder bytestring conduit conduit-extra containers iproute mtl network random resourcet @@ -42753,10 +42842,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.9.13"; - revision = "1"; - sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00"; - editedCabalFile = "592ab6d62eca8a0b43930f15c8fb653c54d60983bd232ecc505bd5a5aebe6f7f"; + version = "0.10.0"; + sha256 = "161k9brapz6hbwl3naar07kpfsgqp4b52i5nfsbxsqa2a9al40kb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -45032,8 +45119,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "0.1.2.0"; - sha256 = "0s80x6r2h5cwng6x15xmwgpnjv0qgp360g11g2k3hsc5y8fvgmkd"; + version = "0.1.2.1"; + sha256 = "0x5p5jwxz07m515421xpcw777lgc3bx40mnl0y9fdw2gz4f3svs2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -45042,6 +45129,7 @@ self: { ]; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-make" = callPackage @@ -49005,6 +49093,7 @@ self: { sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir"; buildDepends = [ base deepseq primitive ]; testDepends = [ base doctest filemanip primitive ]; + jailbreak = true; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49400,10 +49489,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.0"; - revision = "1"; - sha256 = "15vr7d1fyabr9v9r9vnh9m2x0r2i0ggg714cc7r6zxhjbrrc9rbn"; - editedCabalFile = "acf5b2b49db56bf047774bc90e57e6c81c5c4d413849d4cdff9dfaf4c71246ab"; + version = "1.0.1"; + sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y"; buildDepends = [ base ]; testDepends = [ base doctest QuickCheck template-haskell ]; homepage = "http://taylor.fausak.me/flow/"; @@ -49661,15 +49748,15 @@ self: { "foldl" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random - , primitive, text, transformers, vector + , primitive, profunctors, text, transformers, vector }: mkDerivation { pname = "foldl"; - version = "1.0.10"; - sha256 = "04ghbn78hsqp92k9mljpa5xgjrmddwrhj90wb1f1v4lliw1inn9q"; + version = "1.0.11"; + sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr"; buildDepends = [ - base bytestring containers mwc-random primitive text transformers - vector + base bytestring containers mwc-random primitive profunctors text + transformers vector ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; @@ -50230,10 +50317,9 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "fraction"; - version = "0.1.0.3"; - sha256 = "0kjpfqy528s11kfigp27kr5a4xw8kn11mpgjzb6fapdbip6y9579"; + version = "0.1.0.4"; + sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf"; buildDepends = [ base semigroups ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction"; description = "Fractions"; license = stdenv.lib.licenses.bsd3; @@ -50592,15 +50678,14 @@ self: { }: mkDerivation { pname = "friday"; - version = "0.2.1.2"; - sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q"; + version = "0.2.2.0"; + sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr"; buildDepends = [ base convertible deepseq primitive ratio-int transformers vector ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.gpl3; @@ -51991,8 +52076,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.6.0.7"; - sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz"; + version = "0.7.1"; + sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30"; buildDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; @@ -52144,6 +52229,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "geom2d" = callPackage + ({ mkDerivation, base, ieee754, QuickCheck }: + mkDerivation { + pname = "geom2d"; + version = "0.1.2.1"; + sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj"; + buildDepends = [ base ieee754 QuickCheck ]; + testDepends = [ base ieee754 QuickCheck ]; + jailbreak = true; + description = "package for geometry in euklidean 2d space"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt , mtl, old-locale, process, time @@ -52183,8 +52282,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.6.3"; - sha256 = "18d9cbk87gx31fk1bdylllicbnxj2xmb5xzss27amy8xcmlb3qds"; + version = "0.7"; + sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -52192,6 +52291,7 @@ self: { base base-compat base-orphans generics-sop hspec hspec-expectations markdown-unlit QuickCheck silently tagged ]; + homepage = "https://github.com/zalora/getopt-generics#readme"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52707,6 +52807,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-tcplugins-extra" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.1"; + sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf"; + buildDepends = [ base ghc ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, text, time }: mkDerivation { @@ -52722,12 +52835,13 @@ self: { }) {}; "ghc-typelits-natnormalise" = callPackage - ({ mkDerivation, base, ghc, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit + }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.2.1"; - sha256 = "0dflzqhqax06nx4qc5xw6k1aihny7d2pxg1ldyw1y57mjg44clah"; - buildDepends = [ base ghc ]; + version = "0.3"; + sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r"; + buildDepends = [ base ghc ghc-tcplugins-extra ]; testDepends = [ base tasty tasty-hunit ]; jailbreak = true; homepage = "http://www.clash-lang.org/"; @@ -53550,8 +53664,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.10.6.3"; - sha256 = "1pzxk4zsk1992gsgyi0pfj8x0dggf56v78345jl282hvb2psm371"; + version = "0.10.7"; + sha256 = "1gj94z2c2jpdm9bkfnc6wbyhipgbss0j70ql26hn8g3fh1ykcpbj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -53563,7 +53677,6 @@ self: { random recaptcha safe SHA split syb tagsoup text time uri url utf8-string uuid xhtml xml xss-sanitize zlib ]; - jailbreak = true; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; @@ -53934,12 +54047,12 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.1.0.1"; - sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv"; - buildDepends = [ array base containers ]; + version = "0.2.0.1"; + sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7"; + buildDepends = [ array base containers TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55769,6 +55882,22 @@ self: { license = stdenv.lib.licenses.lgpl21; }) { inherit (pkgs.gnome) gtk;}; + "gtk-helpers" = callPackage + ({ mkDerivation, array, base, gio, glib, gtk, mtl, process + , template-haskell + }: + mkDerivation { + pname = "gtk-helpers"; + version = "0.0.7"; + sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7"; + buildDepends = [ + array base gio glib gtk mtl process template-haskell + ]; + homepage = "http://keera.es/blog/community"; + description = "A collection of auxiliary operations and widgets related to Gtk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gtk-jsinput" = callPackage ({ mkDerivation, base, gtk, json, transformers }: mkDerivation { @@ -56470,8 +56599,8 @@ self: { }: mkDerivation { pname = "hPDB"; - version = "1.2.0.3"; - sha256 = "1lciijgn137gmi190if41akj4pv9030rbbvys5lfh4q5kk8p2dsp"; + version = "1.2.0.4"; + sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s"; buildDepends = [ AC-Vector base bytestring containers deepseq directory ghc-prim iterable mmap mtl Octree parallel QuickCheck tagged @@ -62717,6 +62846,7 @@ self: { sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b"; buildDepends = [ base ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; @@ -65411,8 +65541,8 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.2.0"; - sha256 = "18hby3vjnzfis2ixbkkrk1zwky4rymx5ai00wza9yx4ijnxrzc3z"; + version = "0.1.2.1"; + sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; @@ -66368,6 +66498,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "homplexity" = callPackage + ({ mkDerivation, base, containers, cpphs, deepseq, directory + , filepath, happy, haskell-src-exts, hflags, template-haskell + , uniplate + }: + mkDerivation { + pname = "homplexity"; + version = "0.4.2.0"; + sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers cpphs deepseq directory filepath haskell-src-exts + hflags template-haskell uniplate + ]; + buildTools = [ happy ]; + homepage = "https://github.com/mgajda/homplexity"; + description = "Haskell code quality tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -67027,6 +67178,7 @@ self: { homepage = "https://github.com/yihuang/hosts-server"; description = "An dns server which is extremely easy to config"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hothasktags" = callPackage @@ -67990,8 +68142,8 @@ self: { }: mkDerivation { pname = "hs-mesos"; - version = "0.20.2.0"; - sha256 = "1vnfmb5mnp3wsbd7s1ls6rz0ywlirykdx7dclkxcc3rh1y0mxp1n"; + version = "0.20.3.0"; + sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring lens managed template-haskell ]; @@ -72682,8 +72834,8 @@ self: { }: mkDerivation { pname = "hyakko"; - version = "0.6.6"; - sha256 = "1y0b5rxgiaygy0y42s2rnnw87br4d73nbjii9gpbf80rlvhdjagw"; + version = "0.6.7"; + sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -73103,6 +73255,7 @@ self: { testDepends = [ base containers directory doctest filepath unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; @@ -74420,12 +74573,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "index-core"; - version = "1.0.1"; - revision = "1"; - sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4"; - editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f"; + version = "1.0.2"; + sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw"; buildDepends = [ base ]; - jailbreak = true; description = "Indexed Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74627,8 +74777,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.1.2"; - sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00"; + version = "0.9.1.3"; + sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74640,7 +74790,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -74720,8 +74869,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.3.1"; - sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi"; + version = "0.5.3.2"; + sha256 = "0sihzjscdrk02z2d22j0fcqgk05nhpg16zy2cdkxjj4cp09nbaac"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75682,18 +75831,16 @@ self: { "ircbot" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , irc, mtl, network, old-locale, parsec, random, SafeSemaphore, stm - , time, unix + , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix }: mkDerivation { pname = "ircbot"; - version = "0.6.2"; - sha256 = "0jl6sgm7bk4yi1l4s6j3yir3rpbxx8r4ri267xcw77b2vzbxq7l0"; + version = "0.6.4"; + sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd"; buildDepends = [ base bytestring containers directory filepath irc mtl network - old-locale parsec random SafeSemaphore stm time unix + parsec random SafeSemaphore stm time unix ]; - jailbreak = true; homepage = "http://hub.darcs.net/stepcut/ircbot"; description = "A library for writing irc bots"; license = stdenv.lib.licenses.bsd3; @@ -77955,6 +78102,242 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "keera-callbacks" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "keera-callbacks"; + version = "0.1"; + sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq"; + buildDepends = [ base mtl ]; + description = "Mutable memory locations with callbacks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-i18n" = callPackage + ({ mkDerivation, base, directory, filepath, glib, hgettext + , MissingK, setlocale, utf8-string + }: + mkDerivation { + pname = "keera-hails-i18n"; + version = "0.0.3.3"; + sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i"; + buildDepends = [ + base directory filepath glib hgettext MissingK setlocale + utf8-string + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - I18N"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-controller" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "keera-hails-mvc-controller"; + version = "0.0.3.3"; + sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb"; + buildDepends = [ base ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based controller for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-environment-gtk" = callPackage + ({ mkDerivation, base, keera-hails-mvc-model-protectedmodel + , keera-hails-mvc-view, keera-hails-mvc-view-gtk + }: + mkDerivation { + pname = "keera-hails-mvc-environment-gtk"; + version = "0.0.3.3"; + sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr"; + buildDepends = [ + base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view + keera-hails-mvc-view-gtk + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-model-lightmodel" = callPackage + ({ mkDerivation, base, containers, keera-hails-reactivevalues + , MissingK, stm, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-model-lightmodel"; + version = "0.0.3.4"; + sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190"; + buildDepends = [ + base containers keera-hails-reactivevalues MissingK stm + template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - Reactive Protected Light Models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keera-hails-mvc-model-protectedmodel" = callPackage + ({ mkDerivation, base, containers, keera-hails-reactivevalues + , MissingK, stm, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-model-protectedmodel"; + version = "0.0.3.5"; + sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx"; + buildDepends = [ + base containers keera-hails-reactivevalues MissingK stm + template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - Protected Reactive Models"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-solutions-config" = callPackage + ({ mkDerivation, base, directory, filepath, MissingK }: + mkDerivation { + pname = "keera-hails-mvc-solutions-config"; + version = "0.0.3.3"; + sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1"; + buildDepends = [ base directory filepath MissingK ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Easy handling of configuration files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-solutions-gtk" = callPackage + ({ mkDerivation, base, gtk, hslogger, HTTP + , keera-hails-mvc-environment-gtk + , keera-hails-mvc-model-protectedmodel, keera-hails-mvc-view + , keera-hails-mvc-view-gtk, keera-hails-reactivevalues, MissingK + , mtl, network, network-uri, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-solutions-gtk"; + version = "0.0.3.3"; + sha256 = "1j0821aysvzpa8qnnz9066gwxk1bwn0sykihb5p5br62n7xzhgkf"; + buildDepends = [ + base gtk hslogger HTTP keera-hails-mvc-environment-gtk + keera-hails-mvc-model-protectedmodel keera-hails-mvc-view + keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl + network network-uri template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-view" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "keera-hails-mvc-view"; + version = "0.0.3.3"; + sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p"; + buildDepends = [ base ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Generic View for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-view-gtk" = callPackage + ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-mvc-view }: + mkDerivation { + pname = "keera-hails-mvc-view-gtk"; + version = "0.0.3.3"; + sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z"; + buildDepends = [ base gtk gtk-helpers keera-hails-mvc-view ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-fs" = callPackage + ({ mkDerivation, base, directory, fsnotify + , keera-hails-reactivevalues, system-filepath + }: + mkDerivation { + pname = "keera-hails-reactive-fs"; + version = "0.0.3.3"; + sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08"; + buildDepends = [ + base directory fsnotify keera-hails-reactivevalues system-filepath + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Files as Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-gtk" = callPackage + ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-reactivevalues + , mtl, transformers + }: + mkDerivation { + pname = "keera-hails-reactive-gtk"; + version = "0.0.3.5"; + sha256 = "01hvakmxjm9vpfwp4s7c1s3jqiy21yqb9rgjs2drf2kb66ndvsq9"; + buildDepends = [ + base gtk gtk-helpers keera-hails-reactivevalues mtl transformers + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keera-hails-reactive-network" = callPackage + ({ mkDerivation, base, keera-hails-reactivevalues, network }: + mkDerivation { + pname = "keera-hails-reactive-network"; + version = "0.0.3.3"; + sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3"; + buildDepends = [ base keera-hails-reactivevalues network ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Sockets as Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-polling" = callPackage + ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues + }: + mkDerivation { + pname = "keera-hails-reactive-polling"; + version = "0.0.3.3"; + sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8"; + buildDepends = [ base keera-callbacks keera-hails-reactivevalues ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Polling based Readable RVs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-wx" = callPackage + ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }: + mkDerivation { + pname = "keera-hails-reactive-wx"; + version = "0.0.3.3"; + sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw"; + buildDepends = [ base keera-hails-reactivevalues wx wxcore ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Reactive Fields for WX widgets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-yampa" = callPackage + ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues + , time, Yampa + }: + mkDerivation { + pname = "keera-hails-reactive-yampa"; + version = "0.0.3.3"; + sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1"; + buildDepends = [ + base keera-callbacks keera-hails-reactivevalues time Yampa + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - FRP Yampa Signal Functions as RVs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keera-hails-reactivevalues" = callPackage ({ mkDerivation, base, contravariant }: mkDerivation { @@ -79422,8 +79805,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.10.2.1"; - sha256 = "0klr7b4sdi8bsln9hw3xa56d3s1h869zkyqnm97fiyvzar91g532"; + version = "0.10.2.2"; + sha256 = "0y65mlx4zx1n7n6y3gjvzqzr2k8bxbbjn4wsjr8mzpib0gqfqpss"; buildDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -81840,6 +82223,7 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -83230,8 +83614,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.2.0"; - sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0"; + version = "0.2.1"; + sha256 = "0jply63w04pnkfv3s8lpnwvjf43sfhf3mk72p3wva4p28c6mql31"; buildDepends = [ aeson aeson-pretty base bytestring deepseq exceptions hpqtypes monad-control monad-time mtl old-locale split stm text time @@ -84287,6 +84671,7 @@ self: { transformers void ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; @@ -86185,8 +86570,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.6"; - sha256 = "18r0rnh2x5sazn2i23v222vxrgsgyyzbfvasg21r2kh42i0vh2bw"; + version = "0.7"; + sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -86392,8 +86777,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.3.0.0"; - sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg"; + version = "0.3.0.1"; + sha256 = "1mj4x5pq9mch71vk5cqi2wjaqjhgsllvjbsz7yyv6sg4cps63d8l"; buildDepends = [ ansi-terminal base bytestring containers lens mtl mwc-random primitive text time unix unordered-containers vector @@ -86802,8 +87187,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.8.2"; - sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia"; + version = "0.4.9"; + sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -87403,6 +87788,7 @@ self: { sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av"; buildDepends = [ base ]; testDepends = [ base doctest Glob ]; + jailbreak = true; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; @@ -88219,8 +88605,11 @@ self: { mkDerivation { pname = "monad-unify"; version = "0.2.2"; + revision = "1"; sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp"; + editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2"; buildDepends = [ base mtl unordered-containers ]; + jailbreak = true; description = "Generic first-order unification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -91334,8 +91723,8 @@ self: { }: mkDerivation { pname = "nettle"; - version = "0.1.0"; - sha256 = "1ms96laa9d2ns39ymw6mlwm0mj03vss7855cs9npymhb4fmqkcas"; + version = "0.1.1"; + sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr"; buildDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -91516,17 +91905,18 @@ self: { ({ mkDerivation, attoparsec, base, base32string, bytestring , exceptions, hexstring, hspec, hspec-attoparsec , hspec-expectations, network, network-attoparsec, network-simple - , socks, text, transformers + , socks, splice, text, transformers }: mkDerivation { pname = "network-anonymous-tor"; - version = "0.9.1"; - sha256 = "1p78xsi1i59z9jkyf182gvfx7qpiqs0l60mp2xl1d4jjwgdnni50"; + version = "0.9.2"; + sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base base32string bytestring exceptions hexstring - network network-attoparsec network-simple socks text transformers + network network-attoparsec network-simple socks splice text + transformers ]; testDepends = [ attoparsec base base32string bytestring exceptions hspec @@ -94678,15 +95068,21 @@ self: { }) {}; "order-maintenance" = callPackage - ({ mkDerivation, base, containers, transformers }: + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers + , QuickCheck, transformers + }: mkDerivation { pname = "order-maintenance"; - version = "0.0.0.0"; - sha256 = "1d416a277fcchcgyn4n5m7kpn0aky8gsi8fkk0gh3a4lcap18h2d"; + version = "0.0.1.0"; + sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k"; buildDepends = [ base containers transformers ]; + testDepends = [ + base Cabal cabal-test-quickcheck containers QuickCheck transformers + ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance"; description = "Algorithms for the order maintenance problem with a safe interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "order-statistics" = callPackage @@ -94928,6 +95324,7 @@ self: { sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; buildDepends = [ base ]; testDepends = [ base doctest ]; + jailbreak = true; description = "An alternative to some of the Prelude"; license = stdenv.lib.licenses.mit; }) {}; @@ -95005,8 +95402,8 @@ self: { }: mkDerivation { pname = "packed-dawg"; - version = "0.2.0.5"; - sha256 = "1b8lhigpzj1zvah6f4ra7pczhpm8dxcwaqna8p1ifbbx2ys6x59p"; + version = "0.2.0.7"; + sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y"; buildDepends = [ base binary deepseq mtl unordered-containers vector vector-binary-instances @@ -95242,8 +95639,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.14.0.3"; - sha256 = "1nbicmngsdx9v4kvsswipf8w1l8rvfsll8fnp2ar5v65b0aba3ic"; + version = "1.14.0.4"; + sha256 = "1pzs4ysf7q3sxd8vyydzi5r4n8gjnkvjs3p1phmw4zir3zxmp581"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95322,10 +95719,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.0"; - revision = "1"; - sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r"; - editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d"; + version = "1.0.1"; + sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb"; isLibrary = true; isExecutable = true; buildDepends = [ base csv pandoc pandoc-types text ]; @@ -98937,6 +99332,7 @@ self: { ]; description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointed" = callPackage @@ -99155,16 +99551,16 @@ self: { }) {}; "poly-arity" = callPackage - ({ mkDerivation, base, constraints, hspec, QuickCheck + ({ mkDerivation, base, constraints, HList, hspec, QuickCheck , quickcheck-instances }: mkDerivation { pname = "poly-arity"; - version = "0.0.4"; - revision = "1"; - sha256 = "0cg312hlfylablw4h840xhm72cs70xk9rla4wrmzpqm45g91fhyq"; - editedCabalFile = "e099e3cdd06f5ab832bfc920265cd97304f92c2e89126306f7e1d9bff98cbe86"; - buildDepends = [ base constraints ]; + version = "0.0.4.1"; + revision = "2"; + sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp"; + editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af"; + buildDepends = [ base constraints HList ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; @@ -99957,8 +100353,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.2.9.1"; - sha256 = "0rgvqhhpg6q99q1bdbk3dhnlad8nfrl3xihcg3c0j55dlx3q1860"; + version = "0.2.10.0"; + sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104204,6 +104600,7 @@ self: { attoparsec base base-prelude template-haskell text transformers ]; testDepends = [ base base-prelude directory doctest filepath ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; description = "First class records implemented with quasi-quotation"; license = stdenv.lib.licenses.mit; @@ -104284,8 +104681,8 @@ self: { ({ mkDerivation, base, comonad, free, transformers }: mkDerivation { pname = "recursion-schemes"; - version = "4.1.1"; - sha256 = "00izjknk7g2546p35hrha413nji6013wfbjic8jgmlzzjlr1cjwl"; + version = "4.1.2"; + sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n"; buildDepends = [ base comonad free transformers ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; @@ -109675,8 +110072,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.2"; - sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j"; + version = "0.1.0.3"; + sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc"; buildDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL @@ -109890,8 +110287,8 @@ self: { ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { pname = "securemem"; - version = "0.1.8"; - sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2"; + version = "0.1.9"; + sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy"; buildDepends = [ base byteable bytestring ghc-prim memory ]; homepage = "http://github.com/vincenthz/hs-securemem"; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; @@ -110051,15 +110448,14 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.0.0.1"; - revision = "1"; - sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l"; - editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575"; + version = "5.0.0.2"; + sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw"; buildDepends = [ base base-orphans bifunctors comonad containers contravariant distributive semigroups tagged transformers transformers-compat ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -110526,6 +110922,7 @@ self: { filepath hspec parsec QuickCheck quickcheck-instances string-conversions text url ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -110598,8 +110995,8 @@ self: { }: mkDerivation { pname = "servant-ede"; - version = "0.4"; - sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd"; + version = "0.4.0.1"; + sha256 = "1yxqjd6dk5bhh6qwjshm1fcizsm1vd5nk8sdbfdasgsfw6ynlgfp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110783,18 +111180,16 @@ self: { "ses-html" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, byteable - , bytestring, cryptohash, HsOpenSSL, http-streams, old-locale - , tagsoup, time + , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time }: mkDerivation { pname = "ses-html"; - version = "0.2.0.2"; - sha256 = "0dfrhsn6scwid7ycnq4j21nkq64s59hkc05ygcg4qsf7vcizgs0d"; + version = "0.2.1.2"; + sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f"; buildDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash - HsOpenSSL http-streams old-locale tagsoup time + HsOpenSSL http-streams tagsoup time ]; - jailbreak = true; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113426,14 +113821,14 @@ self: { , clientsession, comonad, configurator, containers, directory , directory-tree, dlist, errors, filepath, hashable, heist, lens , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time - , pwstore-fast, regex-posix, snap-core, snap-server, stm, syb + , pwstore-fast, regex-posix, snap-core, snap-server, stm , template-haskell, text, time, transformers, unordered-containers , vector, vector-algorithms, xmlhtml }: mkDerivation { pname = "snap"; - version = "0.14.0.4"; - sha256 = "0z0w6dig658cbl6adwq738dr9z56a3sj8lfhh5zfnmmy7x1794xs"; + version = "0.14.0.5"; + sha256 = "0wifww6mry2lxj572j9gwjxpjz4z7z9hd9jzhfyfwv2c67b39iyr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113441,8 +113836,8 @@ self: { configurator containers directory directory-tree dlist errors filepath hashable heist lens logict MonadCatchIO-transformers mtl mwc-random old-time pwstore-fast regex-posix snap-core snap-server - stm syb template-haskell text time transformers - unordered-containers vector vector-algorithms xmlhtml + stm template-haskell text time transformers unordered-containers + vector vector-algorithms xmlhtml ]; jailbreak = true; homepage = "http://snapframework.com/"; @@ -117990,8 +118385,8 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string }: mkDerivation { pname = "string-conversions"; - version = "0.3.0.3"; - sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p"; + version = "0.4"; + sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s"; buildDepends = [ base bytestring text utf8-string ]; description = "Simplifies dealing with different types for strings"; license = stdenv.lib.licenses.bsd3; @@ -118358,8 +118753,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.5.13.0"; - sha256 = "1284x4g6k24v3k2ii5jfyly6b788477qih3lq81x72x22d36d168"; + version = "0.5.14.0"; + sha256 = "1z8fya123cldakf15fc4p9vp0gp9gxql4x7faz12gfp9d6ffj4f5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125350,6 +125745,7 @@ self: { system-filepath temporary text time transformers unix ]; testDepends = [ base doctest ]; + jailbreak = true; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -131577,8 +131973,8 @@ self: { ({ mkDerivation, base, containers, mtl, stm, text }: mkDerivation { pname = "web-plugins"; - version = "0.2.7"; - sha256 = "0pvwhr5mr960lramlnz7sffxrr7mxqskqk5pqbspck7cabzwzsxd"; + version = "0.2.8"; + sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969"; buildDepends = [ base containers mtl stm text ]; homepage = "http://www.happstack.com/"; description = "dynamic plugin system for web applications"; @@ -131741,6 +132137,7 @@ self: { base bytestring primitive text types-compat unordered-containers ]; testDepends = [ base doctest ]; + jailbreak = true; homepage = "https://github.com/philopon/web-routing"; description = "simple routing library"; license = stdenv.lib.licenses.mit; @@ -133046,6 +133443,7 @@ self: { sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc"; buildDepends = [ base bytestring connection network websockets ]; testDepends = [ base doctest ]; + jailbreak = true; homepage = "http://taylor.fausak.me/wuss/"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; @@ -133424,8 +133822,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.3.0"; - sha256 = "1ih7wnsy38p7s14fnyg3pnm3hyp3nd6fprl2m66l09cj7ibvnxyc"; + version = "0.3.2"; + sha256 = "0njsflaxz2l01vbwndsmqmq37i6nl4cfczy776jdpnv7043b1ynv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -133886,6 +134284,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-conduit-parse" = callPackage + ({ mkDerivation, base, conduit, conduit-parse, containers + , data-default, exceptions, hlint, parsers, resourcet, tasty + , tasty-hunit, text, xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-conduit-parse"; + version = "0.1.0.0"; + sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v"; + buildDepends = [ + base conduit conduit-parse containers exceptions parsers text + xml-conduit xml-types + ]; + testDepends = [ + base conduit conduit-parse data-default hlint parsers resourcet + tasty tasty-hunit + ]; + homepage = "https://github.com/k0ral/xml-conduit-parse"; + description = "Streaming XML parser based on conduits"; + license = "unknown"; + }) {}; + "xml-conduit-writer" = callPackage ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit , xml-types @@ -135774,8 +136194,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.9.1"; - sha256 = "1fqla2cahqr51jgr0l8pl2wq4rai2dq6yky75qjg5a4xrxcdq6sc"; + version = "1.4.10"; + sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -135859,23 +136279,22 @@ self: { }) {}; "yesod-dsl" = callPackage - ({ mkDerivation, alex, array, base, Cabal, containers, directory - , filepath, happy, MissingH, mtl, shakespeare, shakespeare-text - , strict, syb, text, transformers, uniplate + ({ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring + , Cabal, containers, directory, filepath, happy, MissingH, mtl + , shakespeare, strict, syb, text, transformers, uniplate, vector }: mkDerivation { pname = "yesod-dsl"; - version = "0.1.1.23"; - sha256 = "01rafa5klq1qjrl5w7ii4h27kiqhnacn95x7f2f7b1gxxp26psrx"; + version = "0.1.1.24"; + sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7"; isLibrary = true; isExecutable = true; buildDepends = [ - array base Cabal containers directory filepath MissingH mtl - shakespeare shakespeare-text strict syb text transformers uniplate + aeson aeson-pretty array base bytestring Cabal containers directory + filepath MissingH mtl shakespeare strict syb text transformers + uniplate vector ]; buildTools = [ alex happy ]; - jailbreak = true; - homepage = "https://github.com/tlaitinen/yesod-dsl"; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -137194,8 +137613,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.0.2"; - sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; + version = "0.5.0.3"; + sha256 = "15r381vsffqyzvgksipik0y9f41sy8ylsmvzw7hih4nrzp0w32ch"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -137203,7 +137622,6 @@ self: { HStringTemplate lucid old-locale old-time pandoc parsec scientific split text time unordered-containers yaml ]; - jailbreak = true; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; From 6130aa2a4dccd68c18b02f690d775dc66d41a4a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 15:41:09 +0200 Subject: [PATCH 023/412] haskell-cipher-aes: test suite has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a4979cd58d..b16b95558df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -827,9 +827,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/vincenthz/hs-cipher-aes/issues/35 - cipher-aes = dontCheck super.cipher-aes; - # https://github.com/DanielG/cabal-helper/issues/2 cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; }); From 697a80c004f65c7694c4cae33dd9f27513654dd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jun 2015 16:12:21 +0200 Subject: [PATCH 024/412] haskell-influxdb: build has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b16b95558df..ca1ea03f903 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -402,6 +402,7 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; + influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -833,8 +834,4 @@ self: super: { # https://github.com/jgm/gitit/issues/494 gitit = markBroken super.gitit; - # https://github.com/maoe/influxdb-haskell/issues/26 - influxdb = markBroken (dontCheck super.influxdb); - snaplet-influxdb = dontDistribute super.snaplet-influxdb; - } From dbf55842e89c35dcef7130705bcdc7001eba4960 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jun 2015 16:13:09 +0200 Subject: [PATCH 025/412] haskell-comonad: disable test suite to work avoid doctest failure --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ca1ea03f903..5373a507ffb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -834,4 +834,7 @@ self: super: { # https://github.com/jgm/gitit/issues/494 gitit = markBroken super.gitit; + # https://github.com/ekmett/comonad/issues/25 + comonad = dontCheck super.comonad; + } From a982892116d0a02cbaea595b006a6341e8b7d80a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:18:06 +0200 Subject: [PATCH 026/412] Fix evaluation errors on Hydra. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5373a507ffb..51aab68907a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -780,11 +780,12 @@ self: super: { # https://github.com/goldfirere/singletons/issues/116 # https://github.com/goldfirere/singletons/issues/117 # https://github.com/goldfirere/singletons/issues/118 - singletons = markBroken super.singletons; - singleton-nats = dontDistribute super.singleton-nats; + clash-lib = dontDistribute super.clash-lib; + clash-verilog = dontDistribute super.clash-verilog; hgeometry = dontDistribute super.hgeometry; hipe = dontDistribute super.hipe; - clash-lib = dontDistribute super.clash-lib; + singleton-nats = dontDistribute super.singleton-nats; + singletons = markBroken super.singletons; # https://github.com/anton-k/temporal-music-notation/issues/1 temporal-music-notation = markBroken super.temporal-music-notation; From e0f7ab678acbaafe52640068df01804a5cfc2556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:20:44 +0200 Subject: [PATCH 027/412] ghc-events: fix build of latest version with ghc-7.8.x --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 9327af856e8..2e95c78c625 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -131,4 +131,7 @@ self: super: { patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } ); + # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable. + ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; }; + } From 2db9a8289d6dc34cdb335b1acacd126bce42c88b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:25:00 +0200 Subject: [PATCH 028/412] haskell-semigroupoids: disable doctests suite to avoid version conflict with doctest 0.10.x --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 51aab68907a..ade2055187d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -838,4 +838,7 @@ self: super: { # https://github.com/ekmett/comonad/issues/25 comonad = dontCheck super.comonad; + # https://github.com/ekmett/semigroupoids/issues/35 + semigroupoids = disableCabalFlag super.semigroupoids "doctests"; + } From f5c5e4af74346687a2a5e7cd409056daac2af565 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 14:51:51 +0200 Subject: [PATCH 029/412] perl-packages: IOSocketSSL -> 2.016 Many, many fixes. Too many to list here. See: --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 891d72497b5..c166457add2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4761,10 +4761,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage { - name = "IO-Socket-SSL-1.981"; + name = "IO-Socket-SSL-2.016"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.981.tar.gz; - sha256 = "d78f3aac72888a350962c2da87b2b459513a175d7ac641cb1482bacbb81e76eb"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.016.tar.gz; + sha256 = "0hgyggdbw16nm85fds48m79lxy5318panqhpkh7r192jq6rnhqlk"; }; propagatedBuildInputs = [ URI NetSSLeay ]; meta = { From 5cb1af03ef698c2a8f70ec0ad63171dabd6a0414 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:16:10 +0200 Subject: [PATCH 030/412] libkeyfinder -> 0.11 (final) --- pkgs/development/libraries/libkeyfinder/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 6ab80d55a45..f0e75b34059 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, boost, fftw, qt5 }: -stdenv.mkDerivation rec { - version = "0.11.0-20141105"; +let version = "0.11"; in +stdenv.mkDerivation { name = "libkeyfinder-${version}"; src = fetchFromGitHub { + sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9"; + rev = "v${version}"; repo = "libKeyFinder"; owner = "ibsh"; - rev = "592ef1f3d3ada489f80814d5ccfbc8de6029dc9d"; - sha256 = "0xcqpizwbn6wik3w7h9k1lvgrp3r3w6yyy55flvnwwwgvkry48as"; }; meta = with stdenv.lib; { + inherit version; description = "Musical key detection for digital audio (C++ library)"; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; From 921249e13da448aedcec7d5f7698d22752c10284 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:16:26 +0200 Subject: [PATCH 031/412] keyfinder -> 1.26 --- pkgs/applications/audio/keyfinder/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index bea869ea318..d3438e1ada4 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: -stdenv.mkDerivation rec { - version = "1.25-17-gf670607"; +let version = "1.26"; in +stdenv.mkDerivation { name = "keyfinder-${version}"; src = fetchFromGitHub { + sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc"; + rev = version; repo = "is_KeyFinder"; owner = "ibsh"; - rev = "f6706074435ac14c5238ee3f0dd22ac22d72af9c"; - sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc"; }; meta = with stdenv.lib; { + inherit version; description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' KeyFinder is an open source key detection tool, for DJs interested in From fcee71066b61fe5384caaa172ebdcf02d0cffedb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:28:30 +0200 Subject: [PATCH 032/412] rsstail -> 1.9.1 --- .../applications/networking/feedreaders/rsstail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index ee9d1dbbf8d..2d4b9741375 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -let version = "1.9"; in +let version = "1.9.1"; in stdenv.mkDerivation rec { name = "rsstail-${version}"; src = fetchFromGitHub { - sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf"; - rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef"; + sha256 = "0jhf7vr7y56r751wy4ix80iwhgxhk6mbbin8gnx59i457gf6sjl1"; + rev = "1220d63aaa233961636f859d9a406536fffb64f4"; repo = "rsstail"; owner = "flok99"; }; From f1587a2d1ecfebdf9a8b20c2408adfec8806f879 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 19:59:46 +0200 Subject: [PATCH 033/412] Move numpy-scipy-support.nix file from the top-level to development/python-modules. The top-level is not supposed to contain sub-directories, IMHO. --- .../python-modules}/numpy-scipy-support.nix | 0 pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{top-level/python-support => development/python-modules}/numpy-scipy-support.nix (100%) diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix similarity index 100% rename from pkgs/top-level/python-support/numpy-scipy-support.nix rename to pkgs/development/python-modules/numpy-scipy-support.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38fda4ad406..fa01d1ef488 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7796,7 +7796,7 @@ let }; numpy = let - support = import ./python-support/numpy-scipy-support.nix { + support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; atlas = pkgs.atlasWithLapack; pkgName = "numpy"; @@ -11258,7 +11258,7 @@ let scipy = let - support = import ./python-support/numpy-scipy-support.nix { + support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; atlas = pkgs.atlasWithLapack; pkgName = "numpy"; From 8bf170f280436cfdfda5ead492cf9ab5e04b4637 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Tue, 2 Jun 2015 10:58:17 -0500 Subject: [PATCH 034/412] Remove lingering dependence on atlas with numpy. Closes https://github.com/NixOS/nixpkgs/pull/8133. --- pkgs/development/python-modules/numpy-scipy-support.nix | 5 ++++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 6cca704dcda..22be22633c2 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -8,6 +8,9 @@ }: { + # Re-export atlas here so that it can be sure that the same one will be used + # in the propagatedBuildInputs. + inherit atlas; # First "install" the package, then import what was installed, and call the # .test() function, which will run the test suite. @@ -40,7 +43,7 @@ runHook postCheck ''; - # Creates a site.cfg telling the setup script where to find depended-on + # Creates a site.cfg telling the setup script where to find depended-on # math libraries. preBuild = '' echo "Creating site.cfg file..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa01d1ef488..a5ad7e46f4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7821,7 +7821,7 @@ let setupPyBuildFlags = ["--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ pkgs.atlas ]; + propagatedBuildInputs = [ support.atlas ]; meta = { description = "Scientific tools for Python"; From 99d2e80d973b7ab1c04754e1f270d4786c46f2a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 20:08:24 +0200 Subject: [PATCH 035/412] In VM builds, connect stdin to /dev/null This prevents programs from hanging while trying to read from stdin. --- pkgs/build-support/vm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a9f9f0d184c..53a01365435 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -187,6 +187,7 @@ rec { # then don't start the build again, but instead drop the user into # an interactive shell. if test -n "$origBuilder" -a ! -e /.debug; then + exec < /dev/null ${coreutils}/bin/touch /.debug $origBuilder $origArgs echo $? > /tmp/xchg/in-vm-exit From 860589227b17805902779c85e9879d00351e2412 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 19:29:41 +0200 Subject: [PATCH 036/412] eid-mw: don't install useless about-eid-mw.desktop --- pkgs/tools/security/eid-mw/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index ef15967330d..1833d460081 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { install -D ${./eid-nssdb.in} $out/bin/eid-nssdb substituteInPlace $out/bin/eid-nssdb \ --replace "modutil" "${nssTools}/bin/modutil" + + # Only provides a useless "about-eid-mw.desktop" that doesn't even work: + rm -rf $out/share/applications ''; meta = with stdenv.lib; { From daf4ec39a5613d277706f0f559e074a06df2a23c Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 4 Jun 2015 20:22:36 +0300 Subject: [PATCH 037/412] fix: add missing versions --- pkgs/applications/audio/dirt/default.nix | 2 +- pkgs/applications/audio/pd-plugins/puremapping/default.nix | 2 +- pkgs/applications/misc/cortex/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 2 +- .../networking/instant-messengers/telegram-cli/default.nix | 2 +- pkgs/applications/networking/p2p/opentracker/default.nix | 4 ++-- pkgs/development/interpreters/ruby/bundler-head.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- pkgs/development/libraries/nvidia-texture-tools/default.nix | 2 +- pkgs/development/libraries/xcb-util-cursor/HEAD.nix | 2 +- pkgs/development/ocaml-modules/optcomp/default.nix | 2 +- pkgs/development/tools/misc/bossa/default.nix | 2 +- pkgs/games/thePenguinMachine/default.nix | 2 ++ pkgs/misc/drivers/xwiimote/default.nix | 4 ++-- pkgs/misc/screensavers/xss-lock/default.nix | 2 +- pkgs/os-specific/linux/android-udev-rules/default.nix | 2 +- pkgs/os-specific/linux/disk-indicator/default.nix | 2 +- pkgs/os-specific/linux/lightum/default.nix | 2 +- pkgs/os-specific/linux/seturgent/default.nix | 4 ++-- pkgs/servers/sql/monetdb/default.nix | 2 +- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/audio/pa-applet/default.nix | 2 +- pkgs/tools/audio/pnmixer/default.nix | 2 +- pkgs/tools/misc/vfdecrypt/default.nix | 3 ++- pkgs/tools/misc/xflux/default.nix | 2 +- pkgs/tools/networking/curl-unix-socket/default.nix | 2 +- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 2 +- pkgs/tools/networking/p2p/libtorrent/git.nix | 4 ++-- pkgs/tools/networking/p2p/rtorrent/git.nix | 4 ++-- pkgs/tools/security/fprint_demo/default.nix | 2 +- 31 files changed, 38 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index b5436fde7e9..1db4515ae23 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }: stdenv.mkDerivation rec { - name = "dirt-git"; + name = "dirt-2015-04-28"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index fc7fc5ee3d0..2e9a37a2f0d 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { - name = "puremapping"; + name = "puremapping-1.01"; src = fetchurl { url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix index 79d19f45a25..2aad3b20e22 100644 --- a/pkgs/applications/misc/cortex/default.nix +++ b/pkgs/applications/misc/cortex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python3 }: stdenv.mkDerivation { - name = "cortex"; + name = "cortex-2014-08-01"; src = fetchgit { url = "https://github.com/gglucas/cortex"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 3c5caeda789..6a1acca48d9 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "urxvt-perls"; + name = "urxvt-perls-2015-03-28"; src = fetchgit { url = "git://github.com/muennich/urxvt-perls"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index ba68a46cf0c..e924c3127ab 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "urxvt-tabbedex"; + name = "urxvt-tabbedex-2015-03-03"; src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 812f00829e2..a68e0ee1104 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "telegram-cli"; + name = "telegram-cli-2014-03-04"; src = fetchgit { url = "https://github.com/vysheng/tg.git"; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 32ceeb6fc8d..29dbd086a77 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker"; + name = "opentracker-2014-08-03"; src = fetchgit { url = "https://github.com/masroore/opentracker.git"; rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; @@ -21,4 +21,4 @@ stdenv.mkDerivation { platforms = platforms.linux; description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 3e10a1e4b54..6edc01041f2 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -1,7 +1,7 @@ { buildRubyGem, coreutils, fetchgit }: buildRubyGem { - name = "bundler-HEAD"; + name = "bundler-2015-01-11"; src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 510af3df824..481c80994e8 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "cppzmq"; + name = "cppzmq-2015-03-05"; src = fetchgit { url = "git://github.com/zeromq/cppzmq"; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 78932259841..754ab4233e5 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # No support yet for cg, cuda, glew, glut, openexr. - name = "nvidia-texture-tools"; + name = "nvidia-texture-tools-1388"; src = fetchsvn { url = "http://nvidia-texture-tools.googlecode.com/svn/trunk"; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 9ca3474ce3b..e503ade3ebc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,7 @@ , git, xlibs, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-HEAD"; + name = "xcb-util-cursor-0.1.1-3-gf03cc27"; src = fetchgit { url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 4449766767c..b134a842c5c 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: stdenv.mkDerivation { - name = "ocaml-optcomp"; + name = "ocaml-optcomp-1.6"; src = fetchurl { url = https://github.com/diml/optcomp/archive/1.6.tar.gz; md5 = "d3587244dba1b8b10f24d0b60a8c700d"; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 71148755a75..8884021c3a3 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "bossa"; + name = "bossa-2014-08-18"; src = fetchgit { url = https://github.com/shumatech/BOSSA; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index e1a87f22538..479004a9af4 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv"; }; + broken = true; # Not found + buildInputs = [python pil pygame SDL]; configurePhase = '' diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 75e071a05ef..9cf70db471c 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,9 +1,9 @@ { stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: stdenv.mkDerivation rec { - name = "xwiimote"; + name = "xwiimote-2"; src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-2/xwiimote-2.tar.xz"; + url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz"; sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index a95f9ae8613..49dd8bebaed 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -2,7 +2,7 @@ , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { - name = "xss-lock-git"; + name = "xss-lock-git-2014-03-02"; src = fetchgit { url = https://bitbucket.org/raymonad/xss-lock.git; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b30e0f61b1b..7f0e345a2b0 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "android-udev-rules"; + name = "android-udev-rules-2015-02-28"; src = fetchgit { url = "git://github.com/M0Rf30/android-udev-rules"; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 11c1e7ee8a2..406492db236 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libX11 }: stdenv.mkDerivation { - name = "disk-indicator"; + name = "disk-indicator-2014-05-19"; src = fetchgit { url = git://github.com/MeanEYE/Disk-Indicator.git; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index fea188f8949..62fbecf27d1 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: stdenv.mkDerivation { - name = "lightum"; + name = "lightum-2014-06-07"; src = fetchgit { url = https://github.com/poliva/lightum; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index ad77a7a1031..4491bb7bf93 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, xproto, xdotool, unzip }: stdenv.mkDerivation { - name = "seturgent"; + name = "seturgent-2012-08-17"; src = fetchurl { url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip"; @@ -24,4 +24,4 @@ stdenv.mkDerivation { homepage = https://github.com/hiltjo/seturgent; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index ebc0cffb3aa..afd2222918e 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,7 +4,7 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} { - name = "monetdb-may-2009"; + name = "monetdb-2009-05-01"; src = fetchurl { url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index d885a6ac902..c00efecc0b3 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { - name = "gvolicon"; + name = "gvolicon-2014-04-28"; src = fetchgit { url = "https://github.com/Unia/gvolicon"; rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index d6dcba32233..b0dfda6bfc7 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation rec { - name = "pa-applet"; + name = "pa-applet-2012-04-11"; src = fetchgit { url = "git://github.com/fernandotcl/pa-applet.git"; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index d7964c0961c..f65a151905c 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: stdenv.mkDerivation rec { - name = "pnmixer"; + name = "pnmixer-2014-07-24"; src = fetchgit { url = "git://github.com/nicklan/pnmixer.git"; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index de7ee27d704..552fa0c763d 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { rev = "4e2fa32816254907e82886b936afcae9859a876c"; sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; }; - buildInputs = [openssl]; + buildInputs = [ openssl ]; + broken = true; # No such repo installPhase = '' mkdir -p $out/bin cp vfdecrypt $out/bin diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index 0032eb24c97..d0f35844695 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { - name = "xflux"; + name = "xflux-2013-09-01"; src = fetchurl { url = https://justgetflux.com/linux/xflux64.tgz; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 88d75ba570e..4f0b68ce4be 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation { - name = "curl-unix-socket"; + name = "curl-unix-socket-2014-09-01"; src = fetchFromGitHub { owner = "Soulou"; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index d6f67d065d9..de04c1419e2 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, openresolv, coreutils }: stdenv.mkDerivation rec { - name = "update-resolv-conf"; + name = "update-resolv-conf-2014-10-03"; src = fetchgit { url = https://github.com/masterkorp/openvpn-update-resolv-conf/; diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix index 9a46740de51..e187a96dc0a 100644 --- a/pkgs/tools/networking/p2p/libtorrent/git.nix +++ b/pkgs/tools/networking/p2p/libtorrent/git.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: stdenv.mkDerivation { - name = "libtorrent-git"; + name = "libtorrent-git-2014-08-20"; src = fetchFromGitHub rec { owner = "rakshasa"; @@ -25,4 +25,4 @@ stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix index 6320a75f726..dcdd2e68e15 100644 --- a/pkgs/tools/networking/p2p/rtorrent/git.nix +++ b/pkgs/tools/networking/p2p/rtorrent/git.nix @@ -9,7 +9,7 @@ # https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc stdenv.mkDerivation { - name = "rtorrent-git"; + name = "rtorrent-git-2014-07-02"; src = fetchFromGitHub { owner = "rakshasa"; @@ -60,4 +60,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ codyopel ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix index 20413ca626c..282c3541dde 100644 --- a/pkgs/tools/security/fprint_demo/default.nix +++ b/pkgs/tools/security/fprint_demo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }: stdenv.mkDerivation rec { - name = "fprint_demo"; + name = "fprint_demo-2008-03-03"; src = fetchgit { url = "git://github.com/dsd/fprint_demo"; From fdc1887a6ea15685ae725f5c8a33e1f699d98294 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 00:14:58 +0200 Subject: [PATCH 038/412] doc: add user's guide for the Haskell infrastructure Resolves https://github.com/NixOS/nixpkgs/issues/4941. --- doc/haskell-users-guide.xml | 757 ++++++++++++++++++++++++++++++++++++ doc/manual.xml | 1 + 2 files changed, 758 insertions(+) create mode 100644 doc/haskell-users-guide.xml diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml new file mode 100644 index 00000000000..ca6c387e8df --- /dev/null +++ b/doc/haskell-users-guide.xml @@ -0,0 +1,757 @@ + + +User's Guide to the Haskell Infrastructure + +
+ How to install Haskell packages + + Nixpkgs distributes build instructions for all Haskell packages + registered on + Hackage, but + strangely enough normal Nix package lookups don't seem to discover + any of them: + + +$ nix-env -qa cabal-install +error: selector ‘cabal-install’ matches no derivations + +$ nix-env -i ghc +error: selector ‘ghc’ matches no derivations + + + The Haskell package set is not registered in the top-level namespace + because it is huge. If all Haskell packages + were visible to these commands, then name-based search/install + operations would be much slower than they are now. We avoided that + by keeping all Haskell-related packages in a separate attribute set + called haskellPackages, which the following + command will list: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskellPackages +haskellPackages.a50 a50-0.5 +haskellPackages.abacate haskell-abacate-0.0.0.0 +haskellPackages.abcBridge haskell-abcBridge-0.12 +haskellPackages.afv afv-0.1.1 +haskellPackages.alex alex-3.1.4 +haskellPackages.Allure Allure-0.4.101.1 +haskellPackages.alms alms-0.6.7 +[... some 8000 entries omitted ...] + + + To install any of those packages into your profile, refer to them by + their attribute path (first column): + + +$ nix-env -f "<nixpkgs>" -iA haskellPackages.Allure ... + + + The attribute path of any Haskell packages corresponds to the name + of that particular package on Hackage: the package + cabal-install has the attribute + haskellPackages.cabal-install, and so on. + (Actually, this convention causes trouble with packages like + 3dmodels and 4Blocks, because + these names are invalid identifiers in the Nix language. The issue + of how to deal with these rare corner cases is currently + unresolved.) + + + Haskell packages who's Nix name (second column) begins with a + haskell- prefix are packages that provide a + library whereas packages without that prefix provide just + executables. Libraries may provide executables too, though: the + package haskell-pandoc, for example, installs + both a library and an application. You can install and use Haskell + executables just like any other program in Nixpkgs, but using + Haskell libraries for development is a bit trickier and we'll + address that subject in great detail in section + How to + create a development environment. + + + Attribute paths are deterministic inside of Nixpkgs, but the path + necessary to reach Nixpkgs varies from system to system. We dodged + that problem by giving nix-env an explicit + -f "<nixpkgs>" parameter, but if + you call nix-env without that flag, then chances + are the invocation fails: + + +$ nix-env -iA haskellPackages.cabal-install +error: attribute ‘haskellPackages’ in selection path + ‘haskellPackages.cabal-install’ not found + + + On NixOS, for example, Nixpkgs does not exist + in the top-level namespace by default. To figure out the proper + attribute path, it's easiest to query for the path of a well-known + Nixpkgs package, i.e.: + + +$ nix-env -qaP coreutils +nixos.pkgs.coreutils coreutils-8.23 + + + If your system responds like that (most NixOS installatios will), + then the attribute path to haskellPackages is + nixos.pkgs.haskellPackages. Thus, if you want to + use nix-env without giving an explicit + -f flag, then that's the way to do it: + + +$ nix-env -qaP -A nixos.pkgs.haskellPackages +$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install + + + Our current default compiler is GHC 7.10.x and the + haskellPackages set contains packages built with + that particular version. Nixpkgs contains the latest major release + of every GHC since 6.10.4, however, and there is a whole family of + package sets available that defines Hackage packages built with each + of those compilers, too: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc6123 +$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc763 + + + The name haskellPackages is really just a synonym + for haskell.packages.ghc7101, because we prefer + that package set internally and recommend it to our users as their + default choice, but ultimately you are free to compile your Haskell + packages with any GHC version you please. The following command + displays the complete list of available compilers: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler +haskell.compiler.ghc6104 ghc-6.10.4 +haskell.compiler.ghc6123 ghc-6.12.3 +haskell.compiler.ghc704 ghc-7.0.4 +haskell.compiler.ghc722 ghc-7.2.2 +haskell.compiler.ghc742 ghc-7.4.2 +haskell.compiler.ghc763 ghc-7.6.3 +haskell.compiler.ghc784 ghc-7.8.4 +haskell.compiler.ghc7101 ghc-7.10.1 +haskell.compiler.ghcHEAD ghc-7.11.20150402 +haskell.compiler.ghcjs ghcjs-0.1.0 +haskell.compiler.jhc jhc-0.8.2 +haskell.compiler.uhc uhc-1.1.9.0 + + + We have no package sets for jhc or + uhc yet, unfortunately, but for every version of + GHC listed above, there exists a package set based on that compiler. + Also, the attributes haskell.compiler.ghcXYC and + haskell.packages.ghcXYC.ghc are synonymous for + the sake of convenience. + +
+
+ How to create a development environment +
+ How to install a compiler + + A simple development environment consists of a Haskell compiler + and the tool cabal-install, and we saw in + section How to + install Haskell packages how you can install those programs + into your user profile: + + +$ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install + + + Instead of the default package set + haskellPackages, you can also use the more + precise name haskell.compiler.ghc7101, which + has the advantage that it refers to the same GHC version + regardless of what Nixpkgs considers "default" at any + given time. + + + Once you've made those tools available in + $PATH, it's possible to build Hackage packages + the same way people without access to Nix do it all the time: + + +$ cabal get lens-4.11 && cd lens-4.11 +$ cabal install -j --dependencies-only +$ cabal configure +$ cabal build + + + If you enjoy working with Cabal sandboxes, then that's entirely + possible too: just execute the command + + +$ cabal sandbox init + + + before installing the required dependencies. + + + The nix-shell utility makes it easy to switch + to a different compiler version; just enter the Nix shell + environment with the command + + +$ nix-shell -p haskell.compiler.ghc784 + + + to bring GHC 7.8.4 into $PATH. Re-running + cabal configure switches your build to use that + compiler instead. If you're working on a project that doesn't + depend on any additional system libraries outside of GHC, then + it's sufficient even to run the cabal configure + command inside of the shell: + + +$ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" + + + Afterwards, all other commands like cabal build + work just fine in any shell environment, because the configure + phase recorded the absolute paths to all required tools like GHC + in its build configuration inside of the dist/ + directory. Please note, however, that + nix-collect-garbage can break such an + environment because the Nix store paths created by + nix-shell aren't "alive" anymore once + nix-shell has terminated. If you find that your + Haskell builds no longer work after garbage collection, then + you'll have to re-run cabal configure inside of + a new nix-shell environment. + +
+
+ How to install a compiler with libraries + + GHC expects to find all installed libraries inside of its own + lib directory. This approach works fine on + traditional Unix systems, but it doesn't work for Nix, because + GHC's store path is immutable once it's built. We cannot install + additional libraries into that location. As a consequence, our + copies of GHC don't know any packages except their own core + libraries, like base, + containers, Cabal, etc. + + + We can register additional libraries to GHC, however, using a + special build function called ghcWithPackages. + That function expects one argument: a function that maps from an + attribute set of Haskell packages to a list of packages, which + determines the libraries known to that particular version of GHC. + For example, the Nix expression + ghcWithPackages (pkgs: [pkgs.mtl]) generates a + copy of GHC that has the mtl library registered + in addition to its normal core packages: + + +$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" + +[nix-shell:~]$ ghc-pkg list mtl +/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d: + mtl-2.2.1 + + + This function allows users to define their own development + environment by means of an override. After adding the following + snippet to ~/.nixpkgs/config.nix, + + +{ + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; +} + + + it's possible to install that compiler with + nix-env -f "<nixpkgs>" -iA myHaskellEnv. + If you'd like to switch that development environment to a + different version of GHC, just replace the + ghc7101 bit in the previous definition with the + appropriate name. Of course, it's also possible to define any + number of these development environments! (You can't install two + of them into the same profile at the same time, though, because + that would result in file conflicts.) + + + The generated ghc program is a wrapper script + that re-directs the real GHC executable to use a new + lib directory --- one that we specifically + constructed to contain all those packages the user requested: + + +$ cat $(type -p ghc) +#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e +export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc +export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg +export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html +export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1 +exec /nix/store/j50p...-ghc-7.10.1/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" + + + The variables $NIX_GHC, + $NIX_GHCPKG, etc. point to the + new store path + ghcWithPackages constructed specifically for + this environment. The last line of the wrapper script then + executes the real ghc, but passes the path to + the new lib directory using GHC's + -B flag. + + + The purpose of those environment variables is to work around an + impurity in the popular + ghc-paths + library. That library promises to give its users access to GHC's + installation paths. Only, the library can't possible know that + path when it's compiled, because the path GHC considers its own is + determined only much later, when the user configures it through + ghcWithPackages. So we + patched + ghc-paths to return the paths found in those environment + variables at run-time rather than trying to guess them at + compile-time. + + + To make sure that mechanism works properly all the time, we + recommend that you set those variables to meaningful values in + your shell environment, too, i.e. by adding the following code to + your ~/.bashrc: + + +if type >/dev/null 2>&1 -p ghc; then + eval "$(egrep ^export "$(type -p ghc)")" +fi + + + If you are certain that you'll use only one GHC environment which + is located in your user profile, then you can use the following + code, too, which has the advantage that it doesn't contain any + paths from the Nix store, i.e. those settings always remain valid + even if a nix-env -u operation updates the GHC + environment in your profile: + + +if [ -e ~/.nix-profile/bin/ghc ]; then + export NIX_GHC="$HOME/.nix-profile/bin/ghc" + export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" + export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" + export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" +fi + +
+
+ How to create ad hoc environments for + <literal>nix-shell</literal> + + The easiest way to create an ad hoc development environment is to + run nix-shell with the appropriate GHC + environment given on the command-line: + + +nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" + + + For more sophisticated use-cases, however, it's more convenient to + save the desired configuration in a file called + shell.nix that looks like this: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +let + inherit (nixpkgs) pkgs; + ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ + monad-par mtl + ]); +in +pkgs.stdenv.mkDerivation { + name = "my-haskell-env-0"; + buildInputs = [ ghc ]; + shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; +} + + + Now run nix-shell --- or even + nix-shell --pure --- to enter a shell + environment that has the appropriate compiler in + $PATH. If you use --pure, + then add all other packages that your development environment + needs into the buildInputs attribute. If you'd + like to switch to a different compiler version, then pass an + appropriate compiler argument to the + expression, i.e. + nix-shell --argstr compiler ghc784. + + + If you need such an environment because you'd like to compile a + Hackage package outside of Nix --- i.e. because you're hacking on + the latest version from Git ---, then the package set provides + suitable nix-shell environments for you already! Every Haskell + package has an env attribute that provides a + shell environment suitable for compiling that particular package. + If you'd like to hack the lens library, for + example, then you just have to check out the source code and enter + the appropriate environment: + + + $ cabal get lens-4.11 && cd lens-4.11 + Downloading lens-4.11... + Unpacking to lens-4.11/ + + $ nix-shell "<nixpkgs>" -A haskellPackages.lens.env + [nix-shell:/tmp/lens-4.11]$ + + + At point, you can run cabal configure, + cabal build, and all the other development + commands. Note that you need cabal-install + installed in your $PATH already to use it here + --- the nix-shell environment does not provide + it. + +
+
+
+ How to create Nix builds for your own private Haskell + packages + + If your own Haskell packages have build instructions for Cabal, then + you can convert those automatically into build instructions for Nix + using the cabal2nix utility, which you can + install into your profile by running + nix-env -i cabal2nix. + +
+ How to build a stand-alone project + + For example, let's assume that you're working on a private project + called foo. To generate a Nix build expression + for it, change into the project's top-level directory and run the + command: + + +$ cabal2nix . >foo.nix + + + Then write the following snippet into a file called + default.nix: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } + + + Finally, store the following code in a file called + shell.nix: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +(import ./default.nix { inherit nixpkgs compiler; }).env + + + At this point, you can run nix-build to have + Nix compile your project and install it into a Nix store path. The + local directory will contain a symlink called + result after nix-build + returns that points into that location. Of course, passing the + flag --argstr compiler ghc763 allows switching + the build to any version of GHC currently supported. + + + Furthermore, you can call nix-shell to enter an + interactive development environment in which you can use + cabal configure and + cabal build to develop your code. That + environment will automatically contain a proper GHC derivation + with all the required libraries registered as well as all the + system-level libraries your package might need. + + + If your package does not depend on any system-level libraries, + then it's sufficient to run + + +$ nix-shell --command "cabal configure" + + + once to set up your build. cabal-install + determines the absolute paths to all resources required for the + build and writes them into a config file in the + dist/ directory. Once that's done, you can run + cabal build and any other command for that + project even outside of the nix-shell + environment. This feature is particularly nice for those of us who + like to edit their code with an IDE, like Emacs' + haskell-mode, because it's not necessary to + start Emacs inside of nix-shell just to make it find out the + necessary settings for building the project; + cabal-install has already done that for us. + + + If you want to do some quick-and-dirty hacking and don't want to + bother setting up a default.nix and + shell.nix file manually, then you can use the + --shell flag offered by + cabal2nix to have it generate a stand-alone + nix-shell environment for you. With that + feature, running + + +$ cabal2nix --shell . >shell.nix +$ nix-shell --command "cabal configure" + + + is usually enough to set up a build environment for any given + Haskell package. You can even use that generated file to run + nix-build, too: + + +$ nix-build shell.nix + +
+
+ How to build projects that depend on each other + + If you have multiple private Haskell packages that depend on each + other, then you'll have to register those packages in the Nixpkgs + set to make them visible for the dependency resolution performed + by callPackage. First of all, change into each + of your projects top-level directories and generate a + default.nix file with + cabal2nix: + + +$ cd ~/src/foo && cabal2nix . >default.nix +$ cd ~/src/bar && cabal2nix . >default.nix + + + Then edit your ~/.nixpkgs/config.nix file to + register those builds in the default Haskell package set: + + + { + packageOverrides = super: let self = super.pkgs; in + { + haskellPackages = super.haskellPackages.override { + overrides = self: super: { + foo = self.callPackage ../src/foo {}; + bar = self.callPackage ../src/bar {}; + }; + }; + }; + } + + + Once that's accomplished, + nix-env -f "<nixpkgs>" -qA haskellPackages + will show your packages like any other package from Hackage, and + you can build them + + +$ nix-build "<nixpkgs>" -A haskellPackages.foo + + + or enter an interactive shell environment suitable for building + them: + + +$ nix-shell "<nixpkgs>" -A haskellPackages.bar.env + +
+
+
+ Miscellaneous Topics +
+ How to build with profiling enabled + + Every Haskell package set takes a function called + overrides that you can use to manipulate the + package as much as you please. One useful application of this + feature is to replace the default mkDerivation + function with one that enables library profiling for all packages. + To accomplish that, add configure the following snippet in your + ~/.nixpkgs/config.nix file: + + +{ + packageOverrides = super: let self = super.pkgs; in + { + profiledHaskellPackages = self.haskellPackages.override { + overrides = self: super: { + mkDerivation = args: super.mkDerivation (args // { + enableLibraryProfiling = true; + }); + }; + }; + }; +} + +
+
+ How to override package versions in a compiler-specific + package set + + Nixpkgs provides the latest version of + ghc-events, + which is 0.4.4.0 at the time of this writing. This is fine for + users of GHC 7.10.x, but GHC 7.8.4 cannot compile that binary. + Now, one way to solve that problem is to register an older version + of ghc-events in the 7.8.x-specific package + set. The first step is to generate Nix build instructions with + cabal2nix: + + +$ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + + + Then add the override in ~/.nixpkgs/config.nix: + + +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; + }; + }; + }; + }; +} + + + This code is a little crazy, no doubt, but it's necessary because + the intuitive version + + +haskell.packages.ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; +}; + + + doesn't do what we want it to: that code replaces the + haskell package set in Nixpkgs with one that + contains only one entry,packages, which + contains only one entry ghc784. This override + loses the haskell.compiler set, and it loses + the haskell.packages.ghcXYZ sets for all + compilers but GHC 7.8.4. To avoid that problem, we have to perform + the convoluted little dance from above, iterating over each step + in hierarchy. + + + Once it's accomplished, however, we can install a variant of + ghc-events that's compiled with GHC 7.8.4: + + +nix-env -f "<nixpkgs>" -iA haskell.packages.ghc784.ghc-events + + + Unfortunately, it turns out that this build fails again while + executing the test suite! Apparently, the release archive on + Hackage is missing some data files that the test suite requires, + so we cannot run it. We accomplish that by re-generating the Nix + expression with the --no-check flag: + + +$ cabal2nix --no-check cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + + + Now the builds succeeds. + + + Of course, in the concrete example of + ghc-events this whole exercise is not an ideal + solution, because ghc-events can analyze the + output emitted by any version of GHC later than 6.12 regardless of + the compiler version that was used to build the `ghc-events' + executable, so strictly speaking there's no reason to prefer one + built with GHC 7.8.x in the first place. However, for users who + cannot use GHC 7.10.x at all for some reason, the approach of + downgrading to an older version might be useful. + +
+
+ How to recover from GHC's infamous non-deterministic library + ID bug + + GHC and distributed build farms don't get along well: + + +https://ghc.haskell.org/trac/ghc/ticket/4012 + + + When you see an error like this one + + +package foo-0.7.1.0 is broken due to missing package +text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 + + + then you have to download and re-install foo + and all its dependents from scratch: + + +# nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ + | nix-store --repair-path --option binary-caches http://hydra.nixos.org + + + If you're using additional Hydra servers other than + hydra.nixos.org, then it might be necessary to + purge the local caches that store data from those machines to + disable these binary channels for the duration of the previous + command, i.e. by running: + + +rm /nix/var/nix/binary-cache-v3.sqlite +rm /nix/var/nix/manifests/* +rm /nix/var/nix/channel-cache/* + +
+
+ Builds on Darwin fail with <literal>math.h</literal> not + found + + Users of GHC on Darwin have occasionally reported that builds + fail, because the compiler complains about a missing include file: + + +fatal error: 'math.h' file not found + + + The issue has been discussed at length in + ticket + 6390, and so far no good solution has been proposed. As a + work-around, users who run into this problem can configure the + environment variables + + +export NIX_CFLAGS_COMPILE="-idirafter /usr/include" +export NIX_CFLAGS_LINK="-L/usr/lib" + + + in their ~/.bashrc file to avoid the compiler + error. + +
+
+ + diff --git a/doc/manual.xml b/doc/manual.xml index 1b713b0c30c..a6400c98d6e 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,5 +18,6 @@ + From 8908471ecc1694fd09fa91bf18e88342986e3707 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 18:45:17 +0200 Subject: [PATCH 039/412] cygwin: add needed patches for boost 1.57.0 to build --- pkgs/development/libraries/boost/1.57.nix | 32 +- .../boost/cygwin-1.40.0-cstdint-cygwin.patch | 20 + .../cygwin-1.40.0-iostreams-cygwin.patch | 24 + .../boost/cygwin-1.40.0-python-cygwin.patch | 35 + .../boost/cygwin-1.40.0-regex-cygwin.patch | 15 + .../boost/cygwin-1.45.0-jam-cygwin.patch | 12 + .../boost/cygwin-1.50.0-jam-pep3149.patch | 11 + .../boost/cygwin-1.55.0-asio-MSG_EOR.patch | 14 + .../cygwin-1.55.0-interlocked-cygwin.patch | 11 + .../boost/cygwin-1.57.0-asio-cygwin.patch | 1835 +++++++++++++++++ .../boost/cygwin-1.57.0-config-cygwin.patch | 76 + .../boost/cygwin-1.57.0-context-cygwin.patch | 600 ++++++ .../cygwin-1.57.0-filesystem-cygwin.patch | 32 + .../boost/cygwin-1.57.0-locale-cygwin.patch | 81 + .../boost/cygwin-1.57.0-log-cygwin.patch | 46 + .../cygwin-1.57.0-smart_ptr-cygwin.patch | 77 + .../boost/cygwin-1.57.0-system-cygwin.patch | 22 + ...dora-boost-1.50.0-fix-non-utf8-files.patch | 22 + .../cygwin-fedora-boost-1.50.0-pool.patch | 122 ++ ...a-boost-1.54.0-locale-unused_typedef.patch | 11 + ...-boost-1.54.0-pool-max_chunks_shadow.patch | 14 + ...a-boost-1.54.0-python-unused_typedef.patch | 15 + ...in-fedora-boost-1.57.0-move-is_class.patch | 20 + ...cygwin-fedora-boost-1.57.0-mpl-print.patch | 31 + ...edora-boost-1.57.0-pool-test_linking.patch | 33 + ...edora-boost-1.57.0-signals2-weak_ptr.patch | 10 + ...a-boost-1.57.0-spirit-unused_typedef.patch | 19 + ...-fedora-boost-1.57.0-uuid-comparison.patch | 11 + 28 files changed, 3250 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix index 6393c6e0d30..906f796b032 100644 --- a/pkgs/development/libraries/boost/1.57.nix +++ b/pkgs/development/libraries/boost/1.57.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.57.0"; @@ -7,4 +7,34 @@ callPackage ./generic.nix (args // rec { url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2"; sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i"; }; + + patches = if stdenv.isCygwin then [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ] else null; }) diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch new file mode 100644 index 00000000000..61791c60d9e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch @@ -0,0 +1,20 @@ +These were fixed in ~1.7.0-46 + +--- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600 ++++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500 +@@ -40,15 +40,6 @@ + # include + # else + # include +- +-// There is a bug in Cygwin two _C macros +-# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) +-# undef INTMAX_C +-# undef UINTMAX_C +-# define INTMAX_C(c) c##LL +-# define UINTMAX_C(c) c##ULL +-# endif +- + # endif + + #ifdef __QNX__ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch new file mode 100644 index 00000000000..6641ba823b1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch @@ -0,0 +1,24 @@ +--- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500 ++++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500 +@@ -44,8 +44,7 @@ + //------------------Locale support--------------------------------------------// + + #ifndef BOOST_IOSTREAMS_NO_LOCALE +-# if defined(BOOST_NO_STD_LOCALE) || \ +- defined(__CYGWIN__) && \ ++# if defined(BOOST_NO_STD_LOCALE) && \ + ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \ + /**/ + # define BOOST_IOSTREAMS_NO_LOCALE +--- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500 ++++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500 +@@ -13,8 +13,7 @@ + + // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use. + #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX ) +-# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ +- !defined(__CYGWIN__) \ ++# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) + /**/ + # define BOOST_IOSTREAMS_WINDOWS + # else diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch new file mode 100644 index 00000000000..7932b0e124b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch @@ -0,0 +1,35 @@ +--- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600 ++++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500 +@@ -83,7 +83,7 @@ + # endif + # define BOOST_PYTHON_DECL_FORWARD + # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) +-# elif (defined(_WIN32) || defined(__CYGWIN__)) ++# elif defined(_WIN32) + # if defined(BOOST_PYTHON_SOURCE) + # define BOOST_PYTHON_DECL __declspec(dllexport) + # define BOOST_PYTHON_BUILD_DLL +--- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500 ++++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500 +@@ -82,8 +82,8 @@ + // Some things we need in order to get Python.h to work with compilers other + // than MSVC on Win32 + // +-#if defined(_WIN32) || defined(__CYGWIN__) +-# if defined(__GNUC__) && defined(__CYGWIN__) ++#if defined(_WIN32) ++# if defined(__GNUC__) + + # define SIZEOF_LONG 4 + +--- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500 ++++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500 +@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char + + }}} + +-# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE) ++# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE) + + # define BOOST_PYTHON_MODULE_INIT(name) \ + void init_module_##name(); \ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch new file mode 100644 index 00000000000..969bb814bd1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch @@ -0,0 +1,15 @@ +--- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600 ++++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500 +@@ -28,11 +28,7 @@ + + #ifndef BOOST_REGEX_NO_FILEITER + +-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32) +-#error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" +-#define BOOST_REGEX_FI_WIN32_MAP +-#define BOOST_REGEX_FI_POSIX_DIR +-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) ++#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) + #define BOOST_REGEX_FI_WIN32_MAP + #define BOOST_REGEX_FI_WIN32_DIR + #else diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch new file mode 100644 index 00000000000..1a00851fa92 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch @@ -0,0 +1,12 @@ +OS_CYGWIN is used to assume cygpath, Win32-isms + +--- boost_1_48_0/tools/build/src/engine/jam.h ++++ boost_1_48_0/tools/build/src/engine/jam.h +@@ -245,7 +245,6 @@ + #endif + #if defined(__cygwin__) || defined(__CYGWIN__) + #define OSMINOR "OS=CYGWIN" +- #define OS_CYGWIN + #endif + #if defined(__FreeBSD__) && !defined(__DragonFly__) + #define OSMINOR "OS=FREEBSD" diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch new file mode 100644 index 00000000000..4bc6ec9d36e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch @@ -0,0 +1,11 @@ +--- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500 ++++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600 +@@ -376,7 +376,7 @@ local rule path-to-native ( paths * ) + # + local rule split-version ( version ) + { +- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ; ++ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ; + if ! $(major-minor[2]) || $(major-minor[3]) + { + ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch new file mode 100644 index 00000000000..46308a59cb0 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch @@ -0,0 +1,14 @@ +--- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500 ++++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500 +@@ -332,7 +332,11 @@ typedef int signed_size_type; + # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB + # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK + # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE ++#ifdef MSG_EOR + # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR ++#else ++# define BOOST_ASIO_OS_DEF_MSG_EOR 0 ++#endif + # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD + # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR + # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch new file mode 100644 index 00000000000..df3edf51e7b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch @@ -0,0 +1,11 @@ +--- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500 ++++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500 +@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc + ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange))) + # endif + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport) + diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch new file mode 100644 index 00000000000..3702d475c8e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch @@ -0,0 +1,1835 @@ +--- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500 +@@ -42,7 +42,7 @@ protected: + BOOST_ASIO_DECL static void init_native_buffer( + native_buffer_type& buf, + const boost::asio::const_buffer& buffer); +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + // The maximum number of buffers to support in a single operation. + enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; + +@@ -61,7 +61,7 @@ protected: + buf.buf = const_cast(boost::asio::buffer_cast(buffer)); + buf.len = static_cast(boost::asio::buffer_size(buffer)); + } +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + // The maximum number of buffers to support in a single operation. + enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; + +@@ -92,7 +92,7 @@ protected: + boost::asio::buffer_cast(buffer))); + iov.iov_len = boost::asio::buffer_size(buffer); + } +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + }; + + // Helper class to translate buffers into the native buffer representation. +--- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500 +@@ -474,7 +474,7 @@ + #endif // !defined(BOOST_ASIO_WINDOWS) + + // Windows: target OS version. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) + # if defined(_MSC_VER) || defined(__BORLANDC__) + # pragma message( \ +@@ -512,29 +512,29 @@ + # error You must add -D__USE_W32_SOCKETS to your compiler options. + # endif // !defined(__USE_W32_SOCKETS) + # endif // defined(__CYGWIN__) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: minimise header inclusion. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) + # if !defined(WIN32_LEAN_AND_MEAN) + # define WIN32_LEAN_AND_MEAN + # endif // !defined(WIN32_LEAN_AND_MEAN) + # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: suppress definition of "min" and "max" macros. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(BOOST_ASIO_NO_NOMINMAX) + # if !defined(NOMINMAX) + # define NOMINMAX 1 + # endif // !defined(NOMINMAX) + # endif // !defined(BOOST_ASIO_NO_NOMINMAX) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: IO Completion Ports. + #if !defined(BOOST_ASIO_HAS_IOCP) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) + # if !defined(UNDER_CE) + # if !defined(BOOST_ASIO_DISABLE_IOCP) +@@ -542,7 +542,7 @@ + # endif // !defined(BOOST_ASIO_DISABLE_IOCP) + # endif // !defined(UNDER_CE) + # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + #endif // !defined(BOOST_ASIO_HAS_IOCP) + + // Linux: epoll, eventfd and timerfd. +@@ -599,8 +599,7 @@ + #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) + # if defined(BOOST_ASIO_HAS_IOCP) \ + || !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # if !defined(__SYMBIAN32__) + # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) + # define BOOST_ASIO_HAS_SERIAL_PORT 1 +@@ -609,7 +608,6 @@ + # endif // defined(BOOST_ASIO_HAS_IOCP) + // || !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT) + + // Windows: stream handles. +@@ -633,11 +631,11 @@ + // Windows: object handles. + #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) + # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if !defined(UNDER_CE) + # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 + # endif // !defined(UNDER_CE) +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) + #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) + +@@ -654,12 +652,10 @@ + #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) + # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) + #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) + +@@ -667,12 +663,10 @@ + #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) + # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) + #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) + +@@ -680,12 +674,10 @@ + #if !defined(BOOST_ASIO_HAS_SIGACTION) + # if !defined(BOOST_ASIO_DISABLE_SIGACTION) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_SIGACTION 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION) + #endif // !defined(BOOST_ASIO_HAS_SIGACTION) + +@@ -700,7 +692,7 @@ + + // Can use getaddrinfo() and getnameinfo(). + #if !defined(BOOST_ASIO_HAS_GETADDRINFO) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) + # define BOOST_ASIO_HAS_GETADDRINFO 1 + # elif defined(UNDER_CE) +--- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d, + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP +--- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -116,6 +116,6 @@ private: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP +--- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -116,6 +116,6 @@ private: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP +--- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500 +@@ -26,7 +26,7 @@ namespace boost { + namespace asio { + namespace detail { + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef win_fd_set_adapter fd_set_adapter; + #else + typedef posix_fd_set_adapter fd_set_adapter; +--- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500 +@@ -21,9 +21,9 @@ + #include + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # include +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( + + (reinterpret_cast(p) >> 3); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + inline std::size_t calculate_hash_value(SOCKET s) + { + return static_cast(s); + } +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Note: assumes K and V are POD types. + template +--- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500 +@@ -21,8 +21,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + +@@ -448,6 +447,5 @@ int poll_write(int d, state_type state, + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP +--- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500 +@@ -19,7 +19,6 @@ + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + #if !defined(BOOST_ASIO_WINDOWS) +-#if !defined(__CYGWIN__) + #if !defined(__SYMBIAN32__) + #if !defined(BOOST_ASIO_HAS_EVENTFD) + +@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset() + + #endif // !defined(BOOST_ASIO_HAS_EVENTFD) + #endif // !defined(__SYMBIAN32__) +-#endif // !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_WINDOWS) + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +--- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_ + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP +--- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500 +@@ -19,7 +19,7 @@ + #include + + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) + + #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP +--- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500 +@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_ + max_fd = fd_sets_[i].max_descriptor(); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Connection operations on Windows use both except and write fd_sets. + have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty(); + fd_sets_[write_op].set(op_queue_[connect_op], ops); +@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_ + fd_sets_[except_op].set(op_queue_[connect_op], ops); + if (fd_sets_[except_op].max_descriptor() > max_fd) + max_fd = fd_sets_[except_op].max_descriptor(); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // We can return immediately if there's no work to do and the reactor is + // not supposed to block. +@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_ + // Dispatch all ready operations. + if (retval > 0) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Connection operations on Windows use both except and write fd_sets. + fd_sets_[except_op].perform(op_queue_[connect_op], ops); + fd_sets_[write_op].perform(op_queue_[connect_op], ops); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Exception operations must be processed first to ensure that any + // out-of-band data is read before normal data. +--- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500 +@@ -60,12 +60,10 @@ signal_state* get_signal_state() + void boost_asio_signal_handler(int signal_number) + { + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) ++ || defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_set_service::deliver_signal(signal_number); + #else // defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + int saved_errno = errno; + signal_state* state = get_signal_state(); + signed_size_type result = ::write(state->write_descriptor_, +@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa + errno = saved_errno; + #endif // defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + + #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) + ::signal(signal_number, boost_asio_signal_handler); +@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa + } + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + class signal_set_service::pipe_read_op : public reactor_op + { + public: +@@ -115,30 +111,25 @@ public: + }; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + signal_set_service::signal_set_service( + boost::asio::io_service& io_service) + : io_service_(boost::asio::use_service(io_service)), + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + reactor_(boost::asio::use_service(io_service)), + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + next_(0), + prev_(0) + { + get_signal_state()->mutex_.init(); + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + reactor_.init_task(); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + for (int i = 0; i < max_signal_number; ++i) + registrations_[i] = 0; +@@ -174,8 +165,7 @@ void signal_set_service::fork_service( + boost::asio::io_service::fork_event fork_ev) + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + static_mutex::scoped_lock lock(state->mutex_); + +@@ -217,11 +207,9 @@ void signal_set_service::fork_service( + } + #else // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + (void)fork_ev; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::construct( +@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser + if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + delete new_registration; + return ec; + } +@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser + if (::signal(signal_number, SIG_DFL) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + return ec; + } + } +@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser + if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + return ec; + } + } +@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig + signal_state* state = get_signal_state(); + static_mutex::scoped_lock lock(state->mutex_); + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // If this is the first service to be created, open a new pipe. + if (state->service_list_ == 0) + open_descriptors(); +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + // Insert service into linked list of all services. + service->next_ = state->service_list_; +@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig + state->service_list_ = service; + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Register for pipe readiness notifications. + int read_descriptor = state->read_descriptor_; + lock.unlock(); +@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig + read_descriptor, service->reactor_data_, new pipe_read_op); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::remove_service(signal_set_service* service) +@@ -534,8 +520,7 @@ void signal_set_service::remove_service( + if (service->next_ || service->prev_ || state->service_list_ == service) + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Disable the pipe readiness notifications. + int read_descriptor = state->read_descriptor_; + lock.unlock(); +@@ -544,7 +529,6 @@ void signal_set_service::remove_service( + lock.lock(); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + // Remove service from linked list of all services. + if (state->service_list_ == service) +@@ -556,19 +540,18 @@ void signal_set_service::remove_service( + service->next_ = 0; + service->prev_ = 0; + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // If this is the last service to be removed, close the pipe. + if (state->service_list_ == 0) + close_descriptors(); +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + } + } + + void signal_set_service::open_descriptors() + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + + int pipe_fds[2]; +@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor + } + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::close_descriptors() + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + + if (state->read_descriptor_ != -1) +@@ -612,7 +593,6 @@ void signal_set_service::close_descripto + state->write_descriptor_ = -1; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::start_wait_op( +--- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 +@@ -33,12 +33,12 @@ + # include + #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ ++#if defined(BOOST_ASIO_WINDOWS) \ + || defined(__MACH__) && defined(__APPLE__) + # if defined(BOOST_ASIO_HAS_PTHREADS) + # include + # endif // defined(BOOST_ASIO_HAS_PTHREADS) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + // || defined(__MACH__) && defined(__APPLE__) + + #include +@@ -50,9 +50,9 @@ namespace socket_ops { + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + struct msghdr { int msg_namelen; }; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #if defined(__hpux) + // HP-UX doesn't declare these functions extern "C", so they are declared again +@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c + + inline void clear_last_error() + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + WSASetLastError(0); + #else + errno = 0; +@@ -78,7 +78,7 @@ template + inline ReturnType error_wrapper(ReturnType return_value, + boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(WSAGetLastError(), + boost::asio::error::get_system_category()); + #else +@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::closesocket(s), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::close(s), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + if (result != 0 + && (ec == boost::asio::error::would_block +@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta + // current OS where this behaviour is seen, Windows, says that the socket + // remains open. Therefore we'll put the descriptor back into blocking + // mode and have another attempt at closing it. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = 0; + ::ioctlsocket(s, FIONBIO, &arg); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + # if defined(__SYMBIAN32__) + int flags = ::fcntl(s, F_GETFL, 0); + if (flags >= 0) +@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta + ioctl_arg_type arg = 0; + ::ioctl(s, FIONBIO, &arg); + # endif // defined(__SYMBIAN32__) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + state &= ~non_blocking; + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::closesocket(s), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::close(s), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + } + +@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = (value ? 1 : 0); + int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); + #elif defined(__SYMBIAN32__) +@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = (value ? 1 : 0); + int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); + #elif defined(__SYMBIAN32__) +@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, + // Check if the connect operation has finished. This is required since we may + // get spurious readiness notifications from the reactor. + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set write_fds; + FD_ZERO(&write_fds); +@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, + zero_timeout.tv_usec = 0; + int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, + fds.revents = 0; + int ready = ::poll(&fds, 1, 0); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (ready == 0) + { +@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, + int socketpair(int af, int type, int protocol, + socket_type sv[2], boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(af); + (void)(type); + (void)(protocol); +@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy + + #if defined(SIOCATMARK) + ioctl_arg_type value = 0; +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + if (result == 0) + ec = boost::system::error_code(); + # if defined(ENOTTY) +@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s + } + + ioctl_arg_type value = 0; +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + if (result == 0) + ec = boost::system::error_code(); + #if defined(ENOTTY) +@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v + base = static_cast(addr); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef WSABUF buf; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + typedef iovec buf; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + void init_buf(buf& b, void* data, size_t size) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + b.buf = static_cast(data); + b.len = static_cast(size); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + init_buf_iov_base(b.iov_base, data); + b.iov_len = size; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + void init_buf(buf& b, const void* data, size_t size) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + b.buf = static_cast(const_cast(data)); + b.len = static_cast(size); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + init_buf_iov_base(b.iov_base, const_cast(data)); + b.iov_len = size; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) +@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf + int flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Receive some data. + DWORD recv_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = bufs; + msg.msg_iovlen = static_cast(count); +@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recv(socket_type s, state_type state, buf* bufs, +@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Receive some data. + DWORD recv_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + init_msghdr_msg_name(msg.msg_name, addr); + msg.msg_namelen = static_cast(*addrlen); +@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, +@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, + int in_flags, int& out_flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + out_flags = 0; + return socket_ops::recv(s, bufs, count, in_flags, ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = bufs; + msg.msg_iovlen = static_cast(count); +@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, + else + out_flags = 0; + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recvmsg(socket_type s, state_type state, +@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con + int flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Send the data. + DWORD send_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = const_cast(bufs); + msg.msg_iovlen = static_cast(count); +@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_send(socket_type s, state_type state, const buf* bufs, +@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Send the data. + DWORD send_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + init_msghdr_msg_name(msg.msg_name, addr); + msg.msg_namelen = static_cast(addrlen); +@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_sendto(socket_type s, state_type state, const buf* bufs, +@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, + WSA_FLAG_OVERLAPPED), ec); + if (s == invalid_socket) +@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type + } + ec = boost::asio::error::fault; + return socket_error_retval; +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + clear_last_error(); + int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, + s, level, optname, optval, optlen), ec); +@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type + if (result == 0) + ec = boost::system::error_code(); + return result; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + clear_last_error(); + int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, + s, level, optname, optval, optlen), ec); +@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type + if (result == 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + template +@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad + return socket_error_retval; + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (cached) + { + // Check if socket is still connected. +@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad + ec = boost::system::error_code(); + return 0; + } +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + (void)cached; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + clear_last_error(); + int result = error_wrapper(call_getpeername( +@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); + #elif defined(__MACH__) && defined(__APPLE__) \ + || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd + fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (!readfds && !writefds && !exceptfds && timeout) + { + DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; +@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd + if (timeout && timeout->tv_sec == 0 + && timeout->tv_usec > 0 && timeout->tv_usec < 1000) + timeout->tv_usec = 1000; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #if defined(__hpux) && defined(__SELECT) + timespec ts; +@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set fds; + FD_ZERO(&fds); +@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::poll(&fds, 1, timeout), ec); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (result == 0) + ec = (state & user_set_non_blocking) +@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set fds; + FD_ZERO(&fds); +@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::poll(&fds, 1, timeout), ec); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (result == 0) + ec = (state & user_set_non_blocking) +@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set write_fds; + FD_ZERO(&write_fds); +@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s + ec = boost::system::error_code(); + return result; + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s + ec = boost::system::error_code(); + return result; + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + } + +@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void + ec = boost::asio::error::address_family_not_supported; + return 0; + } +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + using namespace std; // For memcpy. + + if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) +@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void + ec = boost::asio::error::invalid_argument; + + return result == socket_error_retval ? 0 : dest; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + const char* result = error_wrapper(::inet_ntop( + af, src, dest, static_cast(length)), ec); + if (result == 0 && !ec) +@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void + strcat(dest, if_name); + } + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + int inet_pton(int af, const char* src, void* dest, +@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v + ec = boost::asio::error::address_family_not_supported; + return -1; + } +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + using namespace std; // For memcpy and strcmp. + + if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) +@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v + ec = boost::system::error_code(); + + return result == socket_error_retval ? -1 : 1; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::inet_pton(af, src, dest), ec); + if (result <= 0 && !ec) + ec = boost::asio::error::invalid_argument; +@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v + } + } + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + int gethostname(char* name, int namelen, boost::system::error_code& ec) +@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char + hostent* result, char* buffer, int buflength, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(buffer); + (void)(buflength); + hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); +@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char + char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(buffer); + (void)(buflength); + (void)(ai_flags); +@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla + case EAI_SOCKTYPE: + return boost::asio::error::socket_type_not_supported; + default: // Possibly the non-portable EAI_SYSTEM. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + return boost::system::error_code( + WSAGetLastError(), boost::asio::error::get_system_category()); + #else +@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co + host = (host && *host) ? host : 0; + service = (service && *service) ? service : 0; + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + int error = ::getaddrinfo(host, service, &hints, result); +@@ -3213,7 +3201,7 @@ boost::system::error_code background_get + + void freeaddrinfo(addrinfo_type* ai) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + ::freeaddrinfo(ai); +@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co + std::size_t addrlen, char* host, std::size_t hostlen, + char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + clear_last_error(); +--- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() + #include + + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) +--- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP +--- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -54,6 +54,6 @@ private: + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP +--- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_HAS_THREADS) \ + || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -65,7 +64,6 @@ public: + #endif // !defined(BOOST_ASIO_HAS_THREADS) + // || defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP +--- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + // Guess whether we are building against on old Platform SDK. + #if !defined(IN6ADDR_ANY_INIT) +@@ -211,6 +211,6 @@ struct addrinfo_emulation + # define IPPROTO_ICMPV6 58 + #endif + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP +--- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 +@@ -19,7 +19,6 @@ + + #if !defined(BOOST_ASIO_WINDOWS) + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) +-#if !defined(__CYGWIN__) + #if !defined(__SYMBIAN32__) + #if !defined(BOOST_ASIO_HAS_EVENTFD) + +@@ -84,7 +83,6 @@ private: + + #endif // !defined(BOOST_ASIO_HAS_EVENTFD) + #endif // !defined(__SYMBIAN32__) +-#endif // !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) + #endif // !defined(BOOST_ASIO_WINDOWS) + +--- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 +@@ -18,7 +18,6 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(__CYGWIN__) \ + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include +@@ -114,7 +113,6 @@ private: + #include + + #endif // !defined(BOOST_ASIO_WINDOWS) +- // && !defined(__CYGWIN__) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP +--- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -319,6 +318,5 @@ private: + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP +--- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 +@@ -19,7 +19,7 @@ + #include + + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -230,7 +230,7 @@ private: + # include + #endif // defined(BOOST_ASIO_HEADER_ONLY) + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) + + #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP +--- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 +@@ -19,7 +19,7 @@ + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) + # include + #elif defined(BOOST_ASIO_HAS_EVENTFD) + # include +@@ -31,7 +31,7 @@ namespace boost { + namespace asio { + namespace detail { + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) + typedef socket_select_interrupter select_interrupter; + #elif defined(BOOST_ASIO_HAS_EVENTFD) + typedef eventfd_select_interrupter select_interrupter; +--- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 +@@ -51,13 +51,13 @@ class select_reactor + : public boost::asio::detail::service_base + { + public: +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + enum op_types { read_op = 0, write_op = 1, except_op = 2, + max_select_ops = 3, connect_op = 3, max_ops = 4 }; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + enum op_types { read_op = 0, write_op = 1, except_op = 2, + max_select_ops = 3, connect_op = 1, max_ops = 3 }; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Per-descriptor data. + struct per_descriptor_data +--- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 +@@ -19,7 +19,7 @@ + + #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++ || defined(__SYMBIAN32__) + # include + #elif defined(BOOST_ASIO_HAS_PTHREADS) + # include +@@ -33,7 +33,7 @@ namespace detail { + + #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++ || defined(__SYMBIAN32__) + typedef null_signal_blocker signal_blocker; + #elif defined(BOOST_ASIO_HAS_PTHREADS) + typedef posix_signal_blocker signal_blocker; +--- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -44,6 +44,6 @@ public: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP +--- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 +@@ -28,9 +28,9 @@ + #include + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + # include +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -183,8 +183,7 @@ private: + io_service_impl& io_service_; + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // The type used for registering for pipe reactor notifications. + class pipe_read_op; + +@@ -195,7 +194,6 @@ private: + reactor::per_descriptor_data reactor_data_; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + // A mapping from signal number to the registered signal sets. + registration* registrations_[max_signal_number]; +--- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 +@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ + BOOST_ASIO_DECL int listen(socket_type s, + int backlog, boost::system::error_code& ec); + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef WSABUF buf; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + typedef iovec buf; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); + +--- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -85,7 +84,6 @@ private: + #endif // defined(BOOST_ASIO_HEADER_ONLY) + + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) +--- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 +@@ -19,7 +19,7 @@ + + #if defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Empty. +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) + # error WinSock.h has already been included + # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) +@@ -169,7 +169,7 @@ typedef int signed_size_type; + # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 + # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 + # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + typedef SOCKET socket_type; + const SOCKET invalid_socket = INVALID_SOCKET; + const int socket_error_retval = SOCKET_ERROR; +--- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -146,6 +146,6 @@ private: + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP +--- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini + # include + #endif // defined(BOOST_ASIO_HEADER_ONLY) + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP +--- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 +@@ -20,7 +20,6 @@ + #include + #include + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) + # include + #else +@@ -45,7 +44,7 @@ + # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) + # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) + # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_NATIVE_ERROR(e) e + # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e + # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e +@@ -225,7 +224,7 @@ inline const boost::system::error_catego + return boost::system::system_category(); + } + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + extern BOOST_ASIO_DECL + const boost::system::error_category& get_netdb_category(); +@@ -233,7 +232,7 @@ const boost::system::error_category& get + extern BOOST_ASIO_DECL + const boost::system::error_category& get_addrinfo_category(); + +-#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#else // !defined(BOOST_ASIO_WINDOWS) + + inline const boost::system::error_category& get_netdb_category() + { +@@ -245,7 +244,7 @@ inline const boost::system::error_catego + return get_system_category(); + } + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + extern BOOST_ASIO_DECL + const boost::system::error_category& get_misc_category(); +--- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 +@@ -25,7 +25,7 @@ namespace boost { + namespace asio { + namespace error { + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + namespace detail { + +@@ -87,7 +87,7 @@ const boost::system::error_category& get + return instance; + } + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + namespace detail { + +--- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 +@@ -27,7 +27,7 @@ + + #if defined(GENERATING_DOCUMENTATION) + # define BOOST_ASIO_OPTION_STORAGE implementation_defined +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_OPTION_STORAGE DCB + #else + # define BOOST_ASIO_OPTION_STORAGE termios +@@ -41,7 +41,7 @@ namespace asio { + boost::system::error_code serial_port_base::baud_rate::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.BaudRate = value_; + #else + speed_t baud; +@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::baud_rate::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + value_ = storage.BaudRate; + #else + speed_t baud = ::cfgetospeed(&storage); +@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con + boost::system::error_code serial_port_base::flow_control::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.fOutxCtsFlow = FALSE; + storage.fOutxDsrFlow = FALSE; + storage.fTXContinueOnXoff = TRUE; +@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::flow_control::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.fOutX && storage.fInX) + { + value_ = software; +@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ + boost::system::error_code serial_port_base::parity::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + switch (value_) + { + case none: +@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::parity::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.Parity == EVENPARITY) + { + value_ = even; +@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( + boost::system::error_code serial_port_base::stop_bits::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + switch (value_) + { + case one: +@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::stop_bits::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.StopBits == ONESTOPBIT) + { + value_ = one; +@@ -507,7 +507,7 @@ serial_port_base::character_size::charac + boost::system::error_code serial_port_base::character_size::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.ByteSize = value_; + #else + storage.c_cflag &= ~CSIZE; +@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::character_size::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + value_ = storage.ByteSize; + #else + if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } +--- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 +@@ -24,7 +24,7 @@ + #include + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # include + #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ + || defined(__osf__) +@@ -600,7 +600,7 @@ public: + friend bool has_service(io_service& ios); + + private: +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + detail::winsock_init<> init_; + #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ + || defined(__osf__) +--- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 +@@ -21,16 +21,16 @@ + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ + || defined(GENERATING_DOCUMENTATION) + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + # include +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #include + #include + + #if defined(GENERATING_DOCUMENTATION) + # define BOOST_ASIO_OPTION_STORAGE implementation_defined +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_OPTION_STORAGE DCB + #else + # define BOOST_ASIO_OPTION_STORAGE termios +--- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 +@@ -85,15 +85,15 @@ public: + private: + static unsigned long openssl_id_func() + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + return ::GetCurrentThreadId(); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + void* id = instance()->thread_id_; + if (id == 0) + instance()->thread_id_ = id = &id; // Ugh. + BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); + return reinterpret_cast(id); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + static void openssl_locking_func(int mode, int n, +@@ -109,10 +109,10 @@ private: + std::vector > mutexes_; + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // The thread identifiers to be used by openssl. + boost::asio::detail::tss_ptr thread_id_; +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #if !defined(SSL_OP_NO_COMPRESSION) \ + && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch new file mode 100644 index 00000000000..97acc72689d --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch @@ -0,0 +1,76 @@ +--- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 ++++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 +@@ -39,18 +39,8 @@ + #define BOOST_HAS_STDINT_H + #endif + +-/// Cygwin has no fenv.h +-#define BOOST_NO_FENV_H +- + // boilerplate code: + #include +- +-// +-// Cygwin lies about XSI conformance, there is no nl_types.h: +-// +-#ifdef BOOST_HAS_NL_TYPES_H +-# undef BOOST_HAS_NL_TYPES_H +-#endif + + + +--- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 +@@ -68,7 +68,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 +@@ -41,7 +41,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 +@@ -17,7 +17,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 +@@ -13,7 +13,7 @@ + #define BOOST_NO_STD_MESSAGES + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 ++++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 +@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) + defined(__CYGWIN__) \ + ) + # undef BOOST_OS_CYGWIN +-# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE ++# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE + #endif + + #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch new file mode 100644 index 00000000000..3d9726179be --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch @@ -0,0 +1,600 @@ +--- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 ++++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 +@@ -29,6 +29,7 @@ local rule default_binary_format ( ) + local tmp = elf ; + if [ os.name ] = "MACOSX" { tmp = mach-o ; } + if [ os.name ] = "NT" { tmp = pe ; } ++ if [ os.name ] = "CYGWIN" { tmp = pe ; } + if [ os.name ] = "AIX" { tmp = xcoff ; } + return $(tmp) ; + } +@@ -581,6 +582,16 @@ alias asm_context_sources + ; + + alias asm_context_sources ++ : asm/make_i386_ms_pe_gas.S ++ asm/jump_i386_ms_pe_gas.S ++ dummy.cpp ++ : 32 ++ x86 ++ pe ++ gcc ++ ; ++ ++alias asm_context_sources + : asm/make_i386_ms_pe_masm.asm + asm/jump_i386_ms_pe_masm.asm + dummy.cpp +@@ -715,6 +726,16 @@ alias asm_context_sources + ; + + alias asm_context_sources ++ : asm/make_x86_64_ms_pe_gas.S ++ asm/jump_x86_64_ms_pe_gas.S ++ dummy.cpp ++ : 64 ++ x86 ++ pe ++ gcc ++ ; ++ ++alias asm_context_sources + : asm/make_x86_64_ms_pe_masm.asm + asm/jump_x86_64_ms_pe_masm.asm + dummy.cpp +--- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 +@@ -0,0 +1,108 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/******************************************************************** ++ * * ++ * -------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | * ++ * -------------------------------------------------------------- * ++ * | 0h | 04h | 08h | 0ch | 010h | 014h | * ++ * -------------------------------------------------------------- * ++ * | EDI | ESI | EBX | EBP | ESP | EIP | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 6 | 7 | 8 | | * ++ * -------------------------------------------------------------- * ++ * | 018h | 01ch | 020h | | * ++ * -------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 9 | | * ++ * -------------------------------------------------------------- * ++ * | 024h | | * ++ * -------------------------------------------------------------- * ++ * |fc_execpt| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 10 | | * ++ * -------------------------------------------------------------- * ++ * | 028h | | * ++ * -------------------------------------------------------------- * ++ * |fc_strage| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 11 | 12 | | * ++ * -------------------------------------------------------------- * ++ * | 02ch | 030h | | * ++ * -------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| | * ++ * -------------------------------------------------------------- * ++ * * ++ * *****************************************************************/ ++ ++.file "jump_i386_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl _jump_fcontext ++.def _jump_fcontext; .scl 2; .type 32; .endef ++_jump_fcontext: ++ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ ++ movl %edi, (%ecx) /* save EDI */ ++ movl %esi, 0x04(%ecx) /* save ESI */ ++ movl %ebx, 0x08(%ecx) /* save EBX */ ++ movl %ebp, 0x0c(%ecx) /* save EBP */ ++ ++ movl %fs:(0x18), %edx /* load NT_TIB */ ++ movl (%edx), %eax /* load current SEH exception list */ ++ movl %eax, 0x24(%ecx) /* save current exception list */ ++ movl 0x04(%edx), %eax /* load current stack base */ ++ movl %eax, 0x18(%ecx) /* save current stack base */ ++ movl 0x08(%edx), %eax /* load current stack limit */ ++ movl %eax, 0x20(%ecx) /* save current stack limit */ ++ movl 0x10(%edx), %eax /* load fiber local storage */ ++ movl %eax, 0x28(%ecx) /* save fiber local storage */ ++ ++ leal 0x04(%esp), %eax /* exclude the return address */ ++ movl %eax, 0x10(%ecx) /* save as stack pointer */ ++ movl (%esp), %eax /* load return address */ ++ movl %eax, 0x14(%ecx) /* save return address */ ++ ++ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ ++ movl (%edx), %edi /* restore EDI */ ++ movl 0x04(%edx), %esi /* restore ESI */ ++ movl 0x08(%edx), %ebx /* restore EBX */ ++ movl 0x0c(%edx), %ebp /* restore EBP */ ++ ++ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ ++ testl %eax, %eax ++ je 1f ++ ++ stmxcsr 0x2c(%ecx) /* save MMX control word */ ++ fnstcw 0x30(%ecx) /* save x87 control word */ ++ ldmxcsr 0x2c(%edx) /* restore MMX control word */ ++ fldcw 0x30(%edx) /* restore x87 control word */ ++1: ++ movl %edx, %ecx ++ movl %fs:(0x18), %edx /* load NT_TIB */ ++ movl 0x24(%ecx), %eax /* load SEH exception list */ ++ movl %eax, (%edx) /* restore next SEH item */ ++ movl 0x18(%ecx), %eax /* load stack base */ ++ movl %eax, 0x04(%edx) /* restore stack base */ ++ movl 0x20(%ecx), %eax /* load stack limit */ ++ movl %eax, 0x08(%edx) /* restore stack limit */ ++ movl 0x28(%ecx), %eax /* load fiber local storage */ ++ movl %eax, 0x10(%edx) /* restore fiber local storage */ ++ ++ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ ++ ++ movl 0x10(%ecx), %esp /* restore ESP */ ++ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ ++ movl 0x14(%ecx), %ecx /* fetch the address to return to */ ++ ++ jmp *%ecx /* indirect jump to context */ +--- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 +@@ -0,0 +1,189 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/**************************************************************************************** ++ * * ++ * ---------------------------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++ * ---------------------------------------------------------------------------------- * ++ * | R12 | R13 | R14 | R15 | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++ * ---------------------------------------------------------------------------------- * ++ * | RDI | RSI | RBX | RBP | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x40 | 0x44 | 0x48 | 0x4c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | RSP | RIP | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 20 | 21 | 22 | 23 | 24 | 25 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 26 | 27 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x68 | 0x6c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | fbr_strg | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * ++ * ---------------------------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * * ++ * *************************************************************************************/ ++ ++.file "jump_x86_64_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl jump_fcontext ++.def jump_fcontext; .scl 2; .type 32; .endef ++.seh_proc jump_fcontext ++jump_fcontext: ++.seh_endprologue ++ movq %r12, (%rcx) /* save R12 */ ++ movq %r13, 0x08(%rcx) /* save R13 */ ++ movq %r14, 0x10(%rcx) /* save R14 */ ++ movq %r15, 0x18(%rcx) /* save R15 */ ++ movq %rdi, 0x20(%rcx) /* save RDI */ ++ movq %rsi, 0x28(%rcx) /* save RSI */ ++ movq %rbx, 0x30(%rcx) /* save RBX */ ++ movq %rbp, 0x38(%rcx) /* save RBP */ ++ ++ movq %gs:(0x30), %r10 /* load NT_TIB */ ++ movq 0x08(%r10), %rax /* load current stack base */ ++ movq %rax, 0x50(%rcx) /* save current stack base */ ++ movq 0x10(%r10), %rax /* load current stack limit */ ++ movq %rax, 0x60(%rcx) /* save current stack limit */ ++ movq 0x18(%r10), %rax /* load fiber local storage */ ++ movq %rax, 0x68(%rcx) /* save fiber local storage */ ++ ++ testq %r9, %r9 ++ je 1f ++ ++ stmxcsr 0x70(%rcx) /* save MMX control and status word */ ++ fnstcw 0x74(%rcx) /* save x87 control word */ ++ /* save XMM storage */ ++ /* save start address of SSE register block in R10 */ ++ leaq 0x90(%rcx), %r10 ++ /* shift address in R10 to lower 16 byte boundary */ ++ /* == pointer to SEE register block */ ++ andq $-16, %r10 ++ ++ movaps %xmm6, (%r10) ++ movaps %xmm7, 0x10(%r10) ++ movaps %xmm8, 0x20(%r10) ++ movaps %xmm9, 0x30(%r10) ++ movaps %xmm10, 0x40(%r10) ++ movaps %xmm11, 0x50(%r10) ++ movaps %xmm12, 0x60(%r10) ++ movaps %xmm13, 0x70(%r10) ++ movaps %xmm14, 0x80(%r10) ++ movaps %xmm15, 0x90(%r10) ++ ++ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ ++ fldcw 0x74(%rdx) /* restore x87 control word */ ++ /* restore XMM storage */ ++ /* save start address of SSE register block in R10 */ ++ leaq 0x90(%rdx), %r10 ++ /* shift address in R10 to lower 16 byte boundary */ ++ /* == pointer to SEE register block */ ++ andq $-16, %r10 ++ ++ movaps (%r10), %xmm6 ++ movaps 0x10(%r10), %xmm7 ++ movaps 0x20(%r10), %xmm8 ++ movaps 0x30(%r10), %xmm9 ++ movaps 0x40(%r10), %xmm10 ++ movaps 0x50(%r10), %xmm11 ++ movaps 0x60(%r10), %xmm12 ++ movaps 0x70(%r10), %xmm13 ++ movaps 0x80(%r10), %xmm14 ++ movaps 0x90(%r10), %xmm15 ++ ++1: ++ leaq 0x08(%rsp), %rax /* exclude the return address */ ++ movq %rax, 0x40(%rcx) /* save as stack pointer */ ++ movq (%rsp), %rax /* load return address */ ++ movq %rax, 0x48(%rcx) /* save return address */ ++ ++ movq (%rdx), %r12 /* restore R12 */ ++ movq 0x08(%rdx), %r13 /* restore R13 */ ++ movq 0x10(%rdx), %r14 /* restore R14 */ ++ movq 0x18(%rdx), %r15 /* restore R15 */ ++ movq 0x20(%rdx), %rdi /* restore RDI */ ++ movq 0x28(%rdx), %rsi /* restore RSI */ ++ movq 0x30(%rdx), %rbx /* restore RBX */ ++ movq 0x38(%rdx), %rbp /* restore RBP */ ++ ++ movq %gs:(0x30), %r10 /* load NT_TIB */ ++ movq 0x50(%rdx), %rax /* load stack base */ ++ movq %rax, 0x08(%r10) /* restore stack base */ ++ movq 0x60(%rdx), %rax /* load stack limit */ ++ movq %rax, 0x10(%r10) /* restore stack limit */ ++ movq 0x68(%rdx), %rax /* load fiber local storage */ ++ movq %rax, 0x18(%r10) /* restore fiber local storage */ ++ ++ movq 0x40(%rdx), %rsp /* restore RSP */ ++ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ ++ ++ movq %r8, %rax /* use third arg as return value after jump */ ++ movq %r8, %rcx /* use third arg as first arg in context function */ ++ ++ jmp *%r10 /* indirect jump to caller */ ++.seh_endproc +--- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 +@@ -0,0 +1,115 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/******************************************************************** ++ * * ++ * -------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | * ++ * -------------------------------------------------------------- * ++ * | 0h | 04h | 08h | 0ch | 010h | 014h | * ++ * -------------------------------------------------------------- * ++ * | EDI | ESI | EBX | EBP | ESP | EIP | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 6 | 7 | 8 | | * ++ * -------------------------------------------------------------- * ++ * | 018h | 01ch | 020h | | * ++ * -------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 9 | | * ++ * -------------------------------------------------------------- * ++ * | 024h | | * ++ * -------------------------------------------------------------- * ++ * |fc_execpt| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 10 | | * ++ * -------------------------------------------------------------- * ++ * | 028h | | * ++ * -------------------------------------------------------------- * ++ * |fc_strage| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 11 | 12 | | * ++ * -------------------------------------------------------------- * ++ * | 02ch | 030h | | * ++ * -------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| | * ++ * -------------------------------------------------------------- * ++ * * ++ * *****************************************************************/ ++ ++.file "make_i386_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl _make_fcontext ++.def _make_fcontext; .scl 2; .type 32; .endef ++_make_fcontext: ++ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ ++ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ ++ ++ /* shift address in EAX to lower 16 byte boundary */ ++ /* == pointer to fcontext_t and address of context stack */ ++ andl $-16, %eax ++ ++ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ ++ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ ++ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ ++ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ ++ negl %edx /* negate stack size for LEA instruction (== substraction) */ ++ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ ++ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ ++ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ ++ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ ++ ++ stmxcsr 0x02c(%eax) /* save MMX control word */ ++ fnstcw 0x030(%eax) /* save x87 control word */ ++ ++ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ ++ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ ++ ++ movl $finish, %ecx /* abs address of finish */ ++ movl %ecx, (%edx) /* save address of finish as return address for context function */ ++ /* entered after context function returns */ ++ ++ /* traverse current seh chain to get the last exception handler installed by Windows */ ++ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ ++ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ ++ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ ++ /* program is aborted */ ++ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ ++ ++walk: ++ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ ++ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ ++ jz found ++ decl %edx ++ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ ++ jmp walk /* inspect next SEH */ ++ ++found: ++ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ ++ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ ++ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ ++ movl $0xffffffff,%ecx /* set ECX to -1 */ ++ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ ++ leal 0x14(%edx), %ecx /* load address of next SEH item */ ++ movl %ecx, 0x24(%eax) /* save next SEH */ ++ ++ ret ++ ++finish: ++ /* ESP points to same address as ESP on entry of context function + 0x4 */ ++ xorl %eax, %eax ++ movl %eax, (%esp) /* exit code is zero */ ++ call __exit /* exit application */ ++ hlt ++ ++.def __exit; .scl 2; .type 32; .endef /* standard C library function */ +--- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 +@@ -0,0 +1,132 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/**************************************************************************************** ++ * * ++ * ---------------------------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++ * ---------------------------------------------------------------------------------- * ++ * | R12 | R13 | R14 | R15 | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++ * ---------------------------------------------------------------------------------- * ++ * | RDI | RSI | RBX | RBP | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x40 | 0x44 | 0x48 | 0x4c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | RSP | RIP | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 20 | 21 | 22 | 23 | 24 | 25 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 26 | 27 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x68 | 0x6c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | fbr_strg | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * ++ * ---------------------------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * * ++ * *************************************************************************************/ ++ ++.file "make_x86_64_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl make_fcontext ++.def make_fcontext; .scl 2; .type 32; .endef ++.seh_proc make_fcontext ++make_fcontext: ++.seh_endprologue ++ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ ++ ++ /* shift address in RAX to lower 16 byte boundary */ ++ /* == pointer to fcontext_t and address of context stack */ ++ andq $-16, %rax ++ ++ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ ++ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ ++ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ ++ ++ negq %rdx /* negate stack size for LEA instruction (== substraction) */ ++ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ ++ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ ++ ++ stmxcsr 0x70(%rax) /* save MMX control and status word */ ++ fnstcw 0x74(%rax) /* save x87 control word */ ++ ++ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ ++ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ ++ ++ leaq finish(%rip),%rcx /* compute abs address of label finish */ ++ movq %rcx,(%rdx) /* save address of finish as return address for context function */ ++ /* entered after context function returns */ ++ ++ ret ++ ++finish: ++ /* RSP points to same address as RSP on entry of context function + 0x8 */ ++ xorq %rcx, %rcx /* exit code is zero */ ++ call _exit /* exit application */ ++ hlt ++.seh_endproc ++ ++.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch new file mode 100644 index 00000000000..cbb5757746d --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch @@ -0,0 +1,32 @@ +--- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 ++++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 +@@ -1966,8 +1966,7 @@ namespace + { + errno = 0; + +-# if !defined(__CYGWIN__)\ +- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ ++# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ + && defined(_SC_THREAD_SAFE_FUNCTIONS)\ + && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ + && (!defined(__hpux) || defined(_REENTRANT)) \ +--- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 ++++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 +@@ -36,7 +36,7 @@ + # include "windows_file_codecvt.hpp" + # include + #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ +- || defined(__FreeBSD__) || defined(__OPEN_BSD__) ++ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) + # include + #endif + +@@ -831,7 +831,7 @@ namespace + std::locale global_loc = std::locale(); + return std::locale(global_loc, new windows_file_codecvt); + # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ +- || defined(__FreeBSD__) || defined(__OpenBSD__) ++ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) + // "All BSD system functions expect their string parameters to be in UTF-8 encoding + // and nothing else." See + // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch new file mode 100644 index 00000000000..16208385a9b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch @@ -0,0 +1,81 @@ +--- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 +@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla + + } + +- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) ++ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) + { + ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; + result += no ; +@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla + if ! in $(properties:G) + { + if windows in $(properties) +- || cygwin in $(properties) + { + properties += on ; + } +@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla + } + + if ( ! off in $(properties) || ! off in $(properties) ) +- && ( windows in $(properties) || cygwin in $(properties) ) ++ && windows in $(properties) + { + result += win32/lcid.cpp ; + } +--- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 +@@ -8,7 +8,7 @@ + #define BOOST_LOCALE_SOURCE + #include + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + #define BOOST_LOCALE_WITH_WCONV + #endif + +--- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 +@@ -59,7 +59,7 @@ namespace boost { + return normalize_encoding(l).compare(normalize_encoding(r)); + } + +- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++ #if defined(BOOST_WINDOWS) + int encoding_to_windows_codepage(char const *ccharset); + #endif + +--- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 +@@ -15,7 +15,7 @@ + # pragma warning(disable : 4996) + #endif + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + #ifndef NOMINMAX + #define NOMINMAX + #endif +--- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 +@@ -23,7 +23,7 @@ + # include + #endif + +-#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) ++#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) + #ifndef NOMINMAX + # define NOMINMAX + #endif +@@ -395,7 +395,7 @@ int main() + def.push_back("posix"); + #endif + +- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) ++ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) + test_iso_8859_8 = IsValidCodePage(28598)!=0; + #endif + diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch new file mode 100644 index 00000000000..a7748ec58d8 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch @@ -0,0 +1,46 @@ +--- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 +@@ -96,11 +96,6 @@ + # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS + #endif + +-#if defined(__CYGWIN__) +- // Boost.ASIO is broken on Cygwin +-# define BOOST_LOG_NO_ASIO +-#endif +- + #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) + # ifndef BOOST_LOG_WITHOUT_SYSLOG + # define BOOST_LOG_WITHOUT_SYSLOG +--- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 +@@ -170,10 +170,6 @@ project boost/log + windows:ws2_32 + windows:mswsock + +- cygwin:__USE_W32_SOCKETS +- cygwin:ws2_32 +- cygwin:mswsock +- + linux:rt + linux:_XOPEN_SOURCE=600 + linux:_GNU_SOURCE=1 +--- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 +@@ -18,7 +18,7 @@ + + #include + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + + #if defined(BOOST_LOG_USE_WINNT6_API) + +@@ -50,6 +50,6 @@ + #define WIN32_LEAN_AND_MEAN + #endif + +-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_WINDOWS) + + #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch new file mode 100644 index 00000000000..35e6905b0f3 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch @@ -0,0 +1,77 @@ +--- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 +@@ -79,7 +79,7 @@ + #elif defined( BOOST_SP_HAS_SYNC ) + # include + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + + #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) +--- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 +@@ -32,7 +32,7 @@ + # include + #elif defined(BOOST_HAS_PTHREADS) + # include +-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + #else + // Use #define BOOST_DISABLE_THREADS to avoid the error +--- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 +@@ -65,7 +65,7 @@ + #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) + # include + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + # include + + #elif defined( _AIX ) +--- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 +@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch + # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange + # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + namespace boost + { +--- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 +@@ -49,7 +49,7 @@ + #elif defined( BOOST_SP_HAS_SYNC ) + # include + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + + #elif defined(BOOST_HAS_PTHREADS) +--- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 +@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); + + // + +-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #if defined( BOOST_USE_WINDOWS_H ) + # include +--- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 +@@ -8,7 +8,7 @@ + // http://www.boost.org/LICENSE_1_0.txt + // + +-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #include + #include diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch new file mode 100644 index 00000000000..e241f37f203 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch @@ -0,0 +1,22 @@ +--- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 ++++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 +@@ -33,7 +33,7 @@ + // Standalone MinGW and all other known Windows compilers do predefine _WIN32 + // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. + +-# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin ++# if defined(_WIN32) // Windows default, including MinGW and Cygwin + # define BOOST_WINDOWS_API + # else + # define BOOST_POSIX_API +--- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 ++++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 +@@ -97,7 +97,7 @@ namespace + char buf[64]; + char * bp = buf; + std::size_t sz = sizeof(buf); +- # if defined(__CYGWIN__) || defined(__USE_GNU) ++ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) + // Oddball version of strerror_r + const char * c_str = strerror_r( ev, bp, sz ); + return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch new file mode 100644 index 00000000000..b60a3ac49d3 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch @@ -0,0 +1,22 @@ +diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp +index 8b2bc43..d04f2fe 100644 +--- a/libs/units/example/autoprefixes.cpp ++++ b/libs/units/example/autoprefixes.cpp +@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit + { + static const char* name() { return("EUR"); } +- static const char* symbol() { return("€"); } ++ static const char* symbol() { return("€"); } + }; + + int main() +@@ -140,7 +140,7 @@ int main() + + quantity ce = 2048. * euro_base_unit::unit_type(); + cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR +- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ ++ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ + + + return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch new file mode 100644 index 00000000000..15ce4007675 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch @@ -0,0 +1,122 @@ +Index: boost/pool/pool.hpp +=================================================================== +--- a/boost/pool/pool.hpp (revision 78317) ++++ b/boost/pool/pool.hpp (revision 78326) +@@ -27,4 +27,6 @@ + #include + ++// std::numeric_limits ++#include + // boost::math::static_lcm + #include +@@ -358,4 +360,13 @@ + } + ++ size_type max_chunks() const ++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. ++ size_type partition_size = alloc_size(); ++ size_type POD_size = math::static_lcm::value + sizeof(size_type); ++ size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); ++ ++ return max_chunks; ++ } ++ + static void * & nextof(void * const ptr) + { //! \returns Pointer dereferenced. +@@ -377,5 +388,7 @@ + //! the first time that object needs to allocate system memory. + //! The default is 32. This parameter may not be 0. +- //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ set_next_size(nnext_size); ++ set_max_size(nmax_size); + } + +@@ -400,7 +413,7 @@ + } + void set_next_size(const size_type nnext_size) +- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. +- //! \returns nnext_size. +- next_size = start_size = nnext_size; ++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. ++ BOOST_USING_STD_MIN(); ++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + } + size_type get_max_size() const +@@ -410,5 +423,6 @@ + void set_max_size(const size_type nmax_size) + { //! Set max_size. +- max_size = nmax_size; ++ BOOST_USING_STD_MIN(); ++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + } + size_type get_requested_size() const +@@ -713,7 +727,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -753,7 +767,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -797,4 +811,6 @@ + //! \returns Address of chunk n if allocated ok. + //! \returns 0 if not enough memory for n chunks. ++ if (n > max_chunks()) ++ return 0; + + const size_type partition_size = alloc_size(); +@@ -845,7 +861,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // insert it into the list, +Index: libs/pool/test/test_bug_6701.cpp +=================================================================== +--- a/libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) +@@ -0,0 +1,27 @@ ++/* Copyright (C) 2012 Étienne Dupuis ++* ++* Use, modification and distribution is subject to the ++* Boost Software License, Version 1.0. (See accompanying ++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) ++ ++#include ++#include ++ ++int main() ++{ ++ boost::pool<> p(1024, std::numeric_limits::max() / 768); ++ ++ void *x = p.malloc(); ++ BOOST_ASSERT(!x); ++ ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); ++ ++ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); ++ BOOST_ASSERT(!y); ++ ++ return 0; ++} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch new file mode 100644 index 00000000000..b7c91284d9b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch @@ -0,0 +1,11 @@ +diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp +--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 ++++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 +@@ -27,7 +27,6 @@ namespace boundary { + int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) + { + typedef LeftIterator left_iterator; +- typedef RightIterator right_iterator; + typedef typename std::iterator_traits::value_type char_type; + typedef std::char_traits traits; + while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch new file mode 100644 index 00000000000..6c1d0a021ed --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch @@ -0,0 +1,14 @@ +diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp +--- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 ++++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 +@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ + { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. + size_type partition_size = alloc_size(); + size_type POD_size = math::static_lcm::value + sizeof(size_type); +- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); +- +- return max_chunks; ++ return (std::numeric_limits::max() - POD_size) / alloc_size(); + } + + static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch new file mode 100644 index 00000000000..8adf8ed2080 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch @@ -0,0 +1,15 @@ +diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp +--- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 ++++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 +@@ -147,8 +147,8 @@ namespace detail + template + inline PyObject* registry_to_python_value::operator()(argument_type x) const + { +- typedef converter::registered r; + # if BOOST_WORKAROUND(__GNUC__, < 3) ++ typedef converter::registered r; + // suppresses an ICE, somehow + (void)r::converters; + # endif + +Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch new file mode 100644 index 00000000000..cf9756e40ea --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch @@ -0,0 +1,20 @@ +diff -up ./move/core.hpp~ ./move/core.hpp +--- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 ++++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 +@@ -43,6 +43,7 @@ + #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + + #include ++ #include + + //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers + #if defined(__GNUC__) && (__GNUC__ >= 4) && \ +@@ -65,7 +66,7 @@ + template + class rv + : public ::boost::move_detail::if_c +- < ::boost::move_detail::is_class_or_union::value ++ < ::boost::is_class::value + , T + , ::boost::move_detail::nat + >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch new file mode 100644 index 00000000000..561cef19eb2 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch @@ -0,0 +1,31 @@ +diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print + enum { n = sizeof(T) + -1 }; + #elif defined(__MWERKS__) + void f(int); +-#else +- enum { +- n = +-# if defined(__EDG_VERSION__) +- aux::dependent_unsigned::value > -1 +-# else +- sizeof(T) > -1 +-# endif +- }; +-#endif ++#elif defined(__EDG_VERSION__) ++ enum { n = aux::dependent_unsigned::value > -1 }; ++#elif defined(BOOST_GCC) ++ enum { n1 }; ++ enum { n2 }; ++ enum { n = n1 != n2 }; ++#else ++ enum { n = sizeof(T) > -1 }; ++#endif + }; + + #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch new file mode 100644 index 00000000000..57e6206bba1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch @@ -0,0 +1,33 @@ +diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 +--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 ++++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 +@@ -28,17 +28,17 @@ explicit valgrind_config_check ; + local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; + + test-suite pool : +- [ run test_simple_seg_storage.cpp ] +- [ run test_pool_alloc.cpp ] +- [ run pool_msvc_compiler_bug_test.cpp ] +- [ run test_msvc_mem_leak_detect.cpp ] +- [ run test_bug_3349.cpp ] +- [ run test_bug_4960.cpp ] +- [ run test_bug_1252.cpp ] +- [ run test_bug_2696.cpp ] +- [ run test_bug_5526.cpp ] ++ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] ++ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] ++ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] ++ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] + [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] +- [ run ../example/time_pool_alloc.cpp ] ++ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] + [ compile test_poisoned_macros.cpp ] + + # + +Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch new file mode 100644 index 00000000000..eb9ea14011f --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch @@ -0,0 +1,10 @@ +--- a/boost/signals2/trackable.hpp ++++ b/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + namespace boost { + namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch new file mode 100644 index 00000000000..282962987c5 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch @@ -0,0 +1,19 @@ +diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 ++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 +@@ -282,12 +282,12 @@ struct grammar_definition + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base helper_base_t; + typedef grammar_helper_list helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + grammartract_helper_list::do_(self); + + # if defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else + +Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch new file mode 100644 index 00000000000..30ebb981b70 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch @@ -0,0 +1,11 @@ +--- a/boost/uuid/detail/uuid_x86.hpp ++++ b/boost/uuid/detail/uuid_x86.hpp +@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT + cmp = (cmp - 1u) ^ cmp; + rcmp = (rcmp - 1u) ^ rcmp; + +- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); ++ return cmp < rcmp; + } + + } // namespace uuids From 9e99a66c24509c9e4d5078ca6a1b1a222c248ec2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 19:26:30 +0200 Subject: [PATCH 040/412] cygwin: make flex building on cygwin --- pkgs/development/tools/parsing/flex/2.5.39.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/2.5.39.nix index f12f89f6e24..93d54803e7c 100644 --- a/pkgs/development/tools/parsing/flex/2.5.39.nix +++ b/pkgs/development/tools/parsing/flex/2.5.39.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedNativeBuildInputs = [ m4 ]; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; From a84e6336bd185238d47ea94895660d49149559d5 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 20:23:36 +0200 Subject: [PATCH 041/412] cygwin: make coreutils build on cygwin --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index f8dda538fd7..c65ed30dd71 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null -, autoconf, automake114x +, autoconf, automake114x, texinfo }: assert aclSupport -> acl != null; @@ -29,7 +29,7 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl - ++ optionals stdenv.isCygwin [ autoconf automake114x ] # due to patch + ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { From 14ee766024a7d1cf97e215c66d2193012ee346ca Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 18:15:50 -0500 Subject: [PATCH 042/412] openblas: set NUM_THREADS and USE_OPENMP --- pkgs/development/libraries/science/math/openblas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 67d95f97e07..0597cbae77a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -14,6 +14,8 @@ let local = config.openblas.preferLocalBuild or false; "DYNAMIC_ARCH=1" "NUM_THREADS=64" "BINARY=${binary}" + "USE_OPENMP=1" + "NUM_THREADS=64" ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; From 86fb034008b007e4e9a4a595f6d789e105958772 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 18:16:06 -0500 Subject: [PATCH 043/412] openblas: build with native-width integers by default --- .../science/math/openblas/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0597cbae77a..ef76c33fb6d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils +# Most packages depending on openblas expect integer width to match pointer width, +# but some expect to use 32-bit integers always (for compatibility with reference BLAS). +, blas64 ? null +}: with stdenv.lib; let local = config.openblas.preferLocalBuild or false; binary = - { - i686-linux = "32"; + { i686-linux = "32"; x86_64-linux = "64"; x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = - [ - "DYNAMIC_ARCH=1" - "NUM_THREADS=64" - "BINARY=${binary}" - "USE_OPENMP=1" + [ "DYNAMIC_ARCH=1" "NUM_THREADS=64" ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; + blas64Orig = blas64; in stdenv.mkDerivation rec { version = "0.2.14"; @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { # thus is not an explicit dependency. "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' - "INTERFACE64=1" + "BINARY=${binary}" + "USE_OPENMP=1" + "INTERFACE64=${if blas64 then "1" else "0"}" ]; + blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system; + meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; From a376a68f74eebeeee85e5f7a876d14f449623a17 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 06:27:20 -0500 Subject: [PATCH 044/412] openblas: add openblasCompat openblasCompat uses 32-bit integers on all platforms for compatibility with standard BLAS and LAPACK. --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b54674cb65..076e34b263c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13877,6 +13877,10 @@ let liblapack = liblapack_3_5_0; }; + # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with + # standard BLAS and LAPACK. + openblasCompat = openblas.override { blas64 = false; }; + mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; From a0a5fb46ff889be6b5c66521a896f3e206d76e36 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 06:27:57 -0500 Subject: [PATCH 045/412] openblas: use default liblapack --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 076e34b263c..0e74825b67d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13873,9 +13873,7 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - openblas = callPackage ../development/libraries/science/math/openblas { - liblapack = liblapack_3_5_0; - }; + openblas = callPackage ../development/libraries/science/math/openblas { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with # standard BLAS and LAPACK. From b4eb8a5bc32c99b8ee7c3fcd2d414ce10d39b437 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 06:28:37 -0500 Subject: [PATCH 046/412] openblas: remove old expressions --- .../science/math/openblas/0.2.10.nix | 37 ------------------- .../libraries/science/math/openblas/0.2.2.nix | 37 ------------------- 2 files changed, 74 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.10.nix delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.2.nix diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix deleted file mode 100644 index ec4422ce895..00000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: - -let local = config.openblas.preferLocalBuild or false; - localTarget = config.openblas.target or ""; -in -stdenv.mkDerivation rec { - version = "0.2.10"; - - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; - name = "openblas-${version}.tar.gz"; - }; - - preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - - buildInputs = [gfortran perl]; - - cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - - target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else - # allow autodetect - ""; - - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix deleted file mode 100644 index c476dac955a..00000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: - -let local = config.openblas.preferLocalBuild or false; - localTarget = config.openblas.target or ""; -in -stdenv.mkDerivation rec { - version = "0.2.2"; - - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr"; - name = "openblas-${version}.tar.gz"; - }; - - preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - - buildInputs = [gfortran perl]; - - cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - - target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else - # allow autodetect - ""; - - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\""; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; - }; -} From 982aabc5617f144626a108fa6dc57bdcb9592e87 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 17:31:34 -0500 Subject: [PATCH 047/412] suitesparse_4_2: build with openblas Compared to ATLAS, OpenBLAS offers better performance, faster builds, and dynamic architecture detection. --- .../science/math/suitesparse/4.2.nix | 34 +++++++++++++++---- .../math/suitesparse/disable-metis.patch | 18 ---------- 2 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/suitesparse/disable-metis.patch diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 4d27701b135..16174a80212 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,22 +1,44 @@ -{ stdenv, fetchurl, blas, liblapack, gfortran } : +{ stdenv, fetchurl, gfortran, openblas }: + +let + int_t = if openblas.blas64 then "int64_t" else "int32_t"; +in stdenv.mkDerivation rec { version = "4.2.1"; name = "suitesparse-${version}"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; - sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; + sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; }; - buildInputs = [blas liblapack gfortran] ; - patches = [./disable-metis.patch]; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ openblas ]; preConfigure = '' - export PREFIX=$out mkdir -p $out/lib mkdir -p $out/include + + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/METIS .*$/METIS =/' \ + -e 's/METIS_PATH .*$/METIS_PATH =/' \ + -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ + -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' ''; - makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include''; + makeFlags = [ + "PREFIX=\"$(out)\"" + "INSTALL_LIB=$(out)/lib" + "INSTALL_INCLUDE=$(out)/include" + "BLAS=-lopenblas" + "LAPACK=" + ]; NIX_CFLAGS = "-fPIC"; + meta = with stdenv.lib; { + homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + description = "A suite of sparse matrix algorithms"; + license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ ttuegel ]; + }; } diff --git a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch deleted file mode 100644 index 5b735eb7d3c..00000000000 --- a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile -*** SuiteSparse/UMFPACK/Demo/Makefile 2009-11-11 21:09:45.000000000 +0100 ---- SuiteSparse-new/UMFPACK/Demo/Makefile 2010-08-02 12:53:16.000000000 +0200 -*************** -*** 40,46 **** - ../../CAMD/Lib/libcamd.a: - ( cd ../../CAMD ; $(MAKE) library ) - -- $(METIS): -- ( cd $(METIS_PATH) && $(MAKE) ) - - UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ ---- 40,44 ---- - ../../CAMD/Lib/libcamd.a: - ( cd ../../CAMD ; $(MAKE) library ) - - - UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ From b02f300c445296c9580d9ccd1d7000a09ac10b0d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 17:33:11 -0500 Subject: [PATCH 048/412] suitesparse_4_4_1: build with openblas Compared to ATLAS, OpenBLAS offers better performance, faster builds, and dynamic architecture detection. --- .../math/suitesparse/0001-disable-metis.patch | 36 ------------------ .../science/math/suitesparse/default.nix | 38 +++++++++++-------- 2 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch diff --git a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch deleted file mode 100644 index b0f7715f755..00000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 456b26d0c9101adaa5876954baac0ca0e872dab6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 15 Dec 2014 10:18:01 -0600 -Subject: [PATCH 1/3] disable metis - ---- - SuiteSparse_config/SuiteSparse_config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index ba2da23..e1514bf 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -212,8 +212,8 @@ XERBLA = - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. --METIS_PATH = ../../metis-4.0 --METIS = ../../metis-4.0/libmetis.a -+# METIS_PATH = ../../metis-4.0 -+# METIS = ../../metis-4.0/libmetis.a - - #------------------------------------------------------------------------------ - # UMFPACK configuration: -@@ -273,7 +273,7 @@ UMFPACK_CONFIG = - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - --CHOLMOD_CONFIG = $(GPU_CONFIG) -+CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION - - # uncomment this line to compile CHOLMOD without METIS: - # CHOLMOD_CONFIG = -DNPARTITION --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index add4ca9a08f..ccd0c378a81 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,33 +1,41 @@ -{ stdenv, fetchurl, substituteAll -, atlasWithLapack, gfortran }: +{ stdenv, fetchurl, gfortran, openblas }: let - name = "suitesparse-4.4.1"; + version = "4.4.1"; + name = "suitesparse-${version}"; + + int_t = if openblas.blas64 then "int64_t" else "int32_t"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.1.tar.gz"; + url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n"; }; - patches = [ - ./0001-disable-metis.patch - ./0002-set-install-dir.patch - (substituteAll { - src = ./0003-blas-lapack-flags.patch; - blasFlags = "-lf77blas -latlas -lcblas -lgfortran"; - lapackFlags= "-llapack -latlas -lcblas"; - }) - ]; - preConfigure = '' substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk mkdir -p $out/lib mkdir -p $out/include + + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/METIS .*$/METIS =/' \ + -e 's/METIS_PATH .*$/METIS_PATH =/' \ + -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ + -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' ''; + makeFlags = [ + "PREFIX=\"$(out)\"" + "INSTALL_LIB=$(out)/lib" + "INSTALL_INCLUDE=$(out)/include" + "BLAS=-lopenblas" + "LAPACK=" + ]; + + NIX_CFLAGS = "-fPIC"; + postInstall = '' # Install documentation outdoc=$out/share/doc/${name} @@ -47,7 +55,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gfortran ]; - buildInputs = [ atlasWithLapack ]; + buildInputs = [ openblas ]; meta = with stdenv.lib; { homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; From e5ee1a0577164d7e253ba69a2239f37b78a9c3c0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 17:34:31 -0500 Subject: [PATCH 049/412] suitesparse: remove unnecessary patches --- .../suitesparse/0002-set-install-dir.patch | 27 -- .../suitesparse/0003-blas-lapack-flags.patch | 27 -- .../math/suitesparse/SuiteSparse_config.mk | 452 ------------------ .../science/math/suitesparse/default.nix | 1 - 4 files changed, 507 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch delete mode 100644 pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk diff --git a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch b/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch deleted file mode 100644 index ef861f68091..00000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e0fee492a315ce1ef8697b056af210beb1465334 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 15 Dec 2014 10:18:12 -0600 -Subject: [PATCH 2/3] set install dir - ---- - SuiteSparse_config/SuiteSparse_config.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index e1514bf..f1046a6 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -95,8 +95,8 @@ F77LIB = - # LIB = -lm - - # For "make install" --INSTALL_LIB = /usr/local/lib --INSTALL_INCLUDE = /usr/local/include -+INSTALL_LIB = @out@/lib -+INSTALL_INCLUDE = @out@/include - - # Which version of MAKE you are using (default is "make") - # MAKE = make --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch b/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch deleted file mode 100644 index db0b1c45655..00000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a99cca30cfd965683564ae024e8ecc615c61697a Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 15 Dec 2014 10:24:08 -0600 -Subject: [PATCH 3/3] blas lapack flags - ---- - SuiteSparse_config/SuiteSparse_config.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index f1046a6..1710162 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -119,8 +119,8 @@ INSTALL_INCLUDE = @out@/include - # naming the BLAS and LAPACK library (*.a or *.so) files. - - # This is probably slow ... it might connect to the Standard Reference BLAS: -- BLAS = -lblas -lgfortran -- LAPACK = -llapack -+ BLAS = @blasFlags@ -+ LAPACK = @lapackFlags@ - - # MKL - # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk b/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk deleted file mode 100644 index 157a20d7b5a..00000000000 --- a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk +++ /dev/null @@ -1,452 +0,0 @@ -#=============================================================================== -# SuiteSparse_config.mk: common configuration file for the SuiteSparse -#=============================================================================== - -# This file contains all configuration settings for all packages authored or -# co-authored by Tim Davis: -# -# Package Version Description -# ------- ------- ----------- -# AMD 1.2 or later approximate minimum degree ordering -# COLAMD 2.4 or later column approximate minimum degree ordering -# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering -# CAMD any constrained approximate minimum degree ordering -# UMFPACK 4.5 or later sparse LU factorization, with the BLAS -# CHOLMOD any sparse Cholesky factorization, update/downdate -# KLU 0.8 or later sparse LU factorization, BLAS-free -# BTF 0.8 or later permutation to block triangular form -# LDL 1.2 or later concise sparse LDL' -# CXSparse any extended version of CSparse (int/long, real/complex) -# SuiteSparseQR any sparse QR factorization -# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format -# -# By design, this file is NOT included in the CSparse makefile. -# That package is fully stand-alone. CSparse is primarily for teaching; -# production code should use CXSparse. -# -# The SuiteSparse_config directory and the above packages should all appear in -# a single directory, in order for the Makefile's within each package to find -# this file. -# -# To enable an option of the form "# OPTION = ...", edit this file and -# delete the "#" in the first column of the option you wish to use. -# -# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with -# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you -# do not have a metis-4.0 directory inside the SuiteSparse directory, the -# */Makefile's that optionally rely on METIS will automatically detect this -# and compile without METIS. - -#------------------------------------------------------------------------------ -# Generic configuration -#------------------------------------------------------------------------------ - -# Using standard definitions from the make environment, typically: -# -# CC cc C compiler -# CXX g++ C++ compiler -# CFLAGS [ ] flags for C and C++ compiler -# CPPFLAGS [ ] flags for C and C++ compiler -# TARGET_ARCH [ ] target architecture -# FFLAGS [ ] flags for Fortran compiler -# RM rm -f delete a file -# AR ar create a static *.a library archive -# ARFLAGS rv flags for ar -# MAKE make make itself (sometimes called gmake) -# -# You can redefine them here, but by default they are used from the -# default make environment. - -# To use OpenMP add -openmp to the CFLAGS -# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS -# as the number of cores per socket on the machine being used to maximize -# memory performance - CFLAGS = -# CFLAGS = -g -# for the icc compiler and OpenMP: -# CFLAGS = -openmp - -# C and C++ compiler flags. The first three are standard for *.c and *.cpp -# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required). -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER - CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -# for the MKL BLAS: -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE -# with no optimization: -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC - -# ranlib, and ar, for generating libraries. If you don't need ranlib, -# just change it to RANLAB = echo -RANLIB = ranlib -ARCHIVE = $(AR) $(ARFLAGS) - -# copy and delete a file -CP = cp -f -MV = mv -f - -# Fortran compiler (not required for 'make' or 'make library') -F77 = gfortran -F77FLAGS = $(FFLAGS) -O -F77LIB = - -# C and Fortran libraries. Remove -lrt if you don't have it. - LIB = -lm -lrt -# Using the following requires CF = ... -DNTIMER on POSIX C systems. -# LIB = -lm - -# For "make install" -INSTALL_LIB = @out@/lib -INSTALL_INCLUDE = @out@/include - -# Which version of MAKE you are using (default is "make") -# MAKE = make -# MAKE = gmake - -#------------------------------------------------------------------------------ -# BLAS and LAPACK configuration: -#------------------------------------------------------------------------------ - -# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK. -# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or -# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD. -# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard -# Fortran LAPACK along with Goto's BLAS to obtain very good performance. -# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz -# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops -# on a 2.5Ghz dual-core AMD Opteron. - -# These settings will probably not work, since there is no fixed convention for -# naming the BLAS and LAPACK library (*.a or *.so) files. - -# This is probably slow ... it might connect to the Standard Reference BLAS: - BLAS = -lf77blas -latlas -lcblas -lgfortran - LAPACK = -llapack -latlas -lcblas - -# MKL -# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm -# LAPACK = - -# ACML -# BLAS = -lacml -lgfortran -# LAPACK = - -# OpenBLAS -# BLAS = -lopenblas -# LAPACK = - -# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto" -# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto. -# Using the Goto BLAS: -# BLAS = -lgoto -lgfortran -lgfortranbegin -# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread - -# Using non-optimized versions: -# BLAS = -lblas_plain -lgfortran -lgfortranbegin -# LAPACK = -llapack_plain - -# BLAS = -lblas_plain -lgfortran -lgfortranbegin -# LAPACK = -llapack - -# The BLAS might not contain xerbla, an error-handling routine for LAPACK and -# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and -# stops the application program if an error occurs. A C version of xerbla -# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a) -# includes a Fortran-callable xerbla routine that prints nothing and does not -# stop the application program. This is optional. - -# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a - -# If you wish to use the XERBLA in LAPACK and/or the BLAS instead, -# use this option: -XERBLA = - -# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead, -# use this: - -# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a - -#------------------------------------------------------------------------------ -# GPU configuration for CHOLMOD and SPQR -#------------------------------------------------------------------------------ - -# no cuda - CUDA_ROOT = - GPU_BLAS_PATH = - GPU_CONFIG = - CUDA_PATH = - CUDART_LIB = - CUBLAS_LIB = - CUDA_INC_PATH = - NV20 = - NV30 = - NV35 = - NVCC = echo - NVCCFLAGS = - -# with cuda for CHOLMOD -# CUDA_ROOT = /usr/local/cuda -# GPU_BLAS_PATH = $(CUDA_ROOT) -# with 4 cores (default): -# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -# with 10 cores: -# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10 -# CUDA_PATH = $(CUDA_ROOT) -# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so -# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so -# CUDA_INC_PATH = $(CUDA_ROOT)/include/ -# NV20 = -arch=sm_20 -Xcompiler -fPIC -# NV30 = -arch=sm_30 -Xcompiler -fPIC -# NV35 = -arch=sm_35 -Xcompiler -fPIC -# NVCC = $(CUDA_ROOT)/bin/nvcc -# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 - -# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20) - -#------------------------------------------------------------------------------ -# METIS, optionally used by CHOLMOD -#------------------------------------------------------------------------------ - -# If you do not have METIS, or do not wish to use it in CHOLMOD, you must -# compile CHOLMOD with the -DNPARTITION flag. - -# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. -# You may wish to use an absolute path. METIS is optional. Compile -# CHOLMOD with -DNPARTITION if you do not wish to use METIS. -# METIS_PATH = ../../metis-4.0 -# METIS = ../../metis-4.0/libmetis.a - -#------------------------------------------------------------------------------ -# UMFPACK configuration: -#------------------------------------------------------------------------------ - -# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details. -# -# -DNBLAS do not use the BLAS. UMFPACK will be very slow. -# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by -# LAPACK and the BLAS (defaults to 'int') -# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris) -# -DNRECIPROCAL do not multiply by the reciprocal -# -DNO_DIVIDE_BY_ZERO do not divide by zero -# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is -# included in UMFPACK_CONFIG, then UMFPACK does not rely on -# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS. - -UMFPACK_CONFIG = - -# uncomment this line to compile UMFPACK without CHOLMOD: -# UMFPACK_CONFIG = -DNCHOLMOD - -#------------------------------------------------------------------------------ -# CHOLMOD configuration -#------------------------------------------------------------------------------ - -# CHOLMOD Library Modules, which appear in libcholmod.a: -# Core requires: none -# Check requires: Core -# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal -# MatrixOps requires: Core -# Modify requires: Core -# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky -# Supernodal requires: Core, BLAS, LAPACK -# -# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a): -# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal -# optional: Partition -# Valgrind same as Tcov -# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal -# optional: Partition -# -# Configuration flags: -# -DNCHECK do not include the Check module. License GNU LGPL -# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL -# -DNPARTITION do not include the Partition module. License GNU LGPL -# also do not include METIS. -# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL -# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library: -# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL -# -DNMODIFY do not include the Modify module. License GNU GPL -# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL -# -# -DNPRINT do not print anything. -# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by -# LAPACK and the BLAS (defaults to 'int') -# -DNSUNPERF for Solaris only. If defined, do not use the Sun -# Performance Library - -CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION - -# uncomment this line to compile CHOLMOD without METIS: -# CHOLMOD_CONFIG = -DNPARTITION - -#------------------------------------------------------------------------------ -# SuiteSparseQR configuration: -#------------------------------------------------------------------------------ - -# The SuiteSparseQR library can be compiled with the following options: -# -# -DNPARTITION do not include the CHOLMOD partition module -# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp -# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - -# default, without timing, without TBB: -SPQR_CONFIG = $(GPU_CONFIG) -# with TBB: -# SPQR_CONFIG = -DHAVE_TBB - -# This is needed for IBM AIX: (but not for and C codes, just C++) -# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE - -# with TBB, you must select this: -# TBB = -ltbb -# without TBB: -TBB = - -#------------------------------------------------------------------------------ -# code formatting -#------------------------------------------------------------------------------ - -# Use "grep" only, if you do not have "indent" -# PRETTY = grep -v "^\#" -# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120 - PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120 - -#------------------------------------------------------------------------------ -# Linux -#------------------------------------------------------------------------------ - -# Using default compilers: -# CC = gcc -# CF = $(CFLAGS) -O3 -fexceptions - -# alternatives: -# CF = $(CFLAGS) -g -fexceptions \ -# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \ -# -funit-at-a-time -# CF = $(CFLAGS) -O3 -fexceptions \ -# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi -# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -# CF = $(CFLAGS) -O3 -# CF = $(CFLAGS) -O3 -g -fexceptions -# CF = $(CFLAGS) -g -fexceptions \ -# -Wall -W -Wshadow \ -# -Wredundant-decls -Wdisabled-optimization -ansi - -# consider: -# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering -# -frename-registers -ffast-math -funroll-loops - -# Using the Goto BLAS: -# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread - -# Using Intel's icc and ifort compilers: -# (does not work for mexFunctions unless you add a mexopts.sh file) -# F77 = ifort -# CC = icc -# CF = $(CFLAGS) -O3 -xN -vec_report=0 -# CF = $(CFLAGS) -g - -# 64bit: -# F77FLAGS = -O -m64 -# CF = $(CFLAGS) -O3 -fexceptions -m64 -# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA) -# LAPACK = -llapack64 - -# SUSE Linux 10.1, AMD Opteron, with GOTO Blas -# F77 = gfortran -# BLAS = -lgoto_opteron64 -lgfortran - -# SUSE Linux 10.1, Intel Pentium, with GOTO Blas -# F77 = gfortran -# BLAS = -lgoto -lgfortran - -#------------------------------------------------------------------------------ -# Mac -#------------------------------------------------------------------------------ - -# As recommended by macports, http://suitesparse.darwinports.com/ -# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard), -# on my MacBook Air, and they work fine. - -# F77 = gfortran -# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER -# BLAS = -framework Accelerate -# LAPACK = -framework Accelerate -# LIB = -lm - -#------------------------------------------------------------------------------ -# Solaris -#------------------------------------------------------------------------------ - -# 32-bit -# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32 - -# 64-bit -# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc - -# FFLAGS = -fast -KPIC -dalign -xlibmil -m64 - -# The Sun Performance Library includes both LAPACK and the BLAS: -# BLAS = -xlic_lib=sunperf -# LAPACK = - - -#------------------------------------------------------------------------------ -# Compaq Alpha -#------------------------------------------------------------------------------ - -# 64-bit mode only -# CF = $(CFLAGS) -O2 -std1 -# BLAS = -ldxml -# LAPACK = - -#------------------------------------------------------------------------------ -# IBM RS 6000 -#------------------------------------------------------------------------------ - -# BLAS = -lessl -# LAPACK = - -# 32-bit mode: -# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto -# F77FLAGS = -O4 -qipa -qmaxmem=16384 - -# 64-bit mode: -# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto -# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64 - -#------------------------------------------------------------------------------ -# SGI IRIX -#------------------------------------------------------------------------------ - -# BLAS = -lscsl -# LAPACK = - -# 32-bit mode -# CF = $(CFLAGS) -O - -# 64-bit mode (32 bit int's and 64-bit long's): -# CF = $(CFLAGS) -64 -# F77FLAGS = -64 - -# SGI doesn't have ranlib -# RANLIB = echo - -#------------------------------------------------------------------------------ -# AMD Opteron (64 bit) -#------------------------------------------------------------------------------ - -# BLAS = -lgoto_opteron64 -lg2c -# LAPACK = -llapack_opteron64 - -# SUSE Linux 10.1, AMD Opteron -# F77 = gfortran -# BLAS = -lgoto_opteron64 -lgfortran -# LAPACK = -llapack_opteron64 - -#------------------------------------------------------------------------------ -# remove object files and profile output -#------------------------------------------------------------------------------ - -CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index ccd0c378a81..740ea3a09a6 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation { }; preConfigure = '' - substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk mkdir -p $out/lib mkdir -p $out/include From 4f98287afa7c20ae8d5316cad603f834a60a7b18 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 18:14:51 -0500 Subject: [PATCH 050/412] julia02: build with openblas Compared to ATLAS, OpenBLAS offers better performance, faster builds, and dynamic architecture detection. --- pkgs/development/compilers/julia/0.2.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/julia/0.2.nix b/pkgs/development/compilers/julia/0.2.nix index cc1be3db8a5..9d585e07fe1 100644 --- a/pkgs/development/compilers/julia/0.2.nix +++ b/pkgs/development/compilers/julia/0.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , ncurses, libunistring, lighttpd, patchelf, openblas , tcl, tk, xproto, libX11, git, mpfr } : let @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git mpfr + openblas tcl tk xproto libX11 git mpfr ]; configurePhase = '' @@ -91,14 +91,13 @@ stdenv.mkDerivation rec { copy_kill_hash "${dsfmt_src}" deps/random ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -lopenblas -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" export GLPK_PREFIX="${glpk}/include" - mkdir -p "$out/lib" sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile @@ -111,9 +110,12 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p usr/lib - - echo "$out" + mkdir -p "$out/lib" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so" + + echo "$out" ( cd "$(mktemp -d)" for i in "${suitesparse}"/lib/lib*.a; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e74825b67d..fb089239f8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3990,7 +3990,6 @@ let jikes = callPackage ../development/compilers/jikes { }; julia02 = callPackage ../development/compilers/julia/0.2.nix { - liblapack = liblapack.override {shared = true;}; llvm = llvm_33; suitesparse = suitesparse_4_2; }; From 77a454b866633b6accd144a28c2616a2ea1fd8b0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 18:15:08 -0500 Subject: [PATCH 051/412] julia03: refactor and build with openblas Compared to ATLAS, OpenBLAS offers better performance, faster builds, and dynamic architecture detection. --- pkgs/development/compilers/julia/0.3.nix | 128 +++++++++++++---------- pkgs/top-level/all-packages.nix | 9 +- 2 files changed, 73 insertions(+), 64 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 9f216c7207f..dc51441bb17 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,26 +1,24 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib - , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, patchelf, openblas, liblapack - , tcl, tk, xproto, libX11, git, mpfr, which, wget - } : +, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl +, ncurses, libunistring, patchelf, openblas +, tcl, tk, xproto, libX11, git, mpfr, which +}: -assert stdenv.isLinux; +with stdenv.lib; let realGcc = stdenv.cc.cc; -in -stdenv.mkDerivation rec { - pname = "julia"; - version = "0.3.6"; - name = "${pname}-${version}"; + arch = head (splitString "-" stdenv.system); + march = + { + "x86_64-linux" = "x86-64"; + "i686-linux" = "i686"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); dsfmt_ver = "2.2"; grisu_ver = "1.1.1"; - openblas_ver = "v0.2.13"; - lapack_ver = "3.5.0"; arpack_ver = "3.1.5"; patchelf_ver = "0.8"; - pcre_ver = "8.36"; utf8proc_ver = "1.1.6"; dsfmt_src = fetchurl { @@ -32,33 +30,26 @@ stdenv.mkDerivation rec { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; md5 = "29b533ed4311161267bff1a9a97e2953"; }; - openblas_src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; - name = "openblas-${openblas_ver}.tar.gz"; - md5 = "74adf4c0d0d82bff4774be5bf2134183"; - }; arpack_src = fetchurl rec { url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz"; md5 = "d84e1b6108d9ee67c0d21aba7099e953"; name = "arpack-ng-${arpack_ver}.tar.gz"; }; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; - name = "lapack-${lapack_ver}.tgz"; - md5 = "b1d3e3e425b2e44a06760ff173104bdf"; - }; patchelf_src = fetchurl { url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; md5 = "5087261514b4b5814a39c3d3a36eb6ef"; }; - pcre_src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; - md5 = "b767bc9af0c20bc9c1fe403b0d41ad97"; - }; utf8proc_src = fetchurl { url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; md5 = "2462346301fac2994c34f5574d6c3ca7"; }; +in +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.3.6"; + name = "${pname}-${version}"; + + extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ]; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; @@ -67,59 +58,81 @@ stdenv.mkDerivation rec { name = "julia-git-v${version}"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib - fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git mpfr which wget + buildInputs = + [ + gfortran perl m4 gmp pcre llvm readline zlib + fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas tcl tk xproto libX11 git mpfr which ]; + makeFlags = + [ + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_OPENBLAS=1" + "USE_SYSTEM_BLAS=1" + "USE_SYSTEM_LAPACK=1" + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${march}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + ]; + + GLPK_PREFIX = "${glpk}/include"; + + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + NIX_LDFLAGS = + optionals + (realGcc != null) + [ + "-L${realGcc}/lib" + "-L${realGcc}/lib64" + "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk" + "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas" + ]; + + postPatch = '' + sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile + sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile + + patchShebangs . contrib + + # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache + # is probably not what we want anyway on non-NixOS + sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* + ''; + configurePhase = '' for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR; do makeFlags="$makeFlags USE_SYSTEM_$i=1 " done - makeFlags="$makeFlags JULIA_CPU_TARGET=core2"; copy_kill_hash(){ cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \ - "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do + for i in $extraSrcs; do copy_kill_hash "$i" deps done - ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''} - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " + ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''} export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" - export GLPK_PREFIX="${glpk}/include" - - mkdir -p "$out/lib" - sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile - sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - - export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out" - - export dontPatchELF=1 - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" - patchShebangs . contrib - export PATH="$PATH:${stdenv.cc.libc}/sbin" - - # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache - # is probably not what we want anyway on non-NixOS - sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* - - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" ''; preBuild = '' + mkdir -p "$out/lib" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so" + mkdir -p usr/lib - + echo "$out" mkdir -p "$out/lib" ( @@ -137,6 +150,7 @@ stdenv.mkDerivation rec { ''; dontStrip = true; + dontPatchELF = true; enableParallelBuilding = true; @@ -147,8 +161,8 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "http://julialang.org/"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = false; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb089239f8f..32c7cdbef23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3994,13 +3994,8 @@ let suitesparse = suitesparse_4_2; }; - julia03 = let - liblapack = liblapack_3_5_0.override {shared = true;}; - in callPackage ../development/compilers/julia/0.3.nix { - inherit liblapack; - suitesparse = suitesparse_4_2.override { - inherit liblapack; - }; + julia03 = callPackage ../development/compilers/julia/0.3.nix { + suitesparse = suitesparse_4_2; llvm = llvm_33; }; julia = julia03; From bbda7d427b0858be50236d99011de29416652c2d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 20:09:37 -0500 Subject: [PATCH 052/412] suitesparse: version derivations by major version only --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c7cdbef23..5c600c47817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13879,7 +13879,7 @@ let sage = callPackage ../applications/science/math/sage { }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; - suitesparse_4_4_1 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; ipopt = callPackage ../development/libraries/science/math/ipopt { }; From a17d8bcc4bbf3e74cacecf956cd06cb9a98b52ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 20:33:42 -0500 Subject: [PATCH 053/412] suitesparse_4_4: update to 4.4.4 --- .../libraries/science/math/suitesparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 740ea3a09a6..af9396ad900 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, openblas }: let - version = "4.4.1"; + version = "4.4.4"; name = "suitesparse-${version}"; int_t = if openblas.blas64 then "int64_t" else "int32_t"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; - sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n"; + sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj"; }; preConfigure = '' From 86c54040aa1fba0307eeaebe00968a0a81871127 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 20:33:59 -0500 Subject: [PATCH 054/412] julia03: build with suitesparse_4_4 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c600c47817..0e96c04b7d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3995,7 +3995,6 @@ let }; julia03 = callPackage ../development/compilers/julia/0.3.nix { - suitesparse = suitesparse_4_2; llvm = llvm_33; }; julia = julia03; @@ -13880,6 +13879,7 @@ let suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse = suitesparse_4_4; ipopt = callPackage ../development/libraries/science/math/ipopt { }; From adcdec2e70905a35c99bd2ba0991dbdd13280f38 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 3 Jun 2015 20:34:30 -0500 Subject: [PATCH 055/412] julia03: use system patchelf --- pkgs/development/compilers/julia/0.3.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index dc51441bb17..c7cda274924 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -18,7 +18,6 @@ let dsfmt_ver = "2.2"; grisu_ver = "1.1.1"; arpack_ver = "3.1.5"; - patchelf_ver = "0.8"; utf8proc_ver = "1.1.6"; dsfmt_src = fetchurl { @@ -35,10 +34,6 @@ let md5 = "d84e1b6108d9ee67c0d21aba7099e953"; name = "arpack-ng-${arpack_ver}.tar.gz"; }; - patchelf_src = fetchurl { - url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; - md5 = "5087261514b4b5814a39c3d3a36eb6ef"; - }; utf8proc_src = fetchurl { url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; md5 = "2462346301fac2994c34f5574d6c3ca7"; From e36b3ec0a56c3b06152a205a46804733b88695d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 07:09:29 -0500 Subject: [PATCH 056/412] suitesparse: build shared libraries --- pkgs/development/compilers/julia/0.3.nix | 19 +++---------------- .../science/math/suitesparse/default.nix | 12 ++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index c7cda274924..62a1f4f98cc 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { makeFlags = [ "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_OPENBLAS=1" "USE_SYSTEM_BLAS=1" "USE_SYSTEM_LAPACK=1" "ARCH=${arch}" @@ -122,25 +121,13 @@ stdenv.mkDerivation rec { ''; preBuild = '' + # Link dynamically loaded shared libraries into output so they are found at runtime. mkdir -p "$out/lib" ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so" - - mkdir -p usr/lib - - echo "$out" - mkdir -p "$out/lib" - ( - cd "$(mktemp -d)" - for i in "${suitesparse}"/lib/lib*.a; do - ar -x $i - done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" - ) - cp "$out/lib/libsuitesparse.so" usr/lib + ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so" for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out"/lib/lib$i.so; - ln -s libsuitesparse.so "usr"/lib/lib$i.so; + ln -s libsuitesparse.so "$out/lib/lib$i.so"; done ''; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index af9396ad900..f30db472b0d 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -36,6 +36,18 @@ stdenv.mkDerivation { NIX_CFLAGS = "-fPIC"; postInstall = '' + # Build and install shared library + ( + cd "$(mktemp -d)" + for i in "$out"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + done + # Install documentation outdoc=$out/share/doc/${name} mkdir -p $outdoc From fff0191f481c49320d5c540ed8ae491a44b59c8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 07:17:30 -0500 Subject: [PATCH 057/412] arpack: build with openblas --- .../libraries/science/math/arpack/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 01bb3371f5e..c896ecca472 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gfortran, atlasWithLapack }: +{ stdenv, fetchurl, gfortran, openblas }: + +with stdenv.lib; let version = "3.2.0"; @@ -10,10 +12,15 @@ stdenv.mkDerivation { sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff"; }; - buildInputs = [ gfortran atlasWithLapack ]; + buildInputs = [ gfortran openblas ]; # Auto-detection fails because gfortran brings in BLAS by default - configureFlags="--with-blas=-latlas --with-lapack=-latlas"; + configureFlags = [ + "--with-blas=-lopenblas" + "--with-lapack=-lopenblas" + ]; + + FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; meta = { homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; From 5c9750e5bbf52977d6fb95d9ff07e09f10769b01 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 08:35:54 -0500 Subject: [PATCH 058/412] julia03: link shared libraries privately --- pkgs/development/compilers/julia/0.3.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 62a1f4f98cc..d5e763003b1 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -122,12 +122,12 @@ stdenv.mkDerivation rec { preBuild = '' # Link dynamically loaded shared libraries into output so they are found at runtime. - mkdir -p "$out/lib" - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so" - ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so" + mkdir -p "$out/lib/julia" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so" + ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so" for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out/lib/lib$i.so"; + ln -s libsuitesparse.so "$out/lib/julia/lib$i.so"; done ''; From 41cc06fd000293d2ce9eb81ab8ca5a3654f5ad73 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 07:17:38 -0500 Subject: [PATCH 059/412] julia03: use system arpack --- pkgs/development/compilers/julia/0.3.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index d5e763003b1..563e59a2f58 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl -, ncurses, libunistring, patchelf, openblas +, ncurses, libunistring, patchelf, openblas, arpack , tcl, tk, xproto, libX11, git, mpfr, which }: @@ -17,7 +17,6 @@ let dsfmt_ver = "2.2"; grisu_ver = "1.1.1"; - arpack_ver = "3.1.5"; utf8proc_ver = "1.1.6"; dsfmt_src = fetchurl { @@ -29,11 +28,6 @@ let url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; md5 = "29b533ed4311161267bff1a9a97e2953"; }; - arpack_src = fetchurl rec { - url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz"; - md5 = "d84e1b6108d9ee67c0d21aba7099e953"; - name = "arpack-ng-${arpack_ver}.tar.gz"; - }; utf8proc_src = fetchurl { url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; md5 = "2462346301fac2994c34f5574d6c3ca7"; @@ -44,7 +38,7 @@ stdenv.mkDerivation rec { version = "0.3.6"; name = "${pname}-${version}"; - extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ]; + extraSrcs = [ dsfmt_src grisu_src utf8proc_src ]; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; @@ -57,7 +51,7 @@ stdenv.mkDerivation rec { [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas tcl tk xproto libX11 git mpfr which + arpack openblas tcl tk xproto libX11 git mpfr which ]; makeFlags = @@ -65,6 +59,7 @@ stdenv.mkDerivation rec { "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_BLAS=1" "USE_SYSTEM_LAPACK=1" + "USE_SYSTEM_ARPACK=1" "ARCH=${arch}" "MARCH=${march}" "JULIA_CPU_TARGET=${march}" @@ -126,6 +121,7 @@ stdenv.mkDerivation rec { ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so" ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so" ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so" + ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so" for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse.so "$out/lib/julia/lib$i.so"; done From bd280660f75b0da002a6faa456e10ea63d6851bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 11:07:44 -0500 Subject: [PATCH 060/412] julia03: clean up LDFLAGS and LD_LIBRARY_PATH There were a few unused LDFLAGS and LD_LIBRARY_PATH settings. There was also an incorrect setting; Julia prefers to be linked to threaded FFTW. The libary names are now set correctly so that it's not necessary to link system libraries into $out/lib/julia as if they were private libraries. The LDFLAGS were also moved out of NIX_LDFLAGS so they will affect only the Julia build itself, and not all the individual private libraries. --- pkgs/development/compilers/julia/0.3.nix | 117 ++++++++++++----------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 563e59a2f58..3eb55ad8ac0 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -8,38 +8,12 @@ with stdenv.lib; let realGcc = stdenv.cc.cc; - arch = head (splitString "-" stdenv.system); - march = - { - "x86_64-linux" = "x86-64"; - "i686-linux" = "i686"; - }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - - dsfmt_ver = "2.2"; - grisu_ver = "1.1.1"; - utf8proc_ver = "1.1.6"; - - dsfmt_src = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; - name = "dsfmt-${dsfmt_ver}.tar.gz"; - md5 = "cb61be3be7254eae39684612c524740d"; - }; - grisu_src = fetchurl { - url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - md5 = "29b533ed4311161267bff1a9a97e2953"; - }; - utf8proc_src = fetchurl { - url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; - md5 = "2462346301fac2994c34f5574d6c3ca7"; - }; in stdenv.mkDerivation rec { pname = "julia"; version = "0.3.6"; name = "${pname}-${version}"; - extraSrcs = [ dsfmt_src grisu_src utf8proc_src ]; - src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; @@ -47,6 +21,27 @@ stdenv.mkDerivation rec { name = "julia-git-v${version}"; }; + extraSrcs = + let + dsfmt_ver = "2.2"; + grisu_ver = "1.1.1"; + utf8proc_ver = "1.1.6"; + + dsfmt_src = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; + name = "dsfmt-${dsfmt_ver}.tar.gz"; + md5 = "cb61be3be7254eae39684612c524740d"; + }; + grisu_src = fetchurl { + url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; + md5 = "29b533ed4311161267bff1a9a97e2953"; + }; + utf8proc_src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; + md5 = "2462346301fac2994c34f5574d6c3ca7"; + }; + in [ dsfmt_src grisu_src utf8proc_src ]; + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -55,31 +50,37 @@ stdenv.mkDerivation rec { ]; makeFlags = - [ - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_BLAS=1" - "USE_SYSTEM_LAPACK=1" - "USE_SYSTEM_ARPACK=1" + let + arch = head (splitString "-" stdenv.system); + march = + { + "x86_64-linux" = "x86-64"; + "i686-linux" = "i686"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + in [ "ARCH=${arch}" "MARCH=${march}" "JULIA_CPU_TARGET=${march}" "PREFIX=$(out)" "prefix=$(out)" "SHELL=${stdenv.shell}" + + "USE_SYSTEM_PATCHELF=1" + + "USE_SYSTEM_BLAS=1" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_ARPACK=1" ]; GLPK_PREFIX = "${glpk}/include"; NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - NIX_LDFLAGS = - optionals - (realGcc != null) - [ - "-L${realGcc}/lib" - "-L${realGcc}/lib64" - "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk" - "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas" - ]; postPatch = '' sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile @@ -92,6 +93,24 @@ stdenv.mkDerivation rec { sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* ''; + # Julia tries to load these libraries dynamically at runtime, but they can't be found. + # Easier by far to link against them as usual. + # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS, + # where they would also be used for all the private libraries Julia builds. + LDFLAGS = [ + "-larpack" + "-lfftw3_threads" + "-lfftw3f_threads" + "-lglpk" + "-lgmp" + "-lmpfr" + "-lopenblas" + "-lpcre" + "-lsuitesparse" + "-lunistring" + "-lz" + ]; + configurePhase = '' for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR; do @@ -106,27 +125,9 @@ stdenv.mkDerivation rec { copy_kill_hash "$i" deps done - ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''} - - export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" - export PATH="$PATH:${stdenv.cc.libc}/sbin" ''; - preBuild = '' - # Link dynamically loaded shared libraries into output so they are found at runtime. - mkdir -p "$out/lib/julia" - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so" - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so" - ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so" - ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so" - for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out/lib/julia/lib$i.so"; - done - ''; - dontStrip = true; dontPatchELF = true; From 2b525f60c9981f67eb6ebe662a8d9b1c51f552d1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 12:36:34 -0500 Subject: [PATCH 061/412] update julia-0.3.6 -> julia-0.3.9 Includes a workaround for the test suite suggested by upstream (https://github.com/JuliaLang/julia/commit/b192bf0e2f0a0c5b232c3352c6e996e5f11053f2#commitcomment-11139348) for a buggy system wcwidth. --- pkgs/development/compilers/julia/0.3.nix | 6 +++-- .../0001-work-around-buggy-wcwidth.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 3eb55ad8ac0..9faeda21593 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -11,16 +11,18 @@ let in stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.6"; + version = "0.3.9"; name = "${pname}-${version}"; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; - md5 = "d28e8f428485219f756d80c011d5dd32"; + sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf"; name = "julia-git-v${version}"; }; + patches = [ ./0001-work-around-buggy-wcwidth.patch ]; + extraSrcs = let dsfmt_ver = "2.2"; diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch new file mode 100644 index 00000000000..7c4870fb2a8 --- /dev/null +++ b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch @@ -0,0 +1,24 @@ +From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Thu, 4 Jun 2015 12:03:32 -0500 +Subject: [PATCH] work around buggy wcwidth + +--- + test/unicode.jl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/unicode.jl b/test/unicode.jl +index 52c3e6a..f1ef698 100644 +--- a/test/unicode.jl ++++ b/test/unicode.jl +@@ -103,5 +103,6 @@ end + + # handling of embedded NUL chars (#10958) + @test length("\0w") == length("\0α") == 2 +-@test strwidth("\0w") == strwidth("\0α") == 1 ++@test strwidth("\0w") == charwidth('\0') + charwidth('w') ++@test strwidth("\0α") == charwidth('\0') + charwidth('α') + @test normalize_string("\0W", casefold=true) == "\0w" +-- +2.4.1 + From 63be59abc75eb79eaeaf455608539001624ce420 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 12:37:57 -0500 Subject: [PATCH 062/412] utf8proc: use makeFlags instead of overriding installPhase --- pkgs/development/libraries/utf8proc/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 63de08b46dd..c8a2fd6a4e9 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; }; - installPhase = '' - make install prefix=$out - ''; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; From b255f8df2ed76e9696dbbcfefc126a6a84f7e6dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 12:38:36 -0500 Subject: [PATCH 063/412] julia03: use system utf8proc --- pkgs/development/compilers/julia/0.3.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 9faeda21593..560298243d2 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl -, ncurses, libunistring, patchelf, openblas, arpack -, tcl, tk, xproto, libX11, git, mpfr, which +, ncurses, patchelf, openblas, arpack +, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc }: with stdenv.lib; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { let dsfmt_ver = "2.2"; grisu_ver = "1.1.1"; - utf8proc_ver = "1.1.6"; dsfmt_src = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; @@ -38,19 +37,17 @@ stdenv.mkDerivation rec { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; md5 = "29b533ed4311161267bff1a9a97e2953"; }; - utf8proc_src = fetchurl { - url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; - md5 = "2462346301fac2994c34f5574d6c3ca7"; - }; - in [ dsfmt_src grisu_src utf8proc_src ]; + in [ dsfmt_src grisu_src ]; buildInputs = [ - gfortran perl m4 gmp pcre llvm readline zlib - fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - arpack openblas tcl tk xproto libX11 git mpfr which + gfortran gmp pcre llvm readline zlib + fftw fftwSinglePrec libunwind suitesparse glpk ncurses + arpack openblas tcl tk xproto libX11 mpfr utf8proc ]; + nativeBuildInputs = [ patchelf perl m4 which git ]; + makeFlags = let arch = head (splitString "-" stdenv.system); @@ -78,6 +75,8 @@ stdenv.mkDerivation rec { "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" + + "USE_SYSTEM_UTF8PROC=1" ]; GLPK_PREFIX = "${glpk}/include"; @@ -109,7 +108,6 @@ stdenv.mkDerivation rec { "-lopenblas" "-lpcre" "-lsuitesparse" - "-lunistring" "-lz" ]; From 6f3dfc0cf886643b3a5e79b2eb7dc412ab9dc833 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 12:48:46 -0500 Subject: [PATCH 064/412] julia03: remove unused dependencies --- pkgs/development/compilers/julia/0.3.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 560298243d2..9f228212a3b 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,14 +1,11 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, patchelf, openblas, arpack -, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc +, git, mpfr, which, utf8proc }: with stdenv.lib; -let - realGcc = stdenv.cc.cc; -in stdenv.mkDerivation rec { pname = "julia"; version = "0.3.9"; @@ -43,7 +40,7 @@ stdenv.mkDerivation rec { [ gfortran gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses - arpack openblas tcl tk xproto libX11 mpfr utf8proc + arpack openblas mpfr utf8proc ]; nativeBuildInputs = [ patchelf perl m4 which git ]; From 1a11b52ffab4c1832f0367fa15142f8b3ebda9c4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 13:18:45 -0500 Subject: [PATCH 065/412] julia03: use system double_conversion (grisu) --- pkgs/development/compilers/julia/0.3.nix | 43 ++++++++++++------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 9f228212a3b..fdf6ee1dec2 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib -, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl -, ncurses, patchelf, openblas, arpack -, git, mpfr, which, utf8proc +{ stdenv, fetchgit, fetchurl +# build tools +, gfortran, git, m4, patchelf, perl, which +# libjulia dependencies +, libunwind, llvm, readline, utf8proc, zlib +# standard library dependencies +, double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre +, openblas, arpack, suitesparse }: with stdenv.lib; @@ -23,34 +27,28 @@ stdenv.mkDerivation rec { extraSrcs = let dsfmt_ver = "2.2"; - grisu_ver = "1.1.1"; dsfmt_src = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; name = "dsfmt-${dsfmt_ver}.tar.gz"; md5 = "cb61be3be7254eae39684612c524740d"; }; - grisu_src = fetchurl { - url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - md5 = "29b533ed4311161267bff1a9a97e2953"; - }; - in [ dsfmt_src grisu_src ]; + in [ dsfmt_src ]; buildInputs = - [ - gfortran gmp pcre llvm readline zlib - fftw fftwSinglePrec libunwind suitesparse glpk ncurses - arpack openblas mpfr utf8proc + [ libunwind llvm readline utf8proc zlib + double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre + openblas arpack suitesparse ]; - nativeBuildInputs = [ patchelf perl m4 which git ]; + nativeBuildInputs = [ gfortran git m4 patchelf perl which ]; makeFlags = let arch = head (splitString "-" stdenv.system); march = - { - "x86_64-linux" = "x86-64"; + { "x86_64-linux" = "x86-64"; + "x86_64-darwin" = "x86-64"; "i686-linux" = "i686"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); in [ @@ -61,8 +59,6 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_BLAS=1" "LIBBLAS=-lopenblas" "LIBBLASNAME=libopenblas" @@ -72,7 +68,8 @@ stdenv.mkDerivation rec { "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" - + "USE_SYSTEM_GRISU=1" + "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_UTF8PROC=1" ]; @@ -81,8 +78,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fPIC" ]; postPatch = '' - sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile - sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile + sed -i deps/Makefile \ + -e "s@/usr/local/lib@$out/lib@g" \ + -e "s@/usr/lib@$out/lib@g" \ + -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g" patchShebangs . contrib From 6e3eac5c92036554974b34443e8157b7af9b67df Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 13:31:15 -0500 Subject: [PATCH 066/412] julia03: avoid opaque shell scripts The old expression used a shell script to set some repetitive makeFlags. The makeFlags settings were spread out over different parts of the expression. This deters new contributors. The new expression is clearer, at the cost of being slightly repetitive. --- pkgs/development/compilers/julia/0.3.nix | 61 +++++++++++++----------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index fdf6ee1dec2..42b296c7b85 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -35,6 +35,29 @@ stdenv.mkDerivation rec { }; in [ dsfmt_src ]; + prePatch = '' + copy_kill_hash(){ + cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" + } + + for i in $extraSrcs; do + copy_kill_hash "$i" deps + done + ''; + + postPatch = '' + sed -i deps/Makefile \ + -e "s@/usr/local/lib@$out/lib@g" \ + -e "s@/usr/lib@$out/lib@g" \ + -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g" + + patchShebangs . contrib + + # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache + # is probably not what we want anyway on non-NixOS + sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* + ''; + buildInputs = [ libunwind llvm readline utf8proc zlib double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre @@ -68,28 +91,25 @@ stdenv.mkDerivation rec { "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GLPK=1" + "USE_SYSTEM_GMP=1" "USE_SYSTEM_GRISU=1" + "USE_SYSTEM_LIBUNWIND=1" + "USE_SYSTEM_LLVM=1" + "USE_SYSTEM_MPFR=1" "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_SUITESPARSE=1" "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" ]; GLPK_PREFIX = "${glpk}/include"; NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - postPatch = '' - sed -i deps/Makefile \ - -e "s@/usr/local/lib@$out/lib@g" \ - -e "s@/usr/lib@$out/lib@g" \ - -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g" - - patchShebangs . contrib - - # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache - # is probably not what we want anyway on non-NixOS - sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* - ''; - # Julia tries to load these libraries dynamically at runtime, but they can't be found. # Easier by far to link against them as usual. # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS, @@ -107,20 +127,7 @@ stdenv.mkDerivation rec { "-lz" ]; - configurePhase = '' - for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR; - do - makeFlags="$makeFlags USE_SYSTEM_$i=1 " - done - - copy_kill_hash(){ - cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" - } - - for i in $extraSrcs; do - copy_kill_hash "$i" deps - done - + preConfigure = '' export PATH="$PATH:${stdenv.cc.libc}/sbin" ''; From 90b2afee040c8c20af58fdcec789e9bb73908b9a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 13:49:41 -0500 Subject: [PATCH 067/412] haskell-hmatrix: build with openblas Fixes #6392. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ade2055187d..dbb7aadb4a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -119,6 +119,11 @@ self: super: { # Help libconfig find it's C language counterpart. libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; }; + hmatrix = overrideCabal super.hmatrix (drv: { + configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ]; + extraLibraries = [ pkgs.openblasCompat ]; + }); + # The Haddock phase fails for one reason or another. attoparsec-conduit = dontHaddock super.attoparsec-conduit; base-noprelude = dontHaddock super.base-noprelude; From e729a88474da9e6cccd111a5f7c71f164ab8d784 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 16:49:04 -0500 Subject: [PATCH 068/412] R: build with openblas Fixes #6393. --- pkgs/applications/science/math/R/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d0adb338207..72de0677e73 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt +{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison -, imake, which, jdk, atlas +, imake, which, jdk, openblas , withRecommendedPackages ? true }: @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm"; }; - buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt + buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake - which jdk atlas + which jdk openblas ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${atlas}/lib -lf77blas -latlas" - --with-lapack="-L${liblapack}/lib -llapack" + --with-blas="-L${openblas}/lib -lopenblas" + --with-lapack="-L${openblas}/lib -lopenblas" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e96c04b7d8..9f95e32e951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8556,6 +8556,7 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + openblas = openblasCompat; withRecommendedPackages = false; }; From bfe106cfa6613c4ab5c6b7aa6a0650e11bc63267 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 17:17:40 -0500 Subject: [PATCH 069/412] Build numpy and scipy with openblas Fixes #6772. --- .../python-modules/numpy-scipy-support.nix | 14 +++++++------- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 22be22633c2..915b27cb4cd 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -3,14 +3,14 @@ python, # Name of package (e.g. numpy or scipy) pkgName, - # Atlas math library - atlas + # OpenBLAS math library + openblas }: { - # Re-export atlas here so that it can be sure that the same one will be used + # Re-export openblas here so that it can be sure that the same one will be used # in the propagatedBuildInputs. - inherit atlas; + inherit openblas; # First "install" the package, then import what was installed, and call the # .test() function, which will run the test suite. @@ -48,9 +48,9 @@ preBuild = '' echo "Creating site.cfg file..." cat << EOF > site.cfg - [atlas] - include_dirs = ${atlas}/include - library_dirs = ${atlas}/lib + [openblas] + include_dirs = ${openblas}/include + library_dirs = ${openblas}/lib EOF ''; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5ad7e46f4f..80931ecfe1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7798,7 +7798,7 @@ let numpy = let support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; - atlas = pkgs.atlasWithLapack; + openblas = pkgs.openblasCompat; pkgName = "numpy"; }; in buildPythonPackage ( rec { @@ -7821,7 +7821,7 @@ let setupPyBuildFlags = ["--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ support.atlas ]; + propagatedBuildInputs = [ support.openblas ]; meta = { description = "Scientific tools for Python"; @@ -11260,7 +11260,7 @@ let scipy = let support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; - atlas = pkgs.atlasWithLapack; + openblas = pkgs.openblasCompat; pkgName = "numpy"; }; in buildPythonPackage rec { From daf0e6500d3adf71b43621eb0d2831facfdc5859 Mon Sep 17 00:00:00 2001 From: desiderius Date: Fri, 5 Jun 2015 09:20:46 +0200 Subject: [PATCH 070/412] python-packages: updates pyinotify 0.9.3 to 0.9.5 --- pkgs/top-level/python-packages.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0a0325d903..5083d4d1032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9697,22 +9697,15 @@ let }; }; - pyinotify = pkgs.stdenv.mkDerivation rec { - name = "python-pyinotify-${version}"; - version = "0.9.3"; + pyinotify = buildPythonPackage rec { + name = "pyinotify"; + version = "0.9.5"; - src = pkgs.fetchgit { - url = "git://github.com/seb-m/pyinotify.git"; - rev = "refs/tags/${version}"; - sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/${name}/${name}-${version}.tar.gz"; + sha256 = "06yblnif9v05xwsbs089n0bj60ndb4lzkv1i15fprqnf6sgjmig7"; }; - buildInputs = with self; [ python ]; - - installPhase = '' - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; - meta = { homepage = https://github.com/seb-m/pyinotify/wiki; description = "Monitor filesystems events on Linux platforms with inotify"; From 86a511a398d83a2e5374e8e8d6f9c64f38f6e5b3 Mon Sep 17 00:00:00 2001 From: Michael Phillips Date: Thu, 4 Jun 2015 22:57:40 -0500 Subject: [PATCH 071/412] youtube-dl: remove unnecessary pandoc dependency --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a513cdaece..18d6df1e272 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: +{ manuals ? true +, stdenv, fetchurl, makeWrapper, python, zip, +pandoc ? null +, ffmpeg }: + +assert manuals -> pandoc != null; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; @@ -9,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ ] + ++ stdenv.lib.optional manuals pandoc; buildInputs = [ python makeWrapper zip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b54674cb65..024f9cf7bcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3384,7 +3384,9 @@ let # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; - youtube-dl = callPackage ../tools/misc/youtube-dl { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { + manuals = false; + }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { From c1c4ca08def84f339447e23b0ee4ead3c2568b6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 10:38:35 +0200 Subject: [PATCH 072/412] youtube-dl: clean up the expression and document the pandoc situation This patch resolves https://github.com/NixOS/nixpkgs/pull/8184. --- pkgs/tools/misc/youtube-dl/default.nix | 21 +++++++++------------ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 18d6df1e272..3985f8a0c83 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,9 +1,11 @@ -{ manuals ? true -, stdenv, fetchurl, makeWrapper, python, zip, -pandoc ? null -, ffmpeg }: +{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }: -assert manuals -> pandoc != null; +# Pandoc is required to build the package's man page. Release tarballs +# contain a formatted man page already, though, so it's fine to pass +# "pandoc = null" to this derivation; the man page will still be +# installed. We keep the pandoc argument and build input in place in +# case someone wants to use this derivation to build a Git version of +# the tool that doesn't have the formatted man page included. stdenv.mkDerivation rec { name = "youtube-dl-${version}"; @@ -14,14 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - nativeBuildInputs = [ ] - ++ stdenv.lib.optional manuals pandoc; + buildInputs = [ python makeWrapper zip pandoc ]; - buildInputs = [ python makeWrapper zip ]; - - patchPhase = '' - rm youtube-dl - ''; + patchPhase = "rm youtube-dl"; configurePhase = '' makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024f9cf7bcf..a3262dc7943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3385,8 +3385,10 @@ let yi = callPackage ../applications/editors/yi/wrapper.nix { }; youtube-dl = callPackage ../tools/misc/youtube-dl { - manuals = false; - }; + # Release versions don't need pandoc because the formatted man page + # is included in the tarball. + pandoc = null; + }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { From 7acb77ca2bfd54578ad4a37c05666ea5da967457 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 12:42:34 +0200 Subject: [PATCH 073/412] cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 240353b6e75..3da457bdf76 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildTools = [ gitMinimal makeWrapper ]; preConfigure = '' - sed -i -e 's|, "--dirty"||' generate-cabal-file.hs + git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes. runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal ''; postInstall = '' @@ -41,7 +41,7 @@ mkDerivation rec { rm -rf $out/{bin,lib,share} makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix ''; homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; From a70d0275e27d5a26719cd53fa279a854819caf16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jun 2015 13:53:49 +0200 Subject: [PATCH 074/412] nixUnstable: Bump This should fix the NixOS installer tests. --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index bfa23325b39..f8d4c1fd119 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4132_07c69aa"; + name = "nix-1.9pre4153_b64988b"; src = fetchurl { - url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz"; - sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6"; + url = "http://hydra.nixos.org/build/22838666/download/4/${name}.tar.xz"; + sha256 = "51b4870305724aa7b26c92b43cb22a0e9b6798ac2534db493079bfc383244e31"; }; nativeBuildInputs = [ perl pkgconfig ]; From 45cad45e4dfb3f0652882781f97ff90167cff83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Fri, 5 Jun 2015 15:15:21 +0100 Subject: [PATCH 075/412] wrk: Update from 3.1.2 to 4.0.0 (master) --- pkgs/tools/networking/wrk/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index f4cdb7eaddb..312d4c6fe9b 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchgit, openssl }: let - version = "3.1.2"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "wrk-${version}"; src = fetchgit { url = "https://github.com/wg/wrk.git"; - rev = "a52c770204a732aa63e1bb6eb241a70949e3a2a9"; - sha256 = "0b81lg251ivi94f7kfgz8ws4xns5p7hw5qiwjwwlc3dimjgrg387"; + rev = "7cdede916a53da253c995767a92eec36a245a2cc"; + sha256 = "0m8i5pk2rj40v28bzrskkzw54v9jqdby52dwfcypannhlhgqnhy2"; }; - NIX_CFLAGS_COMPILE = "-I${openssl}/include"; - NIX_CFLAGS_LINK = "-L${openssl}/lib"; - + buildInputs = [ openssl ]; + installPhase = '' mkdir -p $out/bin cp wrk $out/bin From 714377f8dc41e505b8039bae5870ce724a29da9a Mon Sep 17 00:00:00 2001 From: Timofey Lagutin Date: Fri, 5 Jun 2015 18:39:01 +0300 Subject: [PATCH 076/412] bittorrentsync: fix storage_path. If this path is a symlink, btsync won't be able to read it if it's not ending with "/". As seen in https://github.com/NixOS/nixpkgs/commit/f02d4ec9ed39694e04aa52937a9f73e217aff7f8 Broken in https://github.com/NixOS/nixpkgs/commit/0539ed477151a3adfff5012cabff0527a9a8c0bb --- nixos/modules/services/networking/btsync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index d0123b79e3f..bd7a5bcebe6 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -208,8 +208,8 @@ in storagePath = mkOption { type = types.path; - default = "/var/lib/btsync"; - example = "/var/lib/btsync"; + default = "/var/lib/btsync/"; + example = "/var/lib/btsync/"; description = '' Where to store the bittorrent sync files. ''; From 9176f73ceed438857e8c503a1a34fd0161db6297 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 5 Jun 2015 19:17:50 +0200 Subject: [PATCH 077/412] buildRustPackage: Cosmetic improvement --- pkgs/build-support/rust/fetch-cargo-deps | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index 69eb404e644..ae1ca62050f 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -24,10 +24,12 @@ export CARGO_HOME=$out cd $src if [[ ! -f Cargo.lock ]]; then + echo echo "ERROR: The Cargo.lock file doesn't exist" echo echo "Cargo.lock is needed to make sure that depsSha256 doesn't change" echo "when the registry is updated." + echo exit 1 fi From ffd0539eba473348f752fa8ab1f1f55388634f8f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 5 Jun 2015 13:00:52 -0700 Subject: [PATCH 078/412] cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out --- nixos/modules/security/ca.nix | 4 ++-- pkgs/applications/graphics/shotwell/default.nix | 2 +- pkgs/applications/networking/browsers/vimb/default.nix | 2 +- .../applications/networking/browsers/vimprobable2/default.nix | 2 +- pkgs/applications/networking/cluster/panamax/api/default.nix | 4 ++-- .../networking/instant-messengers/fuze/default.nix | 2 +- .../instant-messengers/telepathy/gabble/default.nix | 2 +- pkgs/applications/networking/irc/weechat/default.nix | 2 +- pkgs/applications/version-management/bazaar/default.nix | 2 +- pkgs/applications/version-management/mercurial/default.nix | 2 +- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/data/misc/cacert/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/rest/default.nix | 2 +- pkgs/development/compilers/icedtea/default.nix | 2 +- pkgs/development/compilers/openjdk/default.nix | 2 +- pkgs/development/compilers/openjdk/openjdk8.nix | 2 +- pkgs/development/interpreters/elixir/default.nix | 2 +- pkgs/development/libraries/glib-networking/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/servers/mail/opensmtpd/default.nix | 2 +- pkgs/tools/networking/aria2/default.nix | 2 +- pkgs/tools/security/prey/default.nix | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 595b9476fa5..31caab97a65 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -22,7 +22,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]"; + example = literalExample "[ \"\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt\" ]"; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -53,7 +53,7 @@ in config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ]; + security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. environment.etc."ssl/certs/ca-certificates.crt".source = caBundle; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 27dde61a08c..94131cbf4ff 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -13,7 +13,7 @@ let sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; }; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; buildInputs = [ pkgconfig glib libsoup ]; }; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 24a43d95ca9..3222e87ac65 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, src/config.def.h ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 7ab5c397abe..ad5f8aa4691 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, config.h ''; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index dae0315a31b..a212ab5347c 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \ - --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \ + --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 77fe37481d8..6b85e107d06 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let curl_custom = stdenv.lib.overrideDerivation curl (args: { - configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; + configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt"] ; } ); in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index b7cebd47cd7..a74885b2ce3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] ++ stdenv.lib.optional doCheck dbus_daemon; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index bbad1587982..fd200af0a42 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cacert cmake ] ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index ad6f0c50a37..c3b238eeb0a 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/ca-bundle.crt" + --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt" ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index dee2abd2b1f..2409e8e2240 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/mercurial cat >> $out/etc/mercurial/hgrc << EOF [web] - cacerts = ${cacert}/ca-bundle.crt + cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt EOF # copy hgweb.cgi to allow use in apache diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7259fa8ff4c..8ddb6a85d0c 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { inherit url rev leaveDotGit fetchSubmodules deepClone branchName; - GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ # We borrow these environment variables from the caller to allow diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 1f5166d5c43..5dd80bd4aa5 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - SSL_CERT_FILE = "${cacert}/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; preferLocalBuild = true; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d743fc47b94..7bcb499aab4 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out - cp -v ca-bundle.crt $out + mkdir -pv $out/etc/ssl/certs + cp -v ca-bundle.crt $out/etc/ssl/certs ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix index 7afa2800105..4ed0f6c521b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; configureFlags = [ - "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path + "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index 9dbd46946c0..ee22cd97f6e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index fe7ec585155..8a96d1c380d 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -135,7 +135,7 @@ let # Generate certificates. pushd $jre/lib/icedtea/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/icedtea/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d0ca85af0e0..beab781c88d 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index c2780866161..132f0f31b87 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -136,7 +136,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9d12d42cee8..6bb8c0565d5 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" done ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 79c8ac03183..79b31b1365b 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 32f5928cccd..5e2bdd0cc54 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index ab8ec59ca8c..810012fb60a 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" - "--with-ca-file=${cacert}/ca-bundle.crt" + "--with-ca-file=${cacert}/etc/ssl/certs/ca-bundle.crt" ]; installFlags = [ diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index df972a4287b..8d7f4541cad 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cacert ]; - configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ]; + configureFlags = [ "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" ]; meta = with stdenv.lib; { homepage = http://aria2.sourceforge.net/; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index c0951760f4f..d04f48c0f31 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" ''; meta = with stdenv.lib; { From 217506aca14a3d5811d590d54f1b17bd69c78e7f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 5 Jun 2015 07:01:34 -0500 Subject: [PATCH 079/412] Update kde-applications-15.04.1 -> kde-applications-15.04.2 --- pkgs/applications/kde-apps-15.04/manifest.nix | 2043 +++++++++++++++++ pkgs/applications/kde-apps-15.04/manifest.sh | 1 + 2 files changed, 2044 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix index bdf5b3cfc56..d59a3d66966 100644 --- a/pkgs/applications/kde-apps-15.04/manifest.nix +++ b/pkgs/applications/kde-apps-15.04/manifest.nix @@ -2548,6 +2548,15 @@ name = "kde-l10n-id-15.04.1.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca_valencia-15.04.1.tar.xz"; + sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd"; + name = "kde-l10n-ca_valencia-15.04.1.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar"; store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz"; @@ -6112,4 +6121,2038 @@ name = "kjumpingcube-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kajongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8j49syr25zv04wxivlj2r50blfkiih8p-kajongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz"; + sha256 = "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k"; + name = "kajongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-15.04.2.tar.xz" ".tar"; + store = "/nix/store/xbh4flc44pyhmd9wfm14zjr8vz58447c-ksnapshot-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz"; + sha256 = "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57"; + name = "ksnapshot-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8fnj1fgszjbr1cjcds8wd0bzbyw09zll-kfourinline-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz"; + sha256 = "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc"; + name = "kfourinline-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-15.04.2.tar.xz" ".tar"; + store = "/nix/store/a04bnnsv7r4bhnq3pbsv8nk77749d9vn-khangman-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/khangman-15.04.2.tar.xz"; + sha256 = "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf"; + name = "khangman-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nsxh9zscy67b1srj8asi1jc2x9mdwdhh-kdeedu-data-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz"; + sha256 = "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia"; + name = "kdeedu-data-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cj5sh5gsz4hvg7y5rfjw24bbfrgs133m-kde-runtime-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz"; + sha256 = "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn"; + name = "kde-runtime-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x3j7xjkpkd7v61ismj3ids9m4910yv7f-kblocks-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz"; + sha256 = "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv"; + name = "kblocks-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-15.04.2.tar.xz" ".tar"; + store = "/nix/store/76qvy4lfsqyk4qnc1n5cd4wbahfhc6ci-kfloppy-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz"; + sha256 = "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw"; + name = "kfloppy-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bvgf4ym7568ig6mnk4x3jwcfgx1qp51y-kdesdk-thumbnailers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz"; + sha256 = "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7"; + name = "kdesdk-thumbnailers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s6g8walp07ncl0xmkv0lkw5dmykjz49n-libkexiv2-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz"; + sha256 = "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb"; + name = "libkexiv2-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2nnqn0syqqm4j4k3z33vx8mhzcis1rx3-kdf-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdf-15.04.2.tar.xz"; + sha256 = "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck"; + name = "kdf-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/81ca4iky2x83laf1wls5v5mvsfvvj9pz-kde-l10n-pl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz"; + sha256 = "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap"; + name = "kde-l10n-pl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6l77zbzh2rdrrg3y329i1rbii74dd66f-kde-l10n-ia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz"; + sha256 = "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p"; + name = "kde-l10n-ia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1py0dsvx6lr9ww09qskvx0pdlg82rcjd-kde-l10n-he-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz"; + sha256 = "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa"; + name = "kde-l10n-he-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1sjw15pmf6v8fbrmrrxrp3ifafskhgzh-kde-l10n-nn-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz"; + sha256 = "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx"; + name = "kde-l10n-nn-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qg6j8j8gcx7vglnxyr2f3lnzsrdzvadd-kde-l10n-fr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz"; + sha256 = "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr"; + name = "kde-l10n-fr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qawjvxq649zk7lnr3wb8kgw93pm9szfw-kde-l10n-ja-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz"; + sha256 = "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz"; + name = "kde-l10n-ja-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.2.tar.xz" ".tar"; + store = "/nix/store/klmfi9iwf6jzg2aq04bg4l011m46snk4-kde-l10n-el-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz"; + sha256 = "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25"; + name = "kde-l10n-el-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sd55g871lxn0isd486flqhaikaaa00rs-kde-l10n-pa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz"; + sha256 = "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx"; + name = "kde-l10n-pa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cklv18g85z9irf5drphwndjpya812yl1-kde-l10n-pt_BR-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz"; + sha256 = "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4"; + name = "kde-l10n-pt_BR-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.2.tar.xz" ".tar"; + store = "/nix/store/br5h37sf6ynlvspbn03lifqhwmqbiica-kde-l10n-sv-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz"; + sha256 = "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53"; + name = "kde-l10n-sv-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wkxyp7415d8q79wjp8sjkkn9bcf8d5i4-kde-l10n-is-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz"; + sha256 = "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0"; + name = "kde-l10n-is-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/20sv7j17wyswmiwy24p34hgm75wkfiv2-kde-l10n-uk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz"; + sha256 = "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk"; + name = "kde-l10n-uk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kb9xr7rxa8w6lcrm8yc3nqvvyiwjmzcl-kde-l10n-it-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz"; + sha256 = "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0"; + name = "kde-l10n-it-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7arrlm64k6n3fc4f9glgy8synk5mri64-kde-l10n-da-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz"; + sha256 = "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj"; + name = "kde-l10n-da-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7x2sq5fhsb84slfylvsg9ds8rkfln7xb-kde-l10n-zh_CN-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz"; + sha256 = "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y"; + name = "kde-l10n-zh_CN-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s5k7qadd3n5l1zipxylll7qnig20clla-kde-l10n-bs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz"; + sha256 = "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb"; + name = "kde-l10n-bs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.2.tar.xz" ".tar"; + store = "/nix/store/crk06pmaf55p78z6pi4fi8hbp0bkf4qm-kde-l10n-km-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz"; + sha256 = "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18"; + name = "kde-l10n-km-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vldyy2rw01z1qbcd256qapbpxwpqa7ci-kde-l10n-lt-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz"; + sha256 = "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip"; + name = "kde-l10n-lt-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bkr5x2mq2cp5zb950p81hkdjg844zlmw-kde-l10n-lv-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz"; + sha256 = "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng"; + name = "kde-l10n-lv-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zzspql9rdl8v5jxajkzg00zz29v9g0wv-kde-l10n-sk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz"; + sha256 = "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07"; + name = "kde-l10n-sk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/525xf0fhgxxi9hxy3nlp911a65pwk9v2-kde-l10n-kk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz"; + sha256 = "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r"; + name = "kde-l10n-kk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2qq4c0yr5hpfffwqddcxkqkzp2dr6zcb-kde-l10n-ca_valencia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz"; + sha256 = "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6"; + name = "kde-l10n-ca_valencia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gda3hz81ilizglmrc1m03gy40n1rp89f-kde-l10n-nl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz"; + sha256 = "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17"; + name = "kde-l10n-nl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hm8y22jy2dhnpdhyp0g3m8fz8mf7dhjy-kde-l10n-wa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz"; + sha256 = "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8"; + name = "kde-l10n-wa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/193h8asiqnbfnhackzybxbqgwhghsdb2-kde-l10n-sl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz"; + sha256 = "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf"; + name = "kde-l10n-sl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.2.tar.xz" ".tar"; + store = "/nix/store/p6h22zlpyglzksa6rb1xc042lmpn0hds-kde-l10n-ca-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz"; + sha256 = "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b"; + name = "kde-l10n-ca-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mmdpma42n33irvf9hs4frn1y60q0r4mh-kde-l10n-hu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz"; + sha256 = "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f"; + name = "kde-l10n-hu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sgcdmfnga8nmyg1pq19cjn5dzdm14c6g-kde-l10n-hi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz"; + sha256 = "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7"; + name = "kde-l10n-hi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sf5s50gzjamhmzvbdsymscm0y63k1vsk-kde-l10n-ga-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz"; + sha256 = "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk"; + name = "kde-l10n-ga-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5wri2078sl0r7xv1j2b8x182v2ilpny1-kde-l10n-hr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz"; + sha256 = "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn"; + name = "kde-l10n-hr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/970bcajr5cmcq01z4pkglgw9dpwigpz3-kde-l10n-gl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz"; + sha256 = "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x"; + name = "kde-l10n-gl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.2.tar.xz" ".tar"; + store = "/nix/store/60k5g06hvgpx407f6zbd1q5jm12rzqwv-kde-l10n-es-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz"; + sha256 = "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399"; + name = "kde-l10n-es-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vrhsyhk9sz6117hgbjgy6498nvcprxdd-kde-l10n-pt-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz"; + sha256 = "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw"; + name = "kde-l10n-pt-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/w9nhhcra2rjpjsc6apgfrlzwqgp7sx77-kde-l10n-bg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz"; + sha256 = "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k"; + name = "kde-l10n-bg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3lqnb375jd1z7ky7y8nrnpgx93ncassv-kde-l10n-fa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz"; + sha256 = "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj"; + name = "kde-l10n-fa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2xsadiy29hblc06v6n3ax9y72k2a32vi-kde-l10n-id-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz"; + sha256 = "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf"; + name = "kde-l10n-id-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h7838chap1cxjw66pw6914jpl48n6knf-kde-l10n-ar-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz"; + sha256 = "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski"; + name = "kde-l10n-ar-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qzx5vs924pzqyxj6mxmn3p9wq0q05vw1-kde-l10n-de-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz"; + sha256 = "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh"; + name = "kde-l10n-de-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6rs8knkgfs23qa2cwm5s9yp661z37ws1-kde-l10n-eu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz"; + sha256 = "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws"; + name = "kde-l10n-eu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1kl0887wqmnvhiw9318ihvfwwdkxjhrj-kde-l10n-en_GB-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz"; + sha256 = "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx"; + name = "kde-l10n-en_GB-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h8r3j2113d0h034vbgz0d61ybnicc5g6-kde-l10n-nds-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz"; + sha256 = "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd"; + name = "kde-l10n-nds-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/namy5fby5nck67cdgk4ywb7khd43cacr-kde-l10n-fi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz"; + sha256 = "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8"; + name = "kde-l10n-fi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zyb7zb7w4y79s5kl6d2p5awpbn3912mv-kde-l10n-ro-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz"; + sha256 = "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l"; + name = "kde-l10n-ro-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cy7mih4b17vvbfmw86n6bl103xcixhpv-kde-l10n-mr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz"; + sha256 = "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8"; + name = "kde-l10n-mr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ngffzrfy1r1x9rlx1h6ivfhif79g6fpx-kde-l10n-eo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz"; + sha256 = "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q"; + name = "kde-l10n-eo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l46m8w2hl6wrdns1qwvm5hd4dlbyxpkj-kde-l10n-cs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz"; + sha256 = "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d"; + name = "kde-l10n-cs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7q7ws7qcbnrm5ivxiq1kdfjih1aa44g1-kde-l10n-zh_TW-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz"; + sha256 = "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi"; + name = "kde-l10n-zh_TW-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nzql394zszp4wan26pr336i20ipirh9q-kde-l10n-ru-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz"; + sha256 = "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk"; + name = "kde-l10n-ru-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/z0ncv2c97if41g7qln16vx9kr166zvc5-kde-l10n-tr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz"; + sha256 = "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq"; + name = "kde-l10n-tr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s8sr6jzaydgc64r1dbgqzns682avkd7p-kde-l10n-ko-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz"; + sha256 = "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0"; + name = "kde-l10n-ko-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.2.tar.xz" ".tar"; + store = "/nix/store/rsdm9ds9pn5iqsk6dgbr6mnpliisby3c-kde-l10n-ug-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz"; + sha256 = "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1"; + name = "kde-l10n-ug-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5dhk16y2w9sibzqlv50w5d18js7mjrpf-kde-l10n-nb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz"; + sha256 = "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij"; + name = "kde-l10n-nb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cpfz2g7z1al6p5yadjj6y314ws0fmpg4-kde-l10n-sr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz"; + sha256 = "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi"; + name = "kde-l10n-sr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7n1ka8pz70xfznm3q3qvmcbrr74yb6by-kde-l10n-et-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz"; + sha256 = "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn"; + name = "kde-l10n-et-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/lniq3v7dr7wqagi4c7cjwdig0ds5bndp-libkcompactdisc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz"; + sha256 = "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v"; + name = "libkcompactdisc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v1mywghcpyff25izr0iimzyr9vh3pfnj-ksaneplugin-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz"; + sha256 = "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9"; + name = "ksaneplugin-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s9h0gx53bwvg5f8z34drzwkf0ybg602h-kamera-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kamera-15.04.2.tar.xz"; + sha256 = "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy"; + name = "kamera-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-15.04.2.tar.xz" ".tar"; + store = "/nix/store/scjxw225n4i6s702ggd5mnblyfgaf9sh-kubrick-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz"; + sha256 = "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d"; + name = "kubrick-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ja9lwsb9crzqd8q5vnhw66f5ianimzg7-jovie-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/jovie-15.04.2.tar.xz"; + sha256 = "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx"; + name = "jovie-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cbpf87yihk31gjc5glvfbsb1r470n0zy-ark-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ark-15.04.2.tar.xz"; + sha256 = "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq"; + name = "ark-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cdw9y1cx7gjfsj6b1hd43mmjjd2k715d-kdiamond-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz"; + sha256 = "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j"; + name = "kdiamond-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x4147vkla2llia02yj1m1rrjs425lm4a-klettres-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klettres-15.04.2.tar.xz"; + sha256 = "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc"; + name = "klettres-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9w7iv272z8lkpp66di0l0f3z79hjvahg-bomber-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/bomber-15.04.2.tar.xz"; + sha256 = "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3"; + name = "bomber-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gsrfn2v5lli7fykmq0864j95mxkdn22r-superkaramba-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz"; + sha256 = "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1"; + name = "superkaramba-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkgeomap-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fsr2vij54z8zwj9rzgfy1x22ivcs2i3s-libkgeomap-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz"; + sha256 = "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh"; + name = "libkgeomap-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fqm7q93457lrg91b5w8jr2lfx3ypa18p-kteatime-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz"; + sha256 = "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp"; + name = "kteatime-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3flm8w829k0ygcs24j5smhsq69r1isdp-granatier-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/granatier-15.04.2.tar.xz"; + sha256 = "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6"; + name = "granatier-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.2.tar.xz" ".tar"; + store = "/nix/store/aj12ls0r62c66f0gv1w0dv37a9wbx0mm-libkeduvocdocument-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz"; + sha256 = "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw"; + name = "libkeduvocdocument-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nh2kasqpz3iwhc2hwv6di51vp7xnnfd3-blinken-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/blinken-15.04.2.tar.xz"; + sha256 = "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg"; + name = "blinken-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hasm2996yj2yljjc6wk50naqm1bal8mh-kpat-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kpat-15.04.2.tar.xz"; + sha256 = "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj"; + name = "kpat-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wfi3wjr0yyn72aqh31hvfinghl73z7ay-kapman-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kapman-15.04.2.tar.xz"; + sha256 = "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a"; + name = "kapman-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vzwm2r7kypa7vmvxldsqmm27gw0a7bl8-kscd-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kscd-15.04.2.tar.xz"; + sha256 = "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j"; + name = "kscd-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.9.tar.xz" ".tar"; + store = "/nix/store/5wy5pdqpd3c3zhwm93dnasw605abglz3-kdelibs-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz"; + sha256 = "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix"; + name = "kdelibs-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.9.tar.xz" ".tar"; + store = "/nix/store/bskv830n49z3ib444qh1vb87d712q0iw-kdepim-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz"; + sha256 = "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf"; + name = "kdepim-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/p0n3h5a2p5wh5l31ldn2cslbvfbvlwl4-kde-wallpapers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz"; + sha256 = "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d"; + name = "kde-wallpapers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sdwpx6s19zjckj3lgzc5isiab0cigy8n-kmix-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmix-15.04.2.tar.xz"; + sha256 = "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9"; + name = "kmix-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3x1axf8f8qcpg3898r90yi35sh06vsh6-krdc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/krdc-15.04.2.tar.xz"; + sha256 = "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg"; + name = "krdc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h70w08hzqsnp9rs11mr5m7yizc8yzdgw-konsole-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/konsole-15.04.2.tar.xz"; + sha256 = "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc"; + name = "konsole-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-15.04.2.tar.xz" ".tar"; + store = "/nix/store/73v4cznbqfpidrdg6gbra0qlpf43hb3q-kanagram-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz"; + sha256 = "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8"; + name = "kanagram-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-15.04.2.tar.xz" ".tar"; + store = "/nix/store/va7y8idm0hjzhfhicl6xlsyz61cp37gz-umbrello-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz"; + sha256 = "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va"; + name = "umbrello-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6rn0kw9p0vxk4hd60l6ksyxrlczksbac-ktux-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktux-15.04.2.tar.xz"; + sha256 = "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf"; + name = "ktux-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/70w7yfkg79g199z7sb5nk3xaknwjirwm-krfb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/krfb-15.04.2.tar.xz"; + sha256 = "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2"; + name = "krfb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-15.04.2.tar.xz" ".tar"; + store = "/nix/store/59i6az9vcq1b9vqx9rwibv7i0iwj2wc5-kwalletmanager-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz"; + sha256 = "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p"; + name = "kwalletmanager-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kigl3wjr17nq1mh6wqfd3kc4sbh8dqfm-palapeli-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz"; + sha256 = "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j"; + name = "palapeli-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3r1ibr6rqz6lmgxxscgbkx7ffkpiad0y-kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + sha256 = "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k"; + name = "kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zv987ag77hm9wx1gk7nqrrk629dr1q4m-gwenview-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz"; + sha256 = "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k"; + name = "gwenview-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ps63vs05fy6jk669grmm3ddb5f0hl00m-kruler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kruler-15.04.2.tar.xz"; + sha256 = "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2"; + name = "kruler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ajmnqxshv1vg44acwgyy1k3l5fjiadga-knavalbattle-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz"; + sha256 = "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x"; + name = "knavalbattle-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-15.04.2.tar.xz" ".tar"; + store = "/nix/store/j9gqvnw6d4qaf09vsiinzdnpiy3nrgl4-kgoldrunner-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz"; + sha256 = "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v"; + name = "kgoldrunner-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1cz44lqkfc63qgxap5qi59qviwrszif9-kmag-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmag-15.04.2.tar.xz"; + sha256 = "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3"; + name = "kmag-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-send-file-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x1p55ssi0cx67z1q2pbqkzaxpaps3lv6-ktp-send-file-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz"; + sha256 = "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx"; + name = "ktp-send-file-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jma476qyvnw2qr4fhsx0kdmif55inr4p-kdesdk-strigi-analyzers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz"; + sha256 = "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd"; + name = "kdesdk-strigi-analyzers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1c0qqm7946lgjk4p8am0dd54x9q59jdk-ktp-text-ui-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz"; + sha256 = "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4"; + name = "ktp-text-ui-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5cxhms6vyqxx75cqv6b0899585hq06np-dolphin-plugins-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz"; + sha256 = "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx"; + name = "dolphin-plugins-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-15.04.2.tar.xz" ".tar"; + store = "/nix/store/41gx49qgr229s409f1nfjv0s0xc0rr7w-kjumpingcube-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz"; + sha256 = "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc"; + name = "kjumpingcube-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.2.tar.xz" ".tar"; + store = "/nix/store/676j87fj0mj0aqyz62729l7fwnl3dvnm-ktp-desktop-applets-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz"; + sha256 = "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn"; + name = "ktp-desktop-applets-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nkjk53cfw4lm95jgwxvccsk4ln4dp5yx-libkdcraw-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz"; + sha256 = "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf"; + name = "libkdcraw-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x07k1rddjvi45jdbn6r1bgrc8a6pcbn5-kcharselect-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz"; + sha256 = "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293"; + name = "kcharselect-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x5w1brmq7c4jkfx2dj335akvc7bqwhkv-kgpg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz"; + sha256 = "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx"; + name = "kgpg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qf4pgkwm97jp6m634xaagz95l371qzrm-signon-kwallet-extension-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz"; + sha256 = "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj"; + name = "signon-kwallet-extension-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l868j4vsnxzdjxx4albmff4532pk5x5y-kshisen-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz"; + sha256 = "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a"; + name = "kshisen-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jxqly6p40ss9aprr12zmabghxphhid17-lokalize-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz"; + sha256 = "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz"; + name = "lokalize-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b7ckd23lzwf8xhrc6qpmyrha6dibk5k2-kaccounts-integration-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz"; + sha256 = "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86"; + name = "kaccounts-integration-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7kn6vi1rmf7nddb0xcy3njyf0fhzgicy-ktp-contact-list-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz"; + sha256 = "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n"; + name = "ktp-contact-list-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-15.04.2.tar.xz" ".tar"; + store = "/nix/store/acyvv1x0q022axz5l6xz65cs54xqpq4q-kremotecontrol-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz"; + sha256 = "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl"; + name = "kremotecontrol-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.20.tar.xz" ".tar"; + store = "/nix/store/kfm7vk5zlq9rpak25j4gkdaw1hsq6ap5-kde-workspace-4.11.20.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz"; + sha256 = "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c"; + name = "kde-workspace-4.11.20.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jvkznsklm87lnyvwkvn06wzp7irzlj80-kalgebra-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz"; + sha256 = "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f"; + name = "kalgebra-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qln1l2y7b5nnwnvgis2ms2cp4iqz7672-kmplot-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz"; + sha256 = "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc"; + name = "kmplot-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vzxl3wf0dr7rnzb2xr9pkbdwirjryrv4-kate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kate-15.04.2.tar.xz"; + sha256 = "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp"; + name = "kate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-15.04.2.tar.xz" ".tar"; + store = "/nix/store/a2rnncjw6jn5si9pjcg4gv3fy0fd9pd8-kwordquiz-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz"; + sha256 = "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch"; + name = "kwordquiz-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-15.04.2.tar.xz" ".tar"; + store = "/nix/store/707rjgg0a9m8bpizypgkzp1g09zyd1hh-kbounce-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz"; + sha256 = "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8"; + name = "kbounce-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3cr2qy4k771c14nfm98zmash1s6p8f0c-marble-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/marble-15.04.2.tar.xz"; + sha256 = "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a"; + name = "marble-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.9.tar.xz" ".tar"; + store = "/nix/store/h1g3dk80b67dqbx33zg1v3wb9141ic2j-kdepim-runtime-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz"; + sha256 = "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0"; + name = "kdepim-runtime-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7sp21hpwl9dbr9h4nqn6xpmqb74zvmcc-kiriki-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz"; + sha256 = "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98"; + name = "kiriki-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-15.04.2.tar.xz" ".tar"; + store = "/nix/store/lzis9waz781v2n789qy6cc5za4xxb6hp-okteta-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/okteta-15.04.2.tar.xz"; + sha256 = "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5"; + name = "okteta-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-15.04.2.tar.xz" ".tar"; + store = "/nix/store/g5a3dbqpf454c7lxi1k1r5d2sgdicl8q-amor-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/amor-15.04.2.tar.xz"; + sha256 = "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr"; + name = "amor-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-approver-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wxfmvnsjxnaiiflbcc7v38h2ax27m5fi-ktp-approver-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz"; + sha256 = "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7"; + name = "ktp-approver-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wdi23i8hk6c4fnvkw6bs75s8jkc0wxc0-kde-base-artwork-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz"; + sha256 = "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy"; + name = "kde-base-artwork-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.9.tar.xz" ".tar"; + store = "/nix/store/75yrqw2cr3b7kv1hsvlz4m9j6gm36akk-kdepimlibs-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz"; + sha256 = "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj"; + name = "kdepimlibs-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mqk73kl61afzbysc7isfli9ashgl29j9-kstars-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kstars-15.04.2.tar.xz"; + sha256 = "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6"; + name = "kstars-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-15.04.2.tar.xz" ".tar"; + store = "/nix/store/yrs4k4mal8rdpy1781jblbapf9xz201v-kaccessible-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz"; + sha256 = "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1"; + name = "kaccessible-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-15.04.2.tar.xz" ".tar"; + store = "/nix/store/0zkd1qcv6k52avkv235108rrqn2fifd8-ksnakeduel-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz"; + sha256 = "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b"; + name = "ksnakeduel-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l50svmrk7acq79f1ab284q61jm1164li-kalzium-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz"; + sha256 = "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x"; + name = "kalzium-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wlna2q3x6crc3xj7a7x09r0fxzsxfl27-oxygen-icons-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz"; + sha256 = "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi"; + name = "oxygen-icons-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h9i6iisfnqyz340z2izl02n8nyz2l82b-cervisia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz"; + sha256 = "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i"; + name = "cervisia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/yhhpl1hamlamb7kfi1njlp60fg59xiqn-kmahjongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz"; + sha256 = "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq"; + name = "kmahjongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qffj5v8rmrlnqm7y7l68kwhy4cx9hhqa-libkdegames-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz"; + sha256 = "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj"; + name = "libkdegames-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zsrxzn4zp9a4v9xfaqr27d4nnmgycdc2-kspaceduel-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz"; + sha256 = "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy"; + name = "kspaceduel-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-15.04.2.tar.xz" ".tar"; + store = "/nix/store/pybi47055hcdlpliqari9p8gki1yj8iz-kmouth-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz"; + sha256 = "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47"; + name = "kmouth-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2y66l1759ipk2dk46b0imh1r6vwb3yrx-kde-dev-utils-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz"; + sha256 = "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5"; + name = "kde-dev-utils-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3ywzsbp1lvq98ikalwlxs57x9w2zh47x-mplayerthumbs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz"; + sha256 = "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim"; + name = "mplayerthumbs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sqjrx2z8pig68sfifdcykksys2kifi2h-konquest-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/konquest-15.04.2.tar.xz"; + sha256 = "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn"; + name = "konquest-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3cz810cqihfw4jyfi8bdg9fi5bzs1rga-kcolorchooser-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz"; + sha256 = "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h"; + name = "kcolorchooser-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fzz2pwgl8jx0flydbv67f494rqs2lrdd-ffmpegthumbs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz"; + sha256 = "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg"; + name = "ffmpegthumbs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zfiqwh08ccppyzvqd8wrlmc0zf7nbj54-print-manager-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz"; + sha256 = "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk"; + name = "print-manager-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b51g9dz39d5raxgvl9fbmdbmsxjpniyg-step-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/step-15.04.2.tar.xz"; + sha256 = "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf"; + name = "step-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s9c62j11m3rc9w3i586hjwk1k29lhxwa-poxml-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/poxml-15.04.2.tar.xz"; + sha256 = "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3"; + name = "poxml-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/dwy5s9x602rr1m5cdjigk7mjvkab7h1c-ktp-filetransfer-handler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz"; + sha256 = "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177"; + name = "ktp-filetransfer-handler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bxd782i7kh5ssxcsvd7b25rx9mwywlpj-zeroconf-ioslave-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz"; + sha256 = "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9"; + name = "zeroconf-ioslave-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7fh80id5rynq5wigvx95r5jldyj09f8a-kgeography-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz"; + sha256 = "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd"; + name = "kgeography-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wqlwval30d2jii0cpcnhyr7hvhn18yck-libkcddb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz"; + sha256 = "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m"; + name = "libkcddb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/i1rmk34a0bl0088ypi1vr3zgm22s0qxq-libkmahjongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz"; + sha256 = "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1"; + name = "libkmahjongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-15.04.2.tar.xz" ".tar"; + store = "/nix/store/091km97cfa95lqa9ll2bmy1j4ayijc94-ksquares-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz"; + sha256 = "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i"; + name = "ksquares-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6056jj6bns8mgr6ss3jqfdrwm1nlmvm2-ksudoku-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz"; + sha256 = "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna"; + name = "ksudoku-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-15.04.2.tar.xz" ".tar"; + store = "/nix/store/47lslszl9rlnpiw1ic2lxkrd5302kswb-kollision-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kollision-15.04.2.tar.xz"; + sha256 = "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi"; + name = "kollision-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ilz3z9pv0axrikakkrl1ibkv496r34ys-kcron-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcron-15.04.2.tar.xz"; + sha256 = "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf"; + name = "kcron-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/4lz289bp3agyw5igfvpdzi123m7qmiy4-bovo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/bovo-15.04.2.tar.xz"; + sha256 = "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2"; + name = "bovo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-15.04.2.tar.xz" ".tar"; + store = "/nix/store/654c7xpn6kvbvglh0sxg5qz75w52nfsi-filelight-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/filelight-15.04.2.tar.xz"; + sha256 = "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv"; + name = "filelight-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1xlxqdznc1w89hvz6ykzpbd4pkrxifmh-picmi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/picmi-15.04.2.tar.xz"; + sha256 = "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv"; + name = "picmi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-15.04.2.tar.xz" ".tar"; + store = "/nix/store/0g5k9zx2d4fxpsa4pifpilrm9xamq40g-kig-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kig-15.04.2.tar.xz"; + sha256 = "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv"; + name = "kig-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/81c1aijibwhrdhn149m3wx2zxv3l2r8f-ksirk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz"; + sha256 = "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w"; + name = "ksirk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okular-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9i3ma5arv1bfij2f92lmrg4z1fz7jr2v-okular-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/okular-15.04.2.tar.xz"; + sha256 = "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7"; + name = "okular-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-15.04.2.tar.xz" ".tar"; + store = "/nix/store/635srb7rlzyzlii3qf1j9p85fn18cdw6-ksystemlog-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz"; + sha256 = "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1"; + name = "ksystemlog-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fchxy0dfggh8hgd1z8yp13qgn1xrhxvl-kmousetool-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz"; + sha256 = "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9"; + name = "kmousetool-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ah5gjm6qdj22i62i1davbd88hwpp7bb0-kdegraphics-mobipocket-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz"; + sha256 = "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc"; + name = "kdegraphics-mobipocket-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.2.tar.xz" ".tar"; + store = "/nix/store/n874w08k1vfkinc01hr4hlvd4qg9ln8r-ktp-kded-module-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz"; + sha256 = "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n"; + name = "ktp-kded-module-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6wl8yszqa313v9w1b8l05qc2ajdxn9vj-klines-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klines-15.04.2.tar.xz"; + sha256 = "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az"; + name = "klines-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hdkpbx4z3d9wx6zmhcdfsj8rmxsyh3ay-kdenetwork-filesharing-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz"; + sha256 = "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy"; + name = "kdenetwork-filesharing-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-15.04.2.tar.xz" ".tar"; + store = "/nix/store/4k68344zgzdb3a11zgjlv4npcc16gxag-klickety-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klickety-15.04.2.tar.xz"; + sha256 = "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5"; + name = "klickety-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.2.tar.xz" ".tar"; + store = "/nix/store/79xzz7i1yspf2mlzzbzzgaxk8szx0a8p-ktp-contact-runner-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz"; + sha256 = "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf"; + name = "ktp-contact-runner-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenlive-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5q0r2446rj0dkxc3k5m96rjbbcgvyg4a-kdenlive-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz"; + sha256 = "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa"; + name = "kdenlive-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6gskfm2ymh6mnv2irgj5v21r3hhypf9s-lskat-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/lskat-15.04.2.tar.xz"; + sha256 = "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4"; + name = "lskat-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-15.04.2.tar.xz" ".tar"; + store = "/nix/store/16pvgzgzp6y44n3cmpnajgw74m92wd9i-kblackbox-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz"; + sha256 = "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3"; + name = "kblackbox-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/33rnc300y683cxcp50mi1awdk4rxpp18-kapptemplate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz"; + sha256 = "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294"; + name = "kapptemplate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s3ni25fyw0i7jykk0bdybq4jq60yfgi5-kbreakout-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz"; + sha256 = "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg"; + name = "kbreakout-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wr8lj1871w99ffd0dgjyn3rgr2kix9sm-ktimer-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz"; + sha256 = "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0"; + name = "ktimer-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/rcckq4x2wvg7rgm4nbwlmzqhxsasmbd4-juk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/juk-15.04.2.tar.xz"; + sha256 = "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp"; + name = "juk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1b0cd8ahc9841k5f3yp8mnfi43gmca5b-kdewebdev-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz"; + sha256 = "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4"; + name = "kdewebdev-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8n1ls70j6sp30v5172f8b4pni77h612w-pairs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/pairs-15.04.2.tar.xz"; + sha256 = "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a"; + name = "pairs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qxv3q0s8qvkmw3gv186zb5h8ds9qif9c-kopete-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kopete-15.04.2.tar.xz"; + sha256 = "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3"; + name = "kopete-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1d78nc8bn6q9pya6fmbvpv1j504h2p74-kreversi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz"; + sha256 = "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs"; + name = "kreversi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/40vin5w140gna791rbdvgiqv6gmdy5a6-knetwalk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz"; + sha256 = "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn"; + name = "knetwalk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nfikvnas8aa532z85hra7d5lbdcp0sjb-kdeartwork-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz"; + sha256 = "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n"; + name = "kdeartwork-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ch4qds4ksc7bxc7qvnp594bcq15f7lfg-artikulate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz"; + sha256 = "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v"; + name = "artikulate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/br9b5cwnam0xgh9pm3sa1gf6r4wmr2pf-kaccounts-providers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz"; + sha256 = "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv"; + name = "kaccounts-providers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kpd3k77yxizdi9x0063m6dwjlw002xmh-kiten-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kiten-15.04.2.tar.xz"; + sha256 = "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3"; + name = "kiten-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3058pvg2jwnd405awd0ajk78qbn3pgr2-libksane-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libksane-15.04.2.tar.xz"; + sha256 = "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s"; + name = "libksane-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jw8kq5lv729dyz48fr0ynck8l1fi5lz9-kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + sha256 = "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8"; + name = "kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kay8y3b2yqw6x5n6d0bjh86x76p1pvr3-cantor-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/cantor-15.04.2.tar.xz"; + sha256 = "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm"; + name = "cantor-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v0ig7hdlixwprlrjpirxsj3mqg3mzj34-dragon-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/dragon-15.04.2.tar.xz"; + sha256 = "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s"; + name = "dragon-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/58nbpzqmcw17152bs24lh6h3mj6c6nlf-ktp-auth-handler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz"; + sha256 = "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h"; + name = "ktp-auth-handler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hxhzw8r4ji2z6m1scybs90q3n4sf0p34-katomic-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/katomic-15.04.2.tar.xz"; + sha256 = "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras"; + name = "katomic-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9kjmy8gy1lybbgv45m3jpi5dg2f0d9xl-svgpart-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz"; + sha256 = "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29"; + name = "svgpart-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bg5g9qpbzwrp50ipg3x9mi54dmp04hnw-kdegraphics-thumbnailers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz"; + sha256 = "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3"; + name = "kdegraphics-thumbnailers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2ws9qacikk9az2dj6lxmg1swm7kwvyk4-ktp-accounts-kcm-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz"; + sha256 = "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01"; + name = "ktp-accounts-kcm-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qvbh4g988977fqahh0vdy6y2mcsa03sq-ktuberling-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz"; + sha256 = "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my"; + name = "ktuberling-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-15.04.2.tar.xz" ".tar"; + store = "/nix/store/y8fy3h6ypqnzr883hq02c8p0rfilizs5-kde-baseapps-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz"; + sha256 = "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv"; + name = "kde-baseapps-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/q36zxbwxvwhmccqsqvjp7s0amc56ci9g-kcalc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz"; + sha256 = "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp"; + name = "kcalc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ailfyyak31rbjd1syva34lh8ldqa589i-sweeper-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz"; + sha256 = "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3"; + name = "sweeper-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-15.04.2.tar.xz" ".tar"; + store = "/nix/store/841sa28hlcjqbh223vfyhf90xk2v7fwk-kuser-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kuser-15.04.2.tar.xz"; + sha256 = "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4"; + name = "kuser-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b7v36hd1nplcfjn9j4sphxh08mw366l8-kturtle-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz"; + sha256 = "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910"; + name = "kturtle-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gpvb35d3ri6z7bxvczhhq4d04a59aa32-libkface-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkface-15.04.2.tar.xz"; + sha256 = "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3"; + name = "libkface-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-15.04.2.tar.xz" ".tar"; + store = "/nix/store/92qgv319y1sypkgcgzhr8k2m2ii992kb-audiocd-kio-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz"; + sha256 = "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh"; + name = "audiocd-kio-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jw9l8530fgdkkzyxdmf90g1p3s7phhs2-kppp-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kppp-15.04.2.tar.xz"; + sha256 = "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9"; + name = "kppp-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-15.04.2.tar.xz" ".tar"; + store = "/nix/store/57ri311sxq7bq64by12vgjqsgmajrfk7-kget-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kget-15.04.2.tar.xz"; + sha256 = "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0"; + name = "kget-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1n2511qxgqb7prz2l85psdq1dypq3qms-kolourpaint-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz"; + sha256 = "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6"; + name = "kolourpaint-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fbf91j6jf0f3ws7sa8spsk2zkm08s5j4-ktouch-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz"; + sha256 = "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf"; + name = "ktouch-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zf38d9iax1bnwga069a921zc7156f6sy-kbruch-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz"; + sha256 = "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825"; + name = "kbruch-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mbfh9c9jrs8a8xb6srhny9ipjs52nx01-kolf-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kolf-15.04.2.tar.xz"; + sha256 = "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l"; + name = "kolf-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-15.04.2.tar.xz" ".tar"; + store = "/nix/store/i6k8yvh7rf1dqd2kn6aqmyzzcayxp3sy-kgamma-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz"; + sha256 = "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l"; + name = "kgamma-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9ca8cpnw78bnlrqi1yyy192qbb93y82q-kigo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kigo-15.04.2.tar.xz"; + sha256 = "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc"; + name = "kigo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vdwv4ww6n28gpc2rkylml28yalihy1q6-kdesdk-kioslaves-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz"; + sha256 = "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8"; + name = "kdesdk-kioslaves-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qc0mhibyrkipf7ryl45d0caaj5xsvmpc-kde-dev-scripts-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz"; + sha256 = "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5"; + name = "kde-dev-scripts-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l7vgzgq9zh2q3nm6lvvxg57p86qr6z8a-kcachegrind-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz"; + sha256 = "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13"; + name = "kcachegrind-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ayx65a6hvxxyw4cclvw8f9c79pixbklf-libkomparediff2-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz"; + sha256 = "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99"; + name = "libkomparediff2-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v7qcb9dvh0sg031y8s7qlhjj7bfi0hba-killbots-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/killbots-15.04.2.tar.xz"; + sha256 = "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q"; + name = "killbots-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/llzpz351096v1jq26pnpq38s353rijfk-rocs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/rocs-15.04.2.tar.xz"; + sha256 = "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw"; + name = "rocs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-15.04.2.tar.xz" ".tar"; + store = "/nix/store/678x21vwippxpjg2bsv79127s6852clb-kmines-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmines-15.04.2.tar.xz"; + sha256 = "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s"; + name = "kmines-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ykck6cw92ddmlcarb2b5rkqcsshrk54w-libkdeedu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz"; + sha256 = "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q"; + name = "libkdeedu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.2.tar.xz" ".tar"; + store = "/nix/store/aifqj9bdnahhjisqbiamcx8mq8fkw234-ktp-common-internals-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz"; + sha256 = "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq"; + name = "ktp-common-internals-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3z0xfsx62crxyp35in81zz5y84dcrfgr-kompare-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kompare-15.04.2.tar.xz"; + sha256 = "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk"; + name = "kompare-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qfq2a23wsl1lws544pp5p0hgmprr2kaj-analitza-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/analitza-15.04.2.tar.xz"; + sha256 = "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j"; + name = "analitza-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fcj9c30mhz0s2qhlch2sc1bsy52vp1hk-parley-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/parley-15.04.2.tar.xz"; + sha256 = "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc"; + name = "parley-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3c6adpvdmw4yvwqa4ivn3mqf0himjf1f-libkipi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz"; + sha256 = "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72"; + name = "libkipi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.2.tar.xz" ".tar"; + store = "/nix/store/q3m5pc6n5f7l2hipmfplsjbswzg8n0vh-kqtquickcharts-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz"; + sha256 = "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6"; + name = "kqtquickcharts-15.04.2.tar.xz"; + }; + } ] diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh index 2aa3cee8c85..d74d9cbbfbc 100755 --- a/pkgs/applications/kde-apps-15.04/manifest.sh +++ b/pkgs/applications/kde-apps-15.04/manifest.sh @@ -10,6 +10,7 @@ if [ $# -eq 0 ]; then $(nix-build ../../.. -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.0/" \ "${KDE_MIRROR}/stable/applications/15.04.1/" \ + "${KDE_MIRROR}/stable/applications/15.04.2/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else From fbcdb662641395901f43f19f151f5654e9d345da Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 5 Jun 2015 16:35:06 -0500 Subject: [PATCH 080/412] kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency --- pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 661c8c3acb5..91583d75ead 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -350,6 +350,12 @@ let ++ [ pkgs.libotr ]; # needed for ktp-text-ui }; + ktp-text-ui = super.ktp-text-ui // { + buildInputs = + super.ktp-text-ui.buildInputs + ++ (with kf5; [ kdbusaddons ]); + }; + lokalize = super.lokalize // { buildInputs = super.lokalize.buildInputs From 7e04b7319c54bf0a4c0b6b55caca80a3b7434a87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 23:55:01 +0200 Subject: [PATCH 081/412] haskell: disable parallel compilation for libraries to mitigate the effects of GHC's non-deterministic library ID bug Further details can be found at and . --- pkgs/development/haskell-modules/generic-builder.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index edff84a0403..c0505d6e3c6 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,7 +72,10 @@ let hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary); + # We cannot enable -j parallelism for libraries because GHC is far more + # likely to generate a non-determistic library ID in that case. Further + # details are at . + enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" From 52184b53c05464fc9ccd3dd8200cb78c41ec8cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 6 Jun 2015 09:21:21 +0200 Subject: [PATCH 082/412] Revert "Revert "Explicitly pass -pthread flag to fix the build after some updates"" This reverts commit 6cfea50ad14b3225226e64bd77925dc05a593689. I think the reason for the revert was because of patch dependencies. We really need this patch to fix heimdal build. Or else: $ nix-build -A heimdal ... /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_getspecific' /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_key_create' /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_setspecific' collect2: error: ld returned 1 exit status Makefile:509: recipe for target 'tc' failed make[2]: *** [tc] Error 1 --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index aeea290bdb2..320e161d3da 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { "--without-x" ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread" + ''; + # We need to build hcrypt for applications like samba postBuild = '' (cd lib/hcrypto; make) From 08c4a192e23681d31cf88c1509ddf29cf802492a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Jun 2015 09:43:15 +0200 Subject: [PATCH 083/412] ghc-7.10.x.nix: remove obsolete re-build hacks from the package set configuration --- .../haskell-modules/configuration-ghc-7.10.x.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ac02bbc8818..335b133f555 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -278,18 +278,4 @@ self: super: { # Won't work with LLVM 3.5. llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; - # Ugly hack to trigger a rebuild to fix the broken package on Hydra. - asn1-encoding = appendConfigureFlag super.asn1-encoding "-fignore-me-1"; - asn1-types = appendConfigureFlag super.asn1-types "-fignore-me-1"; - cmdargs = appendConfigureFlag super.cmdargs "-fignore-me-1"; - crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; - crypto-pubkey-types = appendConfigureFlag super.crypto-pubkey-types "-fignore-me-1"; - hourglass = appendConfigureFlag super.hourglass "-fignore-me-1"; - math-functions = appendConfigureFlag super.math-functions "-fignore-me-1"; - tagsoup = appendConfigureFlag super.tagsoup "-fignore-me-1"; - X11 = appendConfigureFlag super.X11 "-fignore-me-1"; - x509 = appendConfigureFlag super.x509 "-fignore-me-1"; - x509-store = appendConfigureFlag super.x509-store "-fignore-me-1"; - x509-system = appendConfigureFlag super.x509-system "-fignore-me-1"; - } From 6aa10201ccbc81b055094a87f3e45aa2aa850f5e Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 6 Jun 2015 18:38:18 +0900 Subject: [PATCH 084/412] flashplayer: Update from 11.2.202.457 -> 11.2.202.460 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 35541b39ee8..79d95571f2f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.457"; + version = "11.2.202.460"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0nkr6p4h5l03ywsj1sbap359cl1x9rq3m12j9gvwvbvn935rmyr2"; + sha256 = "152hhxismgvz6hkh5m8z5x1drpwflymd2zk3v96nszpkb2xxirnr"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0qil5rb61bkn80fij31nv29q2wa7bxiwwxgy5zlkm2hsyrz3y4kc"; + sha256 = "15655c3kzk1mk00737wgc52i4zz5jh9fkjgjs747qwiik5pnh7x1"; } else throw "Flash Player is not supported on this platform"; From 5f890ceca186baefc1dfde14f7a84e609d31e294 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 6 Jun 2015 19:05:57 +0900 Subject: [PATCH 085/412] firefox-bin, thunderbird-bin: update patchelf arguments --- .../networking/browsers/firefox-bin/default.nix | 8 +++++++- .../networking/mailreaders/thunderbird-bin/default.nix | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 998ea95e8da..749e4226cd7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -131,7 +131,13 @@ stdenv.mkDerivation { for executable in \ firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub libxul.so + updater crashreporter webapprt-stub \ + components/libdbusservice.so components/libmozgnome.so \ + gmp-clearkey/0.1/libclearkey.so \ + browser/components/libbrowsercomps.so \ + libnssdbm3.so libsmime3.so libxul.so libnss3.so libplc4.so \ + libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \ + libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so do patchelf --set-rpath "$libPath" \ "$out/usr/lib/firefox-bin-${version}/$executable" diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index be276a4cfa2..23e4f397e82 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -121,7 +121,12 @@ stdenv.mkDerivation { for executable in \ thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ - updater libxul.so + updater \ + components/libdbusservice.so components/libmozgnome.so \ + libnssdbm3.so libsmime3.so libxul.so libprldap60.so libnss3.so \ + libplc4.so libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so \ + libssl3.so libldif60.so libsoftokn3.so libldap60.so libnssutil3.so \ + libnssckbi.so libplds4.so do patchelf --set-rpath "$libPath" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" From e32d6f6b52bef6aa515e3f12740ea5ab8bd8ba80 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jun 2015 14:00:24 +0200 Subject: [PATCH 086/412] ocaml-re: update from 1.3.1 to 1.4.0 --- pkgs/development/ocaml-modules/re/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index b2dd0609a0e..457b45a575e 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.3.1"; + name = "ocaml-re-1.4.0"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; - sha256 = "11d4k43pc97kvdbjgjcxpc0gq6yal4galkxlrfdp1iypwdcni92g"; + sha256 = "1xcfmhjgd7prqx2g1addlrk84xpfafmqnpjkqrvg7mw0hn1p7v2m"; }; buildInputs = [ ocaml findlib ]; From 8c0389ac01baddeb16a233e9bde6958eec45bf0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2015 12:28:48 +0200 Subject: [PATCH 087/412] python-packages: prompt_toolkit -> 0.39 Fixes: - Fixed layout.py example. - Fixed eventloop for Python 64bit on Windows. - Fix in history. - Fix in key bindings. --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5083d4d1032..d3ddc879a17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8494,6 +8494,10 @@ let propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + meta = { description = "Command-line interface for PostgreSQL"; longDescription = '' @@ -8792,11 +8796,11 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.38"; + version = "0.39"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc"; + sha256 = "1046fhgqd1171n8xyzcxwzcxgkcwa77r08g7iih8k5x7z59l94lb"; }; buildInputs = with self; [ jedi ipython pygments ]; From 90f4843f45c1a6c75d294a9313b0012d347c8be6 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 6 Jun 2015 15:21:08 +0300 Subject: [PATCH 088/412] f2fs-tools: 1.3.0 -> 1.4.1 --- pkgs/tools/filesystems/f2fs-tools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f52ead32acd..f8fa5cc264d 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.3.0"; + version = "1.4.1"; src = fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git; rev = "refs/tags/v${version}"; - sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i"; + sha256 = "16i74r2656q6x4gg5kgjy2fxipr5czbm10r66s34pi2lfczbwhjr"; }; buildInputs = [ autoconf automake libtool pkgconfig libuuid ]; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { autoreconf --install ''; - meta = { + meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.emery ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ emery jagajaga ]; }; } From d4681bf62672083f92545e02e00b8cf040247e8d Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 22 May 2015 14:25:02 +0100 Subject: [PATCH 089/412] Lay down the foundation for packaging the .NET echosystem - fetchNuGet can fetch binaries from nuget servers - buildDotnetPackage can build .NET packages using mono/xbuild - Places nuget & paket as they would clash with nix - Patch project files because F# targets are expected to be found in the mono directory (and we know that's not going to happen on nix) - Find DLLs that were copied from buildInputs and replace by symlink for sharing - Export produced DLL via the pkg-config mechanism - Create wrappers for produced EXEs - Repackaged this new infrastructure: keepass, monodevelop - Newly packaged: ExtCore, UnionArgParser, FSharp.Data, Paket, and a bunch more.. This is a combination of 73 commits. --- .../editors/monodevelop/default.nix | 77 +-- ...10fb3f6dce121df538e36f21d8c2eeb0a6e3.patch | 57 ++ pkgs/applications/misc/keepass/default.nix | 30 +- pkgs/applications/misc/keepass/keepass.patch | 89 ++++ .../build-dotnet-package/default.nix | 109 ++++ .../create-pkg-config-for-dll.sh | 23 + .../dotnetbuildhelpers/default.nix | 18 + .../patch-fsharp-targets.sh | 20 + .../dotnetbuildhelpers/placate-nuget.sh | 7 + .../dotnetbuildhelpers/placate-paket.sh | 7 + .../remove-duplicated-dlls.sh | 22 + pkgs/build-support/fetchnuget/default.nix | 40 ++ pkgs/development/compilers/fsharp/default.nix | 10 +- pkgs/development/compilers/mono/default.nix | 15 +- .../compilers/mono/pkgconfig-before-gac.patch | 65 +++ .../monodevelop-fsharpbinding.addin-xml.patch | 88 ++++ ...monodevelop-fsharpbinding.references.patch | 43 ++ .../patches/newtonsoft-json.references.patch | 11 + pkgs/top-level/all-packages.nix | 9 + pkgs/top-level/dotnet-packages.nix | 495 ++++++++++++++++++ 20 files changed, 1159 insertions(+), 76 deletions(-) create mode 100644 pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch create mode 100644 pkgs/applications/misc/keepass/keepass.patch create mode 100644 pkgs/build-support/build-dotnet-package/default.nix create mode 100644 pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh create mode 100644 pkgs/build-support/dotnetbuildhelpers/default.nix create mode 100644 pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh create mode 100644 pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh create mode 100644 pkgs/build-support/dotnetbuildhelpers/placate-paket.sh create mode 100644 pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh create mode 100644 pkgs/build-support/fetchnuget/default.nix create mode 100644 pkgs/development/compilers/mono/pkgconfig-before-gac.patch create mode 100644 pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch create mode 100644 pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch create mode 100644 pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch create mode 100644 pkgs/top-level/dotnet-packages.nix diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index b04e37746e0..b27bc75ed59 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, fetchgit +{ stdenv, fetchurl, fetchgit, fetchNuGet , autoconf, automake, pkgconfig, shared_mime_info, intltool , glib, mono, gtk-sharp, gnome, gnome-sharp, unzip +, dotnetPackages }: stdenv.mkDerivation rec { @@ -13,79 +14,33 @@ stdenv.mkDerivation rec { sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn"; }; - srcNugetBinary = fetchgit { - url = "https://github.com/mono/nuget-binary.git"; - rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047"; - sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3"; - }; - - srcNUnit = fetchurl { - url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3"; - sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph"; - }; - - srcNUnitRunners = fetchurl { - url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3"; - sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b"; - }; - - srcNUnit2510 = fetchurl { + nunit2510 = fetchurl { url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip"; sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; }; - srcNugetSystemWebMvcExtensions = fetchurl { - url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9; - sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j"; - }; - - srcNugetMicrosoftAspNetMvc = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2; - sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b"; - }; - - srcNugetMicrosoftAspNetRazor = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2; - sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd"; - }; - - srcNugetMicrosoftAspNetWebPages = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2; - sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l"; - }; - - srcNugetMicrosoftWebInfrastructure = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0; - sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn"; - }; - postPatch = '' # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 - # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included - # (?), so download it and put it in the right place in the tree - mkdir packages - unzip ${srcNUnit} -d packages/NUnit.2.6.3 - unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3 - # cecil needs NUnit 2.5.10 - this is also missing from the tar - unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* + unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* # the tar doesn't include the nuget binary, so grab it from github and copy it # into the right place - cp -vfR ${srcNugetBinary}/* external/nuget-binary/ - - # AspNet plugin requires these packages - unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9 - unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2 - unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2 - unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2 - unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0 + cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/ ''; + # Revert this commit which broke the ability to use pkg-config to locate dlls + patchFlags = [ "-p2" ]; + patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; + buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool mono gtk-sharp gnome-sharp unzip + pkgconfig + dotnetPackages.NUnit + dotnetPackages.NUnitRunners + dotnetPackages.Nuget ]; preConfigure = "patchShebangs ./configure"; @@ -108,6 +63,12 @@ stdenv.mkDerivation rec { > EOF done + + # Without this, you get a missing DLL error any time you install an addin.. + ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit ''; dontStrip = true; diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch new file mode 100644 index 00000000000..969aad33ec0 --- /dev/null +++ b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch @@ -0,0 +1,57 @@ +diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +index 02d3a01..c6daaad 100644 +--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj ++++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +@@ -452,34 +452,6 @@ + + PreserveNewest + +- +- System.Web.Mvc.dll +- PreserveNewest +- +- +- System.Web.Razor.dll +- PreserveNewest +- +- +- System.Web.Helpers.dll +- PreserveNewest +- +- +- System.Web.WebPages.Deployment.dll +- PreserveNewest +- +- +- System.Web.WebPages.dll +- PreserveNewest +- +- +- System.Web.WebPages.Razor.dll +- PreserveNewest +- +- +- Microsoft.Web.Infrastructure.dll +- PreserveNewest +- + + + +diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +index eab7c32..4a75311 100644 +--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml ++++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +@@ -1,13 +1,6 @@ + + + +- +- +- +- +- +- +- + + + diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index d46efc4e5e8..f659e4f6c2d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, unzip, makeDesktopItem, mono }: +{ stdenv, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem }: -stdenv.mkDerivation rec { - name = "keepass-${version}"; +buildDotnetPackage rec { + baseName = "keepass"; version = "2.29"; src = fetchurl { - url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; - sha256 = "16x7m899akpi036c0wlr41w7fz9q0b69yac9q97rqkixb03l4g9d"; + url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; + sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m"; }; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; + buildInputs = [ unzip ]; + + patches = [ ./keepass.patch ]; + + preConfigure = "rm -rvf Build/*"; desktopItem = makeDesktopItem { name = "keepass"; @@ -22,23 +26,19 @@ stdenv.mkDerivation rec { categories = "Application;Other;"; }; + outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ]; + dllFiles = [ "KeePassLib.dll" ]; + exeFiles = [ "KeePass.exe" ]; - installPhase = '' - mkdir -p "$out/bin" - echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass - chmod +x $out/bin/keepass - echo $out - cp -r ./* $out/ + postInstall = '' mkdir -p "$out/share/applications" cp ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ unzip ]; - meta = { description = "GUI password manager with strong cryptography"; homepage = http://www.keepass.info/; - maintainers = with stdenv.lib.maintainers; [amorsillo]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch new file mode 100644 index 00000000000..6ecf0bb074d --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass.patch @@ -0,0 +1,89 @@ +diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj +--- old/KeePass/KeePass.csproj 2015-04-10 11:00:46.000000000 +0100 ++++ new/KeePass/KeePass.csproj 2015-05-27 16:35:52.196177593 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU +@@ -10,7 +10,7 @@ + KeePass + KeePass + KeePass.ico +- true ++ false + KeePass.pfx + + +@@ -1316,6 +1316,5 @@ + + --> + +- "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign- + +- +\ No newline at end of file ++ +diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj +--- old/KeePassLib/KeePassLib.csproj 2014-05-08 15:00:24.000000000 +0100 ++++ new/KeePassLib/KeePassLib.csproj 2015-05-27 16:35:52.197177562 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU +@@ -9,7 +9,7 @@ + Properties + KeePassLib + KeePassLib +- true ++ false + KeePassLib.pfx + + +diff -Naur old/KeePass.sln new/KeePass.sln +--- old/KeePass.sln 2009-08-31 19:47:28.000000000 +0100 ++++ new/KeePass.sln 2015-05-27 16:35:59.568953518 +0100 +@@ -1,11 +1,9 @@ +-Microsoft Visual Studio Solution File, Format Version 10.00 ++Microsoft Visual Studio Solution File, Format Version 12.00 + # Visual Studio 2008 + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}" + EndProject + Global +@@ -44,18 +42,6 @@ + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj +--- old/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0100 ++++ new/Translation/TrlUtil/TrlUtil.csproj 2015-05-27 16:35:52.197177562 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix new file mode 100644 index 00000000000..00be987af75 --- /dev/null +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: + +attrsOrig @ +{ baseName +, version +, buildInputs ? [] +, xBuildFiles ? [ ] +, xBuildFlags ? [ "/p:Configuration=Release" ] +, outputFiles ? [ "bin/Release/*" ] +, dllFiles ? [ "*.dll" ] +, exeFiles ? [ "*.exe" ] +, ... }: + let + arrayToShell = (a: toString (map (lib.escape (lib.stringToCharacters "\\ ';$`()|<>\t") ) a)); + + attrs = { + name = "${baseName}-${version}"; + + buildInputs = [ + pkgconfig + mono + dotnetbuildhelpers + makeWrapper + ] ++ buildInputs; + + configurePhase = '' + runHook preConfigure + + [ -z "$dontPlacateNuget" ] && placate-nuget.sh + [ -z "$dontPlacatePaket" ] && placate-paket.sh + [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + echo Building dotNET packages... + + # Probably needs to be moved to fsharp + if pkg-config FSharp.Core + then + export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" + fi + + ran="" + for xBuildFile in ${arrayToShell xBuildFiles} ''${xBuildFilesExtra} + do + ran="yes" + xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray} $xBuildFile + done + + [ -z "$ran" ] && xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray} + + runHook postBuild + ''; + + dontStrip = true; + + installPhase = '' + runHook preInstall + + target="$out/lib/dotnet/${baseName}" + mkdir -p "$target" + + cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target" + + if [ -z "$dontRemoveDuplicatedDlls" ] + then + pushd "$out" + remove-duplicated-dlls.sh + popd + fi + + set -f + for dllPattern in ${arrayToShell dllFiles} ''${dllFilesArray[@]} + do + set +f + for dll in "$target"/$dllPattern + do + [ -f "$dll" ] || continue + if pkg-config $(basename -s .dll "$dll") + then + echo "$dll already exported by a buildInputs, not re-exporting" + else + ${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + fi + done + done + + set -f + for exePattern in ${arrayToShell exeFiles} ''${exeFilesArray[@]} + do + set +f + for exe in "$target"/$exePattern + do + [ -f "$exe" ] || continue + mkdir -p "$out"/bin + commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")" + makeWrapper "${mono}/bin/mono \"$exe\"" "$out"/bin/"$commandName" + done + done + + runHook postInstall + ''; + }; + in + stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] )) diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh new file mode 100644 index 00000000000..37914170452 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +targetDir="$1" +dllFullPath="$2" + +dllVersion="$(monodis --assembly "$dllFullPath" | grep ^Version: | cut -f 2 -d : | xargs)" +[ -z "$dllVersion" ] && echo "Defaulting dllVersion to 0.0.0" && dllVersion="0.0.0" +dllFileName="$(basename $dllFullPath)" +dllRootName="$(basename -s .dll $dllFileName)" +targetPcFile="$targetDir"/"$dllRootName".pc + +mkdir -p "$targetDir" + +cat > $targetPcFile << EOF +Libraries=$dllFullPath + +Name: $dllRootName +Description: $dllRootName +Version: $dllVersion +Libs: -r:$dllFileName +EOF + +echo "Created $targetPcFile" diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix new file mode 100644 index 00000000000..ed0d4f790c8 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -0,0 +1,18 @@ +{ helperFunctions, mono, pkgconfig }: + helperFunctions.runCommand + "dotnetbuildhelpers" + { preferLocalBuild = true; } + '' + target="$out/bin" + mkdir -p "$target" + + for script in ${./create-pkg-config-for-dll.sh} ${./patch-fsharp-targets.sh} ${./remove-duplicated-dlls.sh} ${./placate-nuget.sh} ${./placate-paket.sh} + do + scriptName="$(basename "$script" | cut -f 2- -d -)" + cp -v "$script" "$target"/"$scriptName" + chmod 755 "$target"/"$scriptName" + patchShebangs "$target"/"$scriptName" + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/pkg-config + substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis + done + '' diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh new file mode 100644 index 00000000000..3f81cc73e80 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Some project files look for F# targets in $(FSharpTargetsPath) +# so it's a good idea to add something like this to your ~/.bash_profile: + +# export FSharpTargetsPath=$(dirname $(which fsharpc))/../lib/mono/4.0/Microsoft.FSharp.Targets + +# In build scripts, you would add somehting like this: + +# export FSharpTargetsPath="${fsharp}/lib/mono/4.0/Microsoft.FSharp.Targets" + +# However, some project files look for F# targets in the main Mono directory. When that happens +# patch the project files using this script so they will look in $(FSharpTargetsPath) instead. + +echo "Patching F# targets in fsproj files..." + +find -iname \*.fsproj -print -exec \ + sed --in-place=.bak \ + -e 's,\([^<]*\),\1,'g \ + {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh new file mode 100644 index 00000000000..8a7f36522a3 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo Placating Nuget in nuget.targets +find -iname nuget.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true NUGET PLACATED BY buildDotnetPackage,g' {} \; + +echo Just to be sure, replacing Nuget executables by empty files. +find . -iname nuget.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh new file mode 100644 index 00000000000..0dbf1eecbad --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo Placating Paket in paket.targets +find -iname paket.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true PAKET PLACATED BY buildDotnetPackage,g' {} \; + +echo Just to be sure, replacing Paket executables by empty files. +find . -iname paket\*.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh new file mode 100644 index 00000000000..d8d29912c8f --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +IFS=" +" + +for dll in $(find -iname \*.dll) +do + baseName="$(basename "$dll" | sed "s/.dll$//i")" + if pkg-config "$baseName" + then + candidateDll="$(pkg-config "$baseName" --variable=Libraries)" + + if diff "$dll" "$candidateDll" >/dev/null + then + echo "$dll is identical to $candidateDll. Substituting..." + rm -vf "$dll" + ln -sv "$candidateDll" "$dll" + else + echo "$dll and $candidateDll share the same name but have different contents, leaving alone." + fi + fi +done diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix new file mode 100644 index 00000000000..803db27c9d5 --- /dev/null +++ b/pkgs/build-support/fetchnuget/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildDotnetPackage, unzip }: + +attrs @ +{ baseName +, version +, url ? "https://www.nuget.org/api/v2/package/${baseName}/${version}" +, sha256 ? "" +, md5 ? "" +, ... +}: + buildDotnetPackage ({ + src = fetchurl { + inherit url sha256 md5; + name = "${baseName}.${version}.zip"; + }; + + sourceRoot = "."; + + buildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + preInstall = '' + function traverseRename () { + for e in * + do + t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")" + [ "$t" != "$e" ] && mv -vn "$e" "$t" + if [ -d "$t" ] + then + cd "$t" + traverseRename + cd .. + fi + done + } + + traverseRename + ''; + } // attrs) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 82742cf9af6..92d80deb532 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mono, pkgconfig, autoconf, automake, which }: +# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it + +{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { name = "fsharp-${version}"; @@ -9,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd"; }; - buildInputs = [ mono pkgconfig autoconf automake which ]; + buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; configurePhase = '' substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" ./autogen.sh --prefix $out @@ -23,6 +25,10 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " ln -s $out/bin/fsharpc $out/bin/fsc ln -s $out/bin/fsharpi $out/bin/fsi + for dll in "$out/lib/mono/4.5"/FSharp*.dll + do + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + done ''; # To fix this error when running: diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index ba2ce00cfb5..66939ff1a02 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? true }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }: let llvm = callPackage ./llvm.nix { }; @@ -31,11 +31,16 @@ stdenv.mkDerivation rec { # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 enableParallelBuilding = false; + # We want pkg-config to take priority over the dlls in the Mono framework and the GAC + # because we control pkg-config + patches = [ ./pkgconfig-before-gac.patch ]; + # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default # LLVM path to point into the Mono LLVM build, since it's private anyway. preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ + substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" '' + stdenv.lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; @@ -50,6 +55,14 @@ stdenv.mkDerivation rec { done ''; + # Without this, any Mono application attempting to open an SSL connection will throw with + # The authentication or decryption has failed. + # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. + postInstall = '' + echo "Updating Mono key store" + $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch new file mode 100644 index 00000000000..7632d850391 --- /dev/null +++ b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch @@ -0,0 +1,65 @@ +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2015-05-26 00:52:33.997847464 +0100 +@@ -229,8 +229,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2015-05-26 00:52:41.832612748 +0100 +@@ -214,8 +214,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2015-05-26 00:52:46.298478961 +0100 +@@ -139,8 +139,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2015-05-26 00:52:52.119304583 +0100 +@@ -167,8 +167,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2015-05-26 00:52:56.519172776 +0100 +@@ -229,8 +229,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch new file mode 100644 index 00000000000..a3b2f87f378 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch @@ -0,0 +1,88 @@ +--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old 2015-06-03 19:53:00.116849746 +0100 ++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig 2015-06-03 19:56:30.112579384 +0100 +@@ -130,6 +130,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -182,14 +187,7 @@ + + + +- +- +- +- +- + +- +- + + + +@@ -267,13 +265,7 @@ + + + +- +- +- +- +- + +- + + + +@@ -281,11 +273,6 @@ + + + +- +- +- +- +- + + + +- + + + +- +- +- +- +- + + + + +- + + + +- +- +- +- +- + + + +- + + + diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch new file mode 100644 index 00000000000..e53482e0c00 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch @@ -0,0 +1,43 @@ +--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig.old 2015-06-03 18:48:55.345385084 +0100 ++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig 2015-06-03 19:00:11.453399028 +0100 +@@ -185,19 +185,19 @@ + False + INSERT_FSPROJ_MDROOT\AddIns\NUnit\MonoDevelop.NUnit.dll + +- +- {88F6940F-D300-474C-B2A7-E2ECD5B04B57} +- FSharp.CompilerBinding +- ++ ++ True ++ + + {FD0D1033-9145-48E5-8ED8-E2365252878C} + MonoDevelop.FSharp.Gui + +- ++ + True + + + packages\FSharp.Compiler.Service.0.0.85\lib\net45\FSharp.Compiler.Service.dll ++ True + + + packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll +@@ -213,12 +213,15 @@ + + + packages\Fantomas.1.6.0\lib\FantomasLib.dll ++ True + + + packages\FSharp.Compiler.CodeDom.0.9.1\lib\net40\FSharp.Compiler.CodeDom.dll ++ True + + + packages\ExtCore.0.8.45\lib\net40\ExtCore.dll ++ True + + + diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch new file mode 100644 index 00000000000..ed9b7adbef2 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch @@ -0,0 +1,11 @@ +--- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old 2015-01-11 06:46:39.000000000 +0000 ++++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj 2015-05-25 21:29:40.546808622 +0100 +@@ -52,6 +52,8 @@ + + + ++ ++ + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3262dc7943..46b5b7fd146 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,6 +285,10 @@ let dotnetfx = dotnetfx40; }; + dotnetbuildhelpers = import ../build-support/dotnetbuildhelpers { + inherit mono helperFunctions pkgconfig; + }; + scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh; vsenv = callPackage ../build-support/vsenv { @@ -409,6 +413,9 @@ let meta.homepage = "http://repo.or.cz/${repo}.git/"; }; + fetchNuGet = import ../build-support/fetchnuget { inherit stdenv fetchurl buildDotnetPackage unzip; }; + buildDotnetPackage = import ../build-support/build-dotnet-package { inherit stdenv lib makeWrapper mono pkgconfig dotnetbuildhelpers; }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -3872,6 +3879,8 @@ let fsharp = callPackage ../development/compilers/fsharp {}; + dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; }); + go_1_0 = callPackage ../development/compilers/go { }; go_1_1 = diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix new file mode 100644 index 00000000000..852856d4c69 --- /dev/null +++ b/pkgs/top-level/dotnet-packages.nix @@ -0,0 +1,495 @@ +{ stdenv +, pkgs +, buildDotnetPackage +, fetchurl +, fetchFromGitHub +, fetchNuGet +, pkgconfig +, mono +, monodevelop +, fsharp +, unzip +, overrides ? {} +}: + +let self = dotnetPackages // overrides; dotnetPackages = with self; { + + Autofac = fetchNuGet { + baseName = "Autofac"; + version = "3.5.2"; + sha256 = "194cs8ybn5xjqnzy643w5i62m0d5s34d3nshwxp2v4fcb94wa4ri"; + outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ]; + }; + + Fake = fetchNuGet { + baseName = "FAKE"; + version = "3.33.0"; + sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm"; + outputFiles = [ "tools/*" ]; + dllFiles = [ "Fake*.dll" ]; + }; + + Fantomas = fetchNuGet { + baseName = "Fantomas"; + version = "1.6.0"; + sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q"; + outputFiles = [ "lib/*" ]; + dllFiles = [ "Fantomas*.dll" ]; + }; + + FSharpCompilerCodeDom = fetchNuGet { + baseName = "FSharp.Compiler.CodeDom"; + version = "0.9.2"; + sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj"; + outputFiles = [ "lib/net40/*" ]; + }; + + FsCheck = fetchNuGet { + baseName = "FsCheck"; + version = "1.0.4"; + sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad"; + outputFiles = [ "lib/net45/*" ]; + }; + + FsCheckNunit = fetchNuGet { + baseName = "FsCheck.Nunit"; + version = "1.0.4"; + sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy"; + outputFiles = [ "lib/net45/*" ]; + }; + + FsUnit = fetchNuGet { + baseName = "FsUnit"; + version = "1.3.0.1"; + sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64"; + outputFiles = [ "Lib/Net40/*" ]; + }; + + NUnit = fetchNuGet { + baseName = "NUnit"; + version = "2.6.4"; + sha256 = "1acwsm7p93b1hzfb83ia33145x0w6fvdsfjm9xflsisljxpdx35y"; + outputFiles = [ "lib/*" ]; + }; + + NUnitRunners = fetchNuGet { + baseName = "NUnit.Runners"; + version = "2.6.4"; + sha256 = "11nmi7vikn9idz8qcad9z7f73arsh5rw18fc1sri9ywz77mpm1s4"; + outputFiles = [ "tools/*" ]; + preInstall = "mv -v tools/lib/* tools && rmdir -v tools/lib"; + }; + + SystemCollectionsImmutable = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.1.36"; + sha256 = "0760kzf5s771pnvnxsgas446kqdh1b71w6g3k75jpzldfmsd3vyq"; + outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; + }; + + ExtCore = buildDotnetPackage rec { + baseName = "ExtCore"; + version = "0.8.46"; + + src = fetchFromGitHub { + owner = "jack-pappas"; + repo = "ExtCore"; + rev = "0269b6d3c479f45abd7aa983aaeca08d07473943"; + sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.FsCheck + ]; + + postConfigure = '' + # Fix case + sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj + ''; + + xBuildFlags = [ "/p:Configuration=Release (net45)" ]; + outputFiles = [ "ExtCore/bin/net45/Release/*" ]; + + meta = { + description = "ExtCore is an extended core library for F#"; + homepage = "https://github.com/jack-pappas/ExtCore"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpAutoComplete = buildDotnetPackage rec { + baseName = "FSharp.AutoComplete"; + version = "0.16.0"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsharp/FSharp.AutoComplete/archive/${version}.tar.gz"; + sha256 = "0mwp456zfw1sjy2mafz2shx0sjn4f858pfnsmawy50g8l2znw8qg"; + }; + + buildInputs = [ + fsharp + dotnetPackages.FSharpCompilerService + dotnetPackages.NewtonsoftJson + dotnetPackages.NDeskOptions + ]; + + outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ]; + + meta = { + description = "This project provides a command-line interface to the FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors."; + homepage = "https://github.com/fsharp/FSharp.AutoComplete"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpCompilerService = buildDotnetPackage rec { + baseName = "FSharp.Compiler.Service"; + version = "0.0.89"; + + src = fetchFromGitHub { + owner = "fsharp"; + repo = "FSharp.Compiler.Service"; + rev = "55a8143a82bb31c3e8c1ad2af64eb64162fed0d7"; + sha256 = "1f5f97382h8v9p0j7c2gksrps12d869m752n692b3g0k8h4zpial"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + ]; + + outputFiles = [ "bin/v4.5/*" ]; + + meta = { + description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; + homepage = "http://fsharp.github.io/FSharp.Compiler.Service/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpData = buildDotnetPackage rec { + baseName = "FSharp.Data"; + version = "2.2.2"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsharp/FSharp.Data/archive/${version}.tar.gz"; + sha256 = "1li33ydjxz18v8siw53vv1nmkp5w7sdlsjcrfp6dzcynpvwbjw3s"; + }; + + buildInputs = [ fsharp ]; + + fileProvidedTypes = fetchurl { + name = "ProvidedTypes.fs"; + url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs; + sha256 = "1lb056v1xld1rfx6a8p8i2jz8i6qa2r2823n5izsf1qg1qgf2980"; + }; + + fileDebugProvidedTypes = fetchurl { + name = "DebugProvidedTypes.fs"; + url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs; + sha256 = "1whyrf2jv6fs7kgysn2086v15ggjsd54g1xfs398mp46m0nxp91f"; + }; + + preConfigure = '' + # Copy single-files-in-git-repos + mkdir -p "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src" + cp -v "${fileProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/ProvidedTypes.fs" + cp -v "${fileDebugProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/DebugProvidedTypes.fs" + ''; + + xBuildFiles = [ "src/FSharp.Data.fsproj" "src/FSharp.Data.DesignTime.fsproj" ]; + outputFiles = [ "bin/*.dll" "bin/*.xml" ]; + + meta = { + description = "F# Data: Library for Data Access"; + homepage = "http://fsharp.github.io/FSharp.Data/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + # FSharpxExtras = buildDotnetPackage rec { + # baseName = "FSharpx.Extras"; + # version = "1.8.41"; + # + # src = fetchurl { + # name = "${baseName}-${version}.tar.gz"; + # url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz"; + # sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl"; + # }; + # + # buildInputs = [ + # fsharp + # dotnetPackages.NUnit + # dotnetPackages.FsCheck + # dotnetPackages.FsCheckNunit + # dotnetPackages.FsUnit + # ]; + # + # patches = [ ./disable_excel.patch ]; + # + # xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ]; + # outputFiles = [ "build/*" ]; + # + # meta = { + # description = "FSharpx.Extras is a collection of libraries and tools for use with F#."; + # homepage = "http://fsprojects.github.io/FSharpx.Extras/"; + # license = stdenv.lib.licenses.asl20; + # maintainers = with stdenv.lib.maintainers; [ obadz ]; + # platforms = with stdenv.lib.platforms; linux; + # }; + # }; + + MonoDevelopFSharpBinding = buildDotnetPackage rec { + baseName = "MonoDevelop.FSharpBinding"; + version = "git-a09c8185eb"; + + src = fetchFromGitHub { + owner = "fsharp"; + repo = "fsharpbinding"; + rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011"; + sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91"; + }; + + buildInputs = [ + fsharp + monodevelop + pkgs.gtk-sharp + pkgs.gnome-sharp + dotnetPackages.ExtCore + dotnetPackages.FSharpCompilerService + dotnetPackages.FSharpCompilerCodeDom + dotnetPackages.FSharpAutoComplete + dotnetPackages.Fantomas + ]; + + patches = [ + ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch + ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch + ]; + + preConfigure = '' + substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop + substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop + (cd monodevelop; fsharpi ./configure.fsx) + ''; + + # This will not work as monodevelop probably looks in absolute nix store path rather than path + # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding + # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way + + # postInstall = '' + # mkdir -p "$out/lib/monodevelop/AddIns" + # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns" + # ''; + + xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ]; + outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ]; + + meta = { + description = "F# addin for MonoDevelop 5.9"; + homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + NDeskOptions = stdenv.mkDerivation rec { + baseName = "NDesk.Options"; + version = "0.2.1"; + name = "${baseName}-${version}"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-0.2.1.tar.gz"; + sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28"; + }; + + buildInputs = [ + mono + pkgconfig + ]; + + preConfigure = '' + substituteInPlace configure --replace gmcs mcs + ''; + + postInstall = '' + # Otherwise pkg-config won't find it and the DLL will get duplicated + ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc + ''; + + dontStrip = true; + + meta = { + description = "NDesk.Options is a callback-based program option parser for C#."; + homepage = "http://www.ndesk.org/Options"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + NewtonsoftJson = buildDotnetPackage rec { + baseName = "Newtonsoft.Json"; + version = "6.0.8"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz"; + sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.SystemCollectionsImmutable + dotnetPackages.Autofac + ]; + + patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ]; + + postConfigure = '' + # Just to make sure there's no attempt to call these executables + rm -rvf Tools + ''; + + xBuildFiles = [ "Src/Newtonsoft.Json.sln" ]; + outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ]; + + meta = { + description = "Popular high-performance JSON framework for .NET"; + homepage = "http://www.newtonsoft.com/json"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + Nuget = buildDotnetPackage { + baseName = "Nuget"; + version = "2.8.5"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "nuget-binary"; + rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047"; + sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3"; + }; + + buildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + outputFiles = [ "*" ]; + dllFiles = [ "NuGet*.dll" ]; + exeFiles = [ "NuGet.exe" ]; + }; + + Paket = buildDotnetPackage rec { + baseName = "Paket"; + version = "1.6.2"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsprojects/Paket/archive/${version}.tar.gz"; + sha256 = "1ryslxdgc3r7kcn1gq4bqcyrqdi8z6364aj3lr7yjz71wi22fca8"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NewtonsoftJson + dotnetPackages.UnionArgParser + dotnetPackages.NUnit + ]; + + fileFsUnit = fetchurl { + name = "FsUnit.fs"; + url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs; + sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp"; + }; + + # fileOctokit = fetchurl { + # name = "Octokit.fsx"; + # url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/modules/Octokit/Octokit.fsx; + # sha256 = "16qxwmgyg3fn3z9a8hppv1m579828x7lvfj8qflcgs2g6ciagsir"; + # }; + + fileGlobbing = fetchurl { + name = "Globbing.fs"; + url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs; + sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7"; + }; + + fileErrorHandling = fetchurl { + name = "ErrorHandling.fs"; + url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs; + sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9"; + }; + + postConfigure = '' + # Copy said single-files-in-git-repos + mkdir -p "paket-files/forki/FsUnit" + cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs" + + mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing" + cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs" + + mkdir -p "paket-files/fsprojects/Chessie/src/Chessie" + cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs" + ''; + + xBuildFiles = [ ]; + + outputFiles = [ "bin/*" ]; + exeFiles = [ "paket.exe" ]; + + meta = { + description = "A dependency manager for .NET and Mono projects"; + homepage = "http://fsprojects.github.io/Paket/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + UnionArgParser = buildDotnetPackage rec { + baseName = "UnionArgParser"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "nessos"; + repo = "UnionArgParser"; + rev = "acaeb946e53cbb0bd9768977c656b3242146070a"; + sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.FsUnit + ]; + + outputFiles = [ "bin/net40/*" ]; + + meta = { + description = "A declarative CLI argument/XML configuration parser for F# applications."; + homepage = "http://nessos.github.io/UnionArgParser/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; +}; in self From 142400b8d5f2d05506df38d9212d91ab0eca8fc5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jun 2015 11:28:45 +0200 Subject: [PATCH 090/412] ocaml-merlin: update from 2.1.2 to 2.2 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 2d02bf054b7..8b93650743d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; -let version = "2.1.2"; in +let version = "2.2"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; - sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n"; + sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz"; }; buildInputs = [ ocaml findlib yojson menhir ] From ee8825935f771d7c9c1a68a089b396995d683cc4 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 6 Jun 2015 20:42:37 +0300 Subject: [PATCH 091/412] google-music: beta_1.0.129.6633 -> beta_1.0.182.3607 --- .../audio/google-musicmanager/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index e7c513febf5..2edc1c00ce6 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -2,10 +2,11 @@ , libvorbis }: assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; - +let + archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; +in stdenv.mkDerivation rec { - debversion = "beta_1.0.129.6633-r0"; - version = "beta_1.0.129.6633-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -16,12 +17,12 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_amd64.deb"; - sha256 = "1fq2p721mzv8nd4dq6i9xiqvvqd5ak3v142vsxchg6yn14a9kbvr"; + url = archUrl name "amd64"; + sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; } else fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_i386.deb"; - sha256 = "7914e3e6e2adb2e952ebaf383db5e04727c29cfa83401007f29977f6c5ff6873"; + url = archUrl name "i386"; + sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; }; unpackPhase = '' From dac5a45acf5962e4b5c07240e352fed7f09be007 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Fri, 5 Jun 2015 10:48:37 +0200 Subject: [PATCH 092/412] Add apvlv pdf reader --- pkgs/applications/misc/apvlv/default.nix | 48 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/apvlv/default.nix diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix new file mode 100644 index 00000000000..aa312f4c8a9 --- /dev/null +++ b/pkgs/applications/misc/apvlv/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, cmake, pkgconfig, + gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +}: + +stdenv.mkDerivation rec { + version = "0.1.f7f7b9c"; + name = "apvlv-${version}"; + + src = fetchurl { + url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz"; + sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w"; + }; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler" + ''; + + buildInputs = [ + pkgconfig cmake + poppler + freetype gtk2 + libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation + ]; + + installPhase = '' + # binary + mkdir -p $out/bin + cp src/apvlv $out/bin/apvlv + + # displays pdfStartup.pdf as default pdf entry + mkdir -p $out/share/doc/apvlv/ + cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf + ''; + + meta = with stdenv.lib; { + homepage = "http://naihe2010.github.io/apvlv/"; + description = "PDF viewer with Vim-like behaviour"; + longDescription = '' + apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 + with Vim-like behaviour. + ''; + + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.ardumont ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcc861b5d4d..dc94c51e50a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13031,6 +13031,8 @@ let inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; }; + apvlv = callPackage ../applications/misc/apvlv { }; + xpdf = callPackage ../applications/misc/xpdf { motif = lesstif; base14Fonts = "${ghostscript}/share/ghostscript/fonts"; From 1adef3db3d656393baa446407d498e839428e23e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 12:21:31 -0700 Subject: [PATCH 093/412] kernel: 3.10.79 -> 3.10.80 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index b270f0852f6..6365e133c10 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.79"; + version = "3.10.80"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp"; + sha256 = "09x4931p2s0m7cngw4wcpiij2392js60ivki476pdyndxi0wh2nm"; }; features.iwlwifi = true; From 24042f3803c778511cc179d104c853bce4a5deba Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 12:21:34 -0700 Subject: [PATCH 094/412] kernel: 3.14.43 -> 3.14.44 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 52fa5eba109..66f6d8293ee 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.43"; + version = "3.14.44"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf"; + sha256 = "1kgzvdrxslrmb10cwx64qvzijq41kgiz8qy5xpa858mkynq8ydg8"; }; features.iwlwifi = true; From 0a8e8301964ae73e9077fd5810ddcf6015725897 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 12:21:36 -0700 Subject: [PATCH 095/412] kernel: 4.0.4 -> 4.0.5 --- pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index 9c7fb2c3bd8..b919fc7d901 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.4"; + version = "4.0.5"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h"; + sha256 = "1l9kxicadn980wrypi2qm3nx12g513acvryq58m7a0xjdf6ksjz2"; }; features.iwlwifi = true; From 4991e622857bd17b9afb15fbbe1291e207074bc2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 12:55:54 -0700 Subject: [PATCH 096/412] musl: 1.1.9 -> 1.1.10 --- pkgs/os-specific/linux/musl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 392a3c4049a..db7017edd43 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0"; + sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5"; }; enableParallelBuilding = true; From a818dba90bcaaa86176d485703e7e653204d8393 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 6 Jun 2015 17:18:04 +0200 Subject: [PATCH 097/412] added zopfli package --- pkgs/tools/compression/zopfli/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/compression/zopfli/default.nix diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix new file mode 100644 index 00000000000..93da9b15a9e --- /dev/null +++ b/pkgs/tools/compression/zopfli/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "zopfli-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "zopfli"; + rev = name; + name = "${name}-src"; + sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62"; + }; + + installPhase = '' + install -D zopfli $out/bin/zopfli + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/google/zopfli; + description = "A compression tool to perform very good, but slow, deflate or zlib compression"; + longDescription = + ''Zopfli Compression Algorithm is a compression library programmed + in C to perform very good, but slow, deflate or zlib compression. + + This library can only compress, not decompress. Existing zlib or + deflate libraries can decompress the data. + ''; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ roconnor bobvanderlinden ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ee71adff23..c12fb6d53dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14185,6 +14185,8 @@ let zdfmediathk = callPackage ../applications/video/zdfmediathk { }; + zopfli = callPackage ../tools/compression/zopfli { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; From 14cf76bb846d2b27194cb8aae6344770f651481f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 18:38:49 +0200 Subject: [PATCH 098/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/7e9d164c834c18b614c1f9ec717d42a8ff3a83d6 with hackage2nix revision d827dc6865dcad7d4890f27985383cc6d7cd1236 --- .../haskell-modules/hackage-packages.nix | 510 +++++++++++------- 1 file changed, 307 insertions(+), 203 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e049946d44a..1136364e73e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8949,8 +8949,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.5.1"; - sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq"; + version = "3.2.5.2"; + sha256 = "07fyn0ns3g66aqpa1jg1v694yvf5idf7cknrkh30hs312lwm1sjl"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11866,8 +11866,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.4"; - sha256 = "05pipj20bx9is5snwf5nhavrs8873br4xvs3b1ggrvxgvaf8qhqw"; + version = "0.5.0.5"; + sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -12917,8 +12917,10 @@ self: { ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.5"; - sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb"; + version = "0.6.5.1"; + revision = "1"; + sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; + editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e"; buildDepends = [ base ]; extraLibraries = [ SDL ]; description = "Binding to libSDL"; @@ -12930,8 +12932,8 @@ self: { ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.0"; - sha256 = "14d8fz576rwi6x0dxgc29cdmwn48afja3v5qx3x8q5y61fv8w9v1"; + version = "0.6.0.1"; + sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3"; buildDepends = [ base SDL ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; @@ -12942,8 +12944,8 @@ self: { ({ mkDerivation, base, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1"; - sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni"; + version = "0.6.1.1"; + sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -12955,8 +12957,8 @@ self: { ({ mkDerivation, base, SDL, SDL_mixer }: mkDerivation { pname = "SDL-mixer"; - version = "0.6.1"; - sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1"; + version = "0.6.1.1"; + sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -12981,8 +12983,8 @@ self: { ({ mkDerivation, base, SDL, SDL_ttf }: mkDerivation { pname = "SDL-ttf"; - version = "0.6.2"; - sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a"; + version = "0.6.2.1"; + sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -18554,15 +18556,14 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.5"; - sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr"; + version = "0.3.6"; + sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -18572,8 +18573,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.5"; - sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx"; + version = "0.3.6"; + sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -18584,8 +18585,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.5"; - sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84"; + version = "0.3.6"; + sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -18596,8 +18597,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.5"; - sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb"; + version = "0.3.6"; + sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -18608,8 +18609,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.5"; - sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3"; + version = "0.3.6"; + sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -18620,8 +18621,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.5"; - sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492"; + version = "0.3.6"; + sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -18632,8 +18633,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.5"; - sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli"; + version = "0.3.6"; + sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -18644,8 +18645,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.5"; - sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82"; + version = "0.3.6"; + sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -18656,8 +18657,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.5"; - sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8"; + version = "0.3.6"; + sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -18668,8 +18669,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.5"; - sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi"; + version = "0.3.6"; + sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -18680,8 +18681,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.5"; - sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c"; + version = "0.3.6"; + sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -18692,8 +18693,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.5"; - sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc"; + version = "0.3.6"; + sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -18704,8 +18705,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.5"; - sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk"; + version = "0.3.6"; + sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -18716,8 +18717,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.5"; - sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp"; + version = "0.3.6"; + sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -18735,8 +18736,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.5"; - sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7"; + version = "0.3.6"; + sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -18757,8 +18758,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.5"; - sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv"; + version = "0.3.6"; + sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18769,8 +18770,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.5"; - sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip"; + version = "0.3.6"; + sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18781,8 +18782,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.5"; - sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1"; + version = "0.3.6"; + sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18793,8 +18794,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.5"; - sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r"; + version = "0.3.6"; + sha256 = "050gspxplhch66awd7gmxyyy3s466ca3jbzp2yq4qh32dn7n1hvi"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18805,8 +18806,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.5"; - sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd"; + version = "0.3.6"; + sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18817,8 +18818,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.5"; - sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f"; + version = "0.3.6"; + sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18829,8 +18830,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.5"; - sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl"; + version = "0.3.6"; + sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18841,8 +18842,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.5"; - sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv"; + version = "0.3.6"; + sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18853,8 +18854,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.5"; - sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462"; + version = "0.3.6"; + sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18865,8 +18866,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.5"; - sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y"; + version = "0.3.6"; + sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18877,8 +18878,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.5"; - sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv"; + version = "0.3.6"; + sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18889,8 +18890,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.5"; - sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb"; + version = "0.3.6"; + sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18901,8 +18902,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.5"; - sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia"; + version = "0.3.6"; + sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18913,8 +18914,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.5"; - sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf"; + version = "0.3.6"; + sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18925,8 +18926,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.5"; - sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5"; + version = "0.3.6"; + sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18937,8 +18938,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.5"; - sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2"; + version = "0.3.6"; + sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18949,8 +18950,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ml"; - version = "0.3.5"; - sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1"; + version = "0.3.6"; + sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; @@ -18961,8 +18962,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.5"; - sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz"; + version = "0.3.6"; + sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18973,8 +18974,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.5"; - sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp"; + version = "0.3.6"; + sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18985,8 +18986,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.5"; - sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9"; + version = "0.3.6"; + sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18997,8 +18998,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.5"; - sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv"; + version = "0.3.6"; + sha256 = "1xk44z5zp8pr2hyhdshzgwm572y33f9lvjz6yrglc4vpangslcx3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -19009,8 +19010,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.5"; - sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig"; + version = "0.3.6"; + sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -19021,8 +19022,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.5"; - sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky"; + version = "0.3.6"; + sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -19033,8 +19034,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.5"; - sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb"; + version = "0.3.6"; + sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -19045,8 +19046,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.5"; - sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d"; + version = "0.3.6"; + sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -19057,8 +19058,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.5"; - sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn"; + version = "0.3.6"; + sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -19069,8 +19070,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.5"; - sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889"; + version = "0.3.6"; + sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -19081,8 +19082,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.5"; - sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr"; + version = "0.3.6"; + sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -19093,8 +19094,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.5"; - sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna"; + version = "0.3.6"; + sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -19105,8 +19106,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.5"; - sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic"; + version = "0.3.6"; + sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -19117,8 +19118,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.5"; - sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz"; + version = "0.3.6"; + sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -19129,8 +19130,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.5"; - sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3"; + version = "0.3.6"; + sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -19141,8 +19142,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-workspaces"; - version = "0.3.5"; - sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5"; + version = "0.3.6"; + sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; @@ -19261,8 +19262,8 @@ self: { }: mkDerivation { pname = "anansi"; - version = "0.4.7"; - sha256 = "0am6c4chbysgs63n3wbd4lfxdzkg6fzj4xgp6i26z4vhj49qk890"; + version = "0.4.8"; + sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22932,8 +22933,8 @@ self: { }: mkDerivation { pname = "banwords"; - version = "0.1.0.0"; - sha256 = "0r35w2kv9nfsz67bmcc9k9pg7k1d1k00cz5y16cpjra200mz847z"; + version = "0.2.0.0"; + sha256 = "18k39zgc5n9bxabv0wkiay9h3phx75mfr4kqpcp1hlpikn4h6wxx"; buildDepends = [ attoparsec base bytestring data-default text vector ]; @@ -26342,23 +26343,25 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , directory, doctest, doctest-prop, filepath, hspec, http-client - , http-types, QuickCheck, semigroups, text, time - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers + , data-default-class, directory, doctest, doctest-prop, exceptions + , filepath, hspec, http-client, http-types, mtl, QuickCheck + , quickcheck-properties, semigroups, text, time, transformers + , unordered-containers, uri-bytestring, vector }: mkDerivation { pname = "bloodhound"; - version = "0.5.0.1"; - sha256 = "1wvqj8fz3b6jvhmmi3calx6fsqjyvcpznks67bd0iiz9z0igh0ha"; + version = "0.6.0.0"; + sha256 = "0qybsmfkip5cjanmhj2av4rl5hig6x4wn97cmlajhszqd5ddsis9"; buildDepends = [ - aeson base bytestring conduit containers http-client http-types - semigroups text time vector + aeson base bytestring containers data-default-class exceptions + http-client http-types mtl semigroups text time transformers + uri-bytestring vector ]; testDepends = [ aeson base containers directory doctest doctest-prop filepath hspec - http-client http-types QuickCheck semigroups text time - unordered-containers vector + http-client http-types mtl QuickCheck quickcheck-properties + semigroups text time unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/bitemyapp/bloodhound"; @@ -31525,8 +31528,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.5"; - sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk"; + version = "0.5.6"; + sha256 = "02pjy1l3irn67jaqy6sp2a8cjy2sw100kssyd0nxsz9k0imjzizy"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -32987,9 +32990,10 @@ self: { mkDerivation { pname = "colors"; version = "0.3.0.2"; + revision = "1"; sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; + editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560"; buildDepends = [ base lens linear profunctors ]; - jailbreak = true; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = stdenv.lib.licenses.bsd3; @@ -44891,8 +44895,8 @@ self: { }: mkDerivation { pname = "ekg-push"; - version = "0.0.2"; - sha256 = "1z41x3i7hvrnca3clrrz62kah3a4lik0f3gxhw3vnyqgszzb46l5"; + version = "0.0.3"; + sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44932,12 +44936,11 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.0.2"; - sha256 = "1jblrhwpv579d51i66bin9zxmwkl899lxwygg4qqpm3cnx5vf859"; + version = "0.2.0.3"; + sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn"; buildDepends = [ base bytestring ekg-core network text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; @@ -47618,6 +47621,7 @@ self: { base bytestring containers foldl lens parsec pipes pipes-bytestring pipes-group pipes-text split text ]; + jailbreak = true; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -49752,8 +49756,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.11"; - sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr"; + version = "1.1.0"; + sha256 = "184arkpffi2z7dayplc47nvyabzr5sig4zs8hc4lilcklv4q9zn6"; buildDepends = [ base bytestring containers mwc-random primitive profunctors text transformers vector @@ -51739,8 +51743,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.1.0.1"; - sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; + version = "0.4.0"; + sha256 = "0wpv9i80lai771fws5yg5ri05iskbq2vgar66f72xqwvz3nm44i7"; buildDepends = [ base linear spatial-math ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -54050,8 +54054,8 @@ self: { ({ mkDerivation, array, base, containers, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.2.0.1"; - sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7"; + version = "0.2.0.3"; + sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf"; buildDepends = [ array base containers TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -58241,6 +58245,7 @@ self: { base containers grid HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; @@ -63033,8 +63038,8 @@ self: { }: mkDerivation { pname = "hein"; - version = "0.1.0.4"; - sha256 = "0agg7nsnhzg3ngiawa9899qg2pwa39dw6rkivdslsv2i67six832"; + version = "0.1.0.5"; + sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -70169,18 +70174,17 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.9"; - sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva"; + version = "0.3.3.0"; + sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4"; buildDepends = [ - base bytestring containers digestive-functors HandsomeSoup hspec - hspec-core hxt lens mtl snap snap-core text transformers + aeson base bytestring containers digestive-functors HandsomeSoup + hspec hspec-core hxt lens mtl snap snap-core text transformers ]; testDepends = [ aeson base bytestring containers digestive-functors directory HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers ]; - jailbreak = true; homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -71312,8 +71316,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.11.2"; - sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2"; + version = "0.4.11.3"; + sha256 = "04f9xb1hz5i9sm14nlasia86vjwsx0nmjh1kpk21axvvkbgcnrrq"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -86947,6 +86951,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mida" = callPackage + ({ mkDerivation, base, containers, directory, filepath, haskeline + , HCodecs, mersenne-random-pure64, mtl, optparse-applicative + , parsec, process, QuickCheck, test-framework + , test-framework-quickcheck2, text, text-format, transformers + }: + mkDerivation { + pname = "mida"; + version = "0.4.3"; + sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers directory filepath haskeline HCodecs + mersenne-random-pure64 mtl optparse-applicative parsec process text + text-format transformers + ]; + testDepends = [ + base containers HCodecs mersenne-random-pure64 mtl parsec + QuickCheck test-framework test-framework-quickcheck2 text + transformers + ]; + homepage = "https://github.com/mrkkrp/mida"; + description = "Language for algorithmic generation of MIDI files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "midi" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck @@ -88452,10 +88483,9 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "monad-resumption"; - version = "0.1.1.4"; - sha256 = "0zrzxkzg6fzxiqr9k4kw6r1ivw22qwz2dhl1nd5xqr7lfsqc00zs"; + version = "0.1.1.5"; + sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf"; buildDepends = [ base mmorph mtl transformers ]; - jailbreak = true; homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -89065,8 +89095,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.0.4"; - sha256 = "1wg5yx49gx8j9hxcr3mp3pq40wqpwhh4cccsg7m2fgdnangxd6rh"; + version = "0.4.1"; + sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz"; buildDepends = [ base bytestring containers primes text vector ]; testDepends = [ base bytestring containers primes QuickCheck quickcheck-instances @@ -90597,8 +90627,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.0.5"; - sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2"; + version = "1.1.0"; + sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i"; buildDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -90614,6 +90644,7 @@ self: { version = "1.2.0"; sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; buildDepends = [ async base foldl mvc ]; + jailbreak = true; description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94033,6 +94064,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "old-version" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "old-version"; + version = "1.0.1"; + sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv"; + buildDepends = [ base ]; + jailbreak = true; + description = "Basic versioning library"; + license = "unknown"; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -94778,27 +94821,28 @@ self: { "opml-conduit" = callPackage ({ mkDerivation, base, case-insensitive, conduit - , conduit-combinators, containers, data-default, exceptions - , hashable, hashable-time, hlint, lens, mono-traversable - , monoid-subclasses, mtl, network-uri, QuickCheck - , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, unordered-containers - , xml-conduit, xml-types + , conduit-combinators, conduit-parse, containers, data-default + , exceptions, hashable, hashable-time, hlint, lens + , mono-traversable, monoid-subclasses, mtl, network-uri, parsers + , QuickCheck, quickcheck-instances, resourcet, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, time, timerep + , unordered-containers, xml-conduit, xml-conduit-parse, xml-types }: mkDerivation { pname = "opml-conduit"; - version = "0.2.0.1"; - sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk"; + version = "0.3.0.0"; + sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz"; buildDepends = [ - base case-insensitive conduit containers data-default exceptions - hashable hashable-time lens mono-traversable monoid-subclasses - network-uri QuickCheck quickcheck-instances semigroups text time - timerep unordered-containers xml-conduit xml-types + base case-insensitive conduit conduit-parse containers data-default + exceptions hashable hashable-time lens mono-traversable + monoid-subclasses network-uri parsers QuickCheck + quickcheck-instances semigroups text time timerep + unordered-containers xml-conduit xml-conduit-parse xml-types ]; testDepends = [ - base conduit conduit-combinators containers exceptions hlint lens - mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck - xml-conduit + base conduit conduit-combinators conduit-parse containers + data-default exceptions hlint lens mtl network-uri parsers + resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse ]; homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; @@ -96673,8 +96717,8 @@ self: { }: mkDerivation { pname = "paypal-adaptive-hoops"; - version = "0.11.0.0"; - sha256 = "0v72ny33mfi29vv4kzld5x01qr9k6i9vdyk9v83dy9zbfb7vkmzv"; + version = "0.11.0.1"; + sha256 = "061vzsncyl0is2d3p8sh3a1wb46g2v6vqgdh390b8d41max1wabg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -98014,15 +98058,14 @@ self: { }: mkDerivation { pname = "phash"; - version = "0.0.3"; - sha256 = "0w3c7i4n4f12nkg0bqvm568s2y1fdgaicxqr3ky80lygbz1h20hw"; + version = "0.0.4"; + sha256 = "1bfikigj8bxgqwqz0lxi35s8sck41kjkz2ww1s10bim867h97si0"; buildDepends = [ base ]; testDepends = [ base doctest HUnit pHash smallcheck tasty tasty-hunit tasty-smallcheck ]; extraLibraries = [ pHash ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/phash"; description = "Haskell bindings to pHash, the open source perceptual hash library"; license = stdenv.lib.licenses.gpl3; @@ -100151,13 +100194,12 @@ self: { }: mkDerivation { pname = "postgresql-config"; - version = "0.0.1"; - sha256 = "1hp6ki078d4hvb910403ppvcb8q6ji79z3ccv6alkpnd494wd4wr"; + version = "0.0.2"; + sha256 = "1b7rppzarnmndmgwkcahcrcnxzigfldm50iqd81vj0zkii6w0i43"; buildDepends = [ aeson base bytestring monad-control mtl postgresql-simple resource-pool time ]; - jailbreak = true; homepage = "https://bitbucket.org/s9gf4ult/postgresql-config"; description = "Types for easy adding postgresql configuration to your program"; license = stdenv.lib.licenses.bsd3; @@ -100316,6 +100358,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-simple-url" = callPackage + ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "postgresql-simple-url"; + version = "0.1.0.1"; + sha256 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng"; + buildDepends = [ base network-uri postgresql-simple split ]; + testDepends = [ base postgresql-simple tasty tasty-quickcheck ]; + homepage = "https://github.com/futurice/postgresql-simple-url"; + description = "PostgreSQL"; + license = stdenv.lib.licenses.mit; + }) {}; + "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, cryptohash, haskell-src-meta, network, old-locale @@ -103640,6 +103697,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "raml" = callPackage + ({ mkDerivation, aeson, base, bytestring, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "raml"; + version = "0.1.0"; + sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9"; + buildDepends = [ + aeson base bytestring text unordered-containers yaml + ]; + homepage = "https://github.com/fnoble/raml"; + description = "RESTful API Modeling Language (RAML) library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "rand-vars" = callPackage ({ mkDerivation, array, base, IntervalMap, mtl, random }: mkDerivation { @@ -103998,8 +104071,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.2.3"; - sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45"; + version = "0.2.3.1"; + sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -105815,8 +105888,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.5.0.0"; - sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx"; + version = "0.5.0.1"; + sha256 = "1yhcdc0m839pdwhb2vv25wz1vbhk5ynfkb9d6xgkjymsjvqlp78n"; buildDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -113081,8 +113154,8 @@ self: { }: mkDerivation { pname = "singletons"; - version = "1.1.2"; - sha256 = "102pxml8k1f94q8vmbsjhv6sjxa316xblfcl8czagcxkpz0sil4d"; + version = "1.1.2.1"; + sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb"; buildDepends = [ base containers mtl template-haskell th-desugar ]; testDepends = [ base Cabal constraints filepath process tasty tasty-golden @@ -115754,6 +115827,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spdx" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: + mkDerivation { + pname = "spdx"; + version = "0.0.1.0"; + sha256 = "0k4lpny0fl6yz92m3040dmsqjcyb5gslf0306hlsqbsbn1gzjjmm"; + buildDepends = [ base transformers ]; + testDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/phadej/spdx"; + description = "SPDX license expression language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -118584,14 +118670,13 @@ self: { }: mkDerivation { pname = "strive"; - version = "1.0.1"; - sha256 = "0c9zwgsy1s64c2kl1agirm8616rjpp2z9r73ch0ixrf200l6rw0d"; + version = "2.1.0"; + sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2"; buildDepends = [ aeson base bytestring data-default gpolyline http-conduit http-types template-haskell text time transformers ]; testDepends = [ base bytestring hlint markdown-unlit time ]; - jailbreak = true; homepage = "http://taylor.fausak.me/strive/"; description = "A Haskell client for the Strava V3 API"; license = stdenv.lib.licenses.mit; @@ -123610,8 +123695,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.32"; - sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2"; + version = "0.4.33"; + sha256 = "0xx02wbclq6hh50gz6vj3wmq7d5y7l4d6h48yxg3nwv4kwf44gf6"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -127431,8 +127516,8 @@ self: { }: mkDerivation { pname = "uni-uDrawGraph"; - version = "2.2.0.3"; - sha256 = "0sh504l3xi9xlmwb28wzsana6c9ahmbdhx05s55w2ffwzbz0ca8a"; + version = "2.2.1.3"; + sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j"; buildDepends = [ base containers uni-events uni-graphs uni-posixutil uni-reactor uni-util @@ -130678,18 +130763,23 @@ self: { "wai-cors" = callPackage ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring - , case-insensitive, charset, http-types, mtl, parsers, transformers - , wai + , case-insensitive, charset, directory, filepath, http-types, mtl + , network, parsers, process, text, transformers, wai + , wai-websockets, warp, websockets }: mkDerivation { pname = "wai-cors"; - version = "0.2.2"; - sha256 = "174ld61b2hl890m591qfwclnb1jdssi9minksvhp34dmawnfwgvc"; + version = "0.2.3"; + sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92"; buildDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive charset http-types mtl parsers transformers wai ]; - homepage = "https://github.com/alephcloud/wai-cors"; + testDepends = [ + base base-unicode-symbols directory filepath http-types network + process text wai wai-websockets warp websockets + ]; + homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; }) {}; @@ -131383,8 +131473,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.6.1"; - sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q"; + version = "0.6.2"; + sha256 = "04h0npgg6jfpzgg7g6kwbpkg3k148aq9jb3561r8j7fm6jmmynab"; buildDepends = [ aeson base blaze-builder bytestring containers http-types mtl path-pieces random template-haskell text wai @@ -133439,11 +133529,10 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.0.0"; - sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc"; + version = "1.0.2"; + sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps"; buildDepends = [ base bytestring connection network websockets ]; testDepends = [ base doctest ]; - jailbreak = true; homepage = "http://taylor.fausak.me/wuss/"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; @@ -134291,8 +134380,8 @@ self: { }: mkDerivation { pname = "xml-conduit-parse"; - version = "0.1.0.0"; - sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v"; + version = "0.2.0.0"; + sha256 = "08dvaqfwi9gaa6xihyh2mksplid3xlfa3qb22glnmrcn37vxpphx"; buildDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -136984,6 +137073,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-table" = callPackage + ({ mkDerivation, base, containers, contravariant, text, yesod-core + }: + mkDerivation { + pname = "yesod-table"; + version = "0.1.1"; + sha256 = "0glbdm19bf0pxp0y2831yi0yxjwc3b9xfhsdimxyc5ppm2dqdxsj"; + buildDepends = [ base containers contravariant text yesod-core ]; + jailbreak = true; + homepage = "https://github.com/andrewthad/yesod-table"; + description = "HTML tables for Yesod"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-tableview" = callPackage ({ mkDerivation, base, hamlet, persistent, yesod }: mkDerivation { @@ -137200,6 +137303,7 @@ self: { homepage = "https://github.com/alephcloud/hs-yet-another-logger"; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yhccore" = callPackage From 820c87af1f0a9da2ccb0998c538bafce7cb2e60c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Jun 2015 15:14:47 +0200 Subject: [PATCH 099/412] haskell-webwebsockets: disable spuriously failing test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ade2055187d..e33e0fe2590 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -841,4 +841,7 @@ self: super: { # https://github.com/ekmett/semigroupoids/issues/35 semigroupoids = disableCabalFlag super.semigroupoids "doctests"; + # https://github.com/jaspervdj/websockets/issues/104 + websockets = dontCheck super.websockets; + } From 05205400186ed5925eb211a7d91b30a831223056 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Jun 2015 00:05:17 +0200 Subject: [PATCH 100/412] haskell-bytestring-builder: trigger rebuild with GHC 7.8.x to mitiagate broken library ID --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +- pkgs/development/haskell-modules/lib.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 2e95c78c625..4fbb5056837 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -52,7 +52,7 @@ self: super: { haddock-api = super.haddock-api_2_15_0_2; # This is part of bytestring in our compiler. - bytestring-builder = dontHaddock super.bytestring-builder; + bytestring-builder = triggerRebuild (dontHaddock super.bytestring-builder) 1; # Won't compile against mtl 2.1.x. imports = super.imports.override { mtl = self.mtl_2_2_1; }; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index e601c7665ac..9b47b047bf6 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -77,4 +77,6 @@ rec { buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); + triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + } From 12e84c63784116ee9c4e69516d68c6661ffd5eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 7 Jun 2015 10:22:20 +0200 Subject: [PATCH 101/412] nixos/postfix: make symlink /var/mail -> /var/spool/mail This solves the problem of e.g. mutt not finding mail unless the user sets MAIL=/var/spool/mail/$USER. The default MAIL variable seems come from bash. Reasons for adding symlink instead of changing MAIL default in bash: - No need to rebuild world - FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix NixOS mail location than change MAIL in bash to something that doesn't work on non-NixOS (however unlikely that users run nixpkgs bash on a non-NixOS distro...). [1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES --- nixos/modules/services/mail/postfix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 839da7407ef..24bcc6bb57c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -380,6 +380,7 @@ in ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue ${pkgs.coreutils}/bin/chown root:root /var/spool/mail ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail + ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf From dbec88f5643b5fa01e5d9dcf1f039e10acf05ac0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Jun 2015 12:05:11 +0200 Subject: [PATCH 102/412] update caps to 0.9.24 --- pkgs/applications/audio/caps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 49880f6c0f3..b5004291271 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "caps-${version}"; - version = "0.9.16"; + version = "0.9.24"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; - sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv"; + sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp"; }; configurePhase = '' echo "PREFIX = $out" > defines.make From f63a9f25340b8f2a0d4beef7d2f5af3544987bac Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 7 Jun 2015 11:06:54 +0000 Subject: [PATCH 103/412] fix libcap for packages depending on pulseaudio --- pkgs/servers/pulseaudio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5de447da0dd..856a22d7bb8 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -45,9 +45,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + propagatedBuildInputs = + lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ json_c libsndfile speexdsp fftwFloat ] - ++ lib.optionals stdenv.isLinux [ libcap glib dbus.libs ] + ++ lib.optionals stdenv.isLinux [ glib dbus.libs ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 From 8b0b9be025ba5dcc40197c99629e5271b8e0c9ce Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 18 May 2015 10:39:18 +0200 Subject: [PATCH 104/412] emacs24: add options for acl and gpm --- pkgs/applications/editors/emacs-24/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 01895647a6b..e0439f45a9c 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo +, alsaLib, cairo, acl, gpm , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4efc4f3fdb2..b49c2e3b59d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10792,6 +10792,8 @@ let gconf = null; alsaLib = null; imagemagick = null; + acl = null; + gpm = null; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { From ab8561e3e53081114f0e168aebfa8ce17980faa2 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 7 Jun 2015 15:59:38 +0300 Subject: [PATCH 105/412] fix: vim-xkbswitch proper lib --- pkgs/misc/vim-plugins/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 49935487afe..d693d9df857 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -294,8 +294,8 @@ rec { name = "vim-addon-vim2nix-2015-06-01"; src = fetchgit { url = "git://github.com/JagaJaga/vim-addon-vim2nix"; - rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d"; - sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e"; + rev = "cfa1f191b9e427dee77f8054a911a327c3cf4f79"; + sha256 = "9960dd3248ffc8d2d3b9bf322df2369feb7a6bf54d47253bd65de1988d2e5ec3"; }; dependencies = ["vim-addon-manager"]; @@ -517,6 +517,10 @@ rec { rev = "0854ac6a810daae4a5c99bcae61613266ce75c26"; sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655"; }; + patchPhase = '' + substituteInPlace plugin/xkbswitch.vim \ + --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + ''; dependencies = []; buildInputs = [ xkb_switch ]; }; From c25027f2106ab153d71cab1f4db2a60bcba9e276 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 7 Jun 2015 14:57:29 +0200 Subject: [PATCH 106/412] openttd: update from 1.4.4 to 1.5.1 --- pkgs/games/openttd/default.nix | 10 ++----- pkgs/games/openttd/fix-freetype-1.4.4.patch | 31 --------------------- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 pkgs/games/openttd/fix-freetype-1.4.4.patch diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index afef33cce2d..903466524fb 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; + sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - # NOTE: Remove this patch in 1.4.5 or greater - patches = [ - # Adapted from svn r27079 - ./fix-freetype-1.4.4.patch - ]; - makeFlags = "INSTALL_PERSONAL_DIR="; postInstall = '' diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch deleted file mode 100644 index 37706ce05c9..00000000000 --- a/pkgs/games/openttd/fix-freetype-1.4.4.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/fontcache.cpp b/src/fontcache.cpp -=================================================================== ---- a/src/fontcache.cpp -+++ b/src/fontcache.cpp -@@ -537,6 +537,6 @@ - - /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ -- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); -- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); -+ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); -+ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); - - /* Limit glyph size to prevent overflows later on. */ -@@ -554,6 +554,6 @@ - /* Draw shadow for medium size */ - if (this->fs == FS_NORMAL && !aa) { -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; -@@ -564,6 +564,6 @@ - } - -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[x + y * sprite.width].m = FACE_COLOUR; From 2a74e84992659c4cea3129d8dde6bd5d346b0779 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 7 Jun 2015 15:18:55 +0200 Subject: [PATCH 107/412] pngcrush: update from 1.7.83 to 1.7.85 --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index f9b7ad8fe64..cc086da5a13 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.83"; + name = "pngcrush-1.7.85"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj"; + sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19"; }; configurePhase = '' From f68ab19ff54fb6b754350e53094cb5b21127ff53 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 7 Jun 2015 15:19:54 +0200 Subject: [PATCH 108/412] slic3r: Update to 1.2.7. --- pkgs/applications/misc/slic3r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 36669dd8ae8..bfbc66cc0b9 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.7"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k"; + sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i"; }; buildInputs = with perlPackages; [ perl makeWrapper which From 389820e798aeb4f149a7844618e4547657cf96a6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 7 Jun 2015 15:21:00 +0200 Subject: [PATCH 109/412] weechat: update from 1.1.1 to 1.2, potentially fixes CVE-2012-6047, CVE-2012-6554 --- pkgs/applications/networking/irc/weechat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index fd200af0a42..8825e16b90f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -4,12 +4,12 @@ , extraBuildInputs ? [] }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.2"; name = "weechat-${version}"; src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.gz"; - sha256 = "0j8kc2zsv7ybgq6wi0r8siyd3adl3528gymgmidijd78smbpwbx3"; + url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw"; }; buildInputs = From 4ae0815d3bf068f05aad961adf179d781e4c5829 Mon Sep 17 00:00:00 2001 From: fro_ozen Date: Thu, 4 Jun 2015 23:09:32 +0200 Subject: [PATCH 110/412] Add the tewi font --- lib/maintainers.nix | 1 + pkgs/data/fonts/tewi/default.nix | 47 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/data/fonts/tewi/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 174eced43c2..7f755154814 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -79,6 +79,7 @@ fluffynukeit = "Daniel Austin "; forkk = "Andrew Okin "; fpletz = "Franz Pletz "; + fro_ozen = "fro_ozen "; ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix new file mode 100644 index 00000000000..dfcc0578f00 --- /dev/null +++ b/pkgs/data/fonts/tewi/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation rec { + date = "2015-06-07"; + name = "tewi-font-${date}"; + + src = fetchgit { + url = "https://github.com/lucy/tewi-font"; + rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69"; + sha256 = "d641b911cc2132a00c311e3d978c1ca454b0fb3bc3ff4b4742b9f765b765a94b"; + }; + + buildInputs = [ bdftopcf mkfontdir mkfontscale ]; + buildPhase = '' + for i in *.bdf; do + bdftopcf -o ''${i/bdf/pcf} $i + done + + gzip *.pcf + ''; + + installPhase = '' + fontDir="$out/share/fonts/misc" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = "A nice bitmap font, readable even at small sizes"; + longDescription = '' + Tewi is a bitmap font, readable even at very small font sizes. This is + particularily useful while programming, to fit a lot of code on your + screen. + ''; + homepage = "https://github.com/lucy/tewi-font"; + license = { + fullName = "GNU General Public License with a font exception"; + url = "https://www.gnu.org/licenses/gpl-faq.html#FontException"; + }; + maintainers = [ maintainers.fro_ozen ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b54674cb65..164b7dee77e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14529,6 +14529,8 @@ let tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; + tewi-font = callPackage ../data/fonts/tewi {}; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; texFunctions = import ../tools/typesetting/tex/nix pkgs; From c5993a1988d78bf924701d0b6f42aab2cdbffbd4 Mon Sep 17 00:00:00 2001 From: fro_ozen Date: Fri, 5 Jun 2015 11:04:06 +0200 Subject: [PATCH 111/412] Change dina-font's platform to platform.unix --- pkgs/data/fonts/dina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index e79dcd014d3..be420df4886 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; license = licenses.free; maintainers = [ maintainers.prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From fa290cb741cb23a04024f09e2018d5ea7bc0e3a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 7 Jun 2015 13:44:24 -0500 Subject: [PATCH 112/412] qrupdate: build with openblas Replaces ATLAS and LAPACK with OpenBLAS. Also builds both static and shared libraries. (Octave upstream recommends the shared library.) --- .../libraries/qrupdate/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 465ec7eebb2..aaa9ab8a61a 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,29 +1,34 @@ { stdenv , fetchurl , gfortran -, liblapack +, openblas }: stdenv.mkDerivation { name = "qrupdate-1.1.2"; src = fetchurl { url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ; - sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; + sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; - - configurePhase = '' - export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \ - Makeconf - ''; + + configurePhase = + '' + export PREFIX=$out + sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \ + -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \ + Makeconf + '' + + stdenv.lib.optionalString openblas.blas64 + '' + sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' + ''; doCheck = true; checkTarget = "test"; - buildTarget = "lib"; + buildFlags = [ "lib" "solib" ]; - installTarget = "install-staticlib"; - - buildInputs = [ gfortran liblapack ]; + installTargets = "install"; + + buildInputs = [ gfortran openblas ]; } From 614c867b29299668dced9ab705bacebcd433bef3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 7 Jun 2015 13:45:36 -0500 Subject: [PATCH 113/412] octave: build with openblas The expression inherits integer width from OpenBLAS, so Octave will use 64-bit integers if OpenBLAS supports it. However, this feature in Octave is experimental, so we continue to use OpenBLAS with 32-bit integers by default. (This only applies to the integer width, the pointer width is always the platform-native width.) --- .../interpreters/octave/default.nix | 26 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 9ad8c2790da..bdf6f775277 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,10 +1,22 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk -, fftw, fftwSinglePrec, zlib, curl, qrupdate +, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null }: +let + suitesparseOrig = suitesparse; + qrupdateOrig = qrupdate; +in +# integer width is determined by openblas, so all dependencies must be built +# with exactly the same openblas +let + suitesparse = + if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null; + qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null; +in + stdenv.mkDerivation rec { version = "4.0.0"; name = "octave-${version}"; @@ -14,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl + graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas fftw fftwSinglePrec qrupdate ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) @@ -34,7 +46,13 @@ stdenv.mkDerivation rec { # problems on Hydra enableParallelBuilding = false; - configureFlags = [ "--enable-readline" "--enable-dl" ]; + configureFlags = + [ "--enable-readline" + "--enable-dl" + "--with-blas=openblas" + "--with-lapack=openblas" + ] + ++ stdenv.lib.optional openblas.blas64 "--enable-64"; # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f95e32e951..69c46414c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,6 +4820,7 @@ let glpk = null; suitesparse = null; jdk = null; + openblas = openblasCompat; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { fltk = fltk13.override { cfg.xftSupport = true; }; From bbf0f7e16f4fa33f9973c413dc52453fd61823be Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Mon, 8 Jun 2015 00:10:48 +0200 Subject: [PATCH 114/412] Bump d-feet to 0.3.9 --- pkgs/development/tools/misc/d-feet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df26db519dc..e13145ee71a 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -3,7 +3,7 @@ , pygobject3, gobjectIntrospection, libwnck3 }: let - version = "${major}.8"; + version = "${major}.9"; major = "0.3"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "e8423feb18fdff9b1465bf8442b78994ba13c12f8fa3b08e6a2f05768b4feee5"; + sha256 = "0lvrrbxkvw495jn4vj64r8vd3hng5v0lvagfzcbk5x1f3ky1gybd"; }; buildInputs = [ From 380c7d1f721b7d5dbb9647906ef318cdcd5d319f Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Mon, 8 Jun 2015 00:23:46 +0200 Subject: [PATCH 115/412] Bump sstp to 1.0.10 --- pkgs/tools/networking/sstp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 52ca9ad494f..ed28db45f10 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sstp-client-${version}"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "0kpwywbavmlgid07rk8ff0bxp75bnfa1nc28w4j0pkxjhmja5n6k"; + sha256 = "096lw3a881hjqnffms3bl077pjyq77870kjaf83chhjcakc8942z"; }; patchPhase = From 09b95b88a5e4c59d17f44da4c5418bbf2bebddf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2015 01:19:07 +0200 Subject: [PATCH 116/412] python-packages: add buttersink 0.6.6 --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3ddc879a17..604f6a91c43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -974,6 +974,32 @@ let }; }; + buttersink = buildPythonPackage rec { + name = "buttersink-0.6.6"; + + src = pkgs.fetchurl { + sha256 = "1vi0pz8r3d17bsn5g7clkyph7sc0rjzbzqk6rwglaxcah7sfj2mj"; + url = "https://pypi.python.org/packages/source/b/buttersink/${name}.tar.gz"; + }; + + meta = { + description = "Synchronise btrfs snapshots"; + longDescription = '' + ButterSink is like rsync, but for btrfs subvolumes instead of files, + which makes it much more efficient for things like archiving backup + snapshots. It is built on top of btrfs send and receive capabilities. + Sources and destinations can be local btrfs file systems, remote btrfs + file systems over SSH, or S3 buckets. + ''; + homepage = https://github.com/AmesCornish/buttersink/wiki; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; + + propagatedBuildInputs = with self; [ boto crcmod psutil ]; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; From b13cb5461433ccf7ae1a2e8d2691c3111441e984 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 6 Jun 2015 22:38:08 +0000 Subject: [PATCH 117/412] Bring an importable modulesPath back from the dead, in the only way I know --- lib/modules.nix | 8 ++++++-- nixos/lib/eval-config.nix | 1 + nixos/modules/misc/extra-arguments.nix | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index dcede0c46c6..3561dd0d1d3 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -17,6 +17,10 @@ rec { evalModules) and the less declarative the module set is. */ evalModules = { modules , prefix ? [] + , # This should only be used for special arguments that need to be evaluated + # when resolving module structure (like in imports). For everything else, + # there's _module.args. + specialArgs ? {} , # This would be remove in the future, Prefer _module.args option instead. args ? {} , # This would be remove in the future, Prefer _module.check option instead. @@ -51,7 +55,7 @@ rec { }; }; - closed = closeModules (modules ++ [ internalModule ]) { inherit config options; lib = import ./.; }; + closed = closeModules (modules ++ [ internalModule ]) (specialArgs // { inherit config options; lib = import ./.; }); # Note: the list of modules is reversed to maintain backward # compatibility with the old module system. Not sure if this is @@ -118,7 +122,7 @@ rec { config = removeAttrs m ["key" "_file" "require" "imports"]; }; - applyIfFunction = f: arg@{ config, options, lib }: if isFunction f then + applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index adacbd0863e..97cb85a957f 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -47,6 +47,7 @@ in rec { inherit prefix check; modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; + specialArgs = { modulesPath = ../modules; }; }) config options; # These are the extra arguments passed to every module. In diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index c2c8903546d..ff2ff7cd432 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -2,8 +2,6 @@ { _module.args = { - modulesPath = ../.; - pkgs_i686 = import ../../lib/nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; From 757942ddbfdbedcd47d79baef7281f0d27248aaa Mon Sep 17 00:00:00 2001 From: Robbin C Date: Mon, 8 Jun 2015 10:31:30 +0800 Subject: [PATCH 118/412] wavegain: show correct maintainer --- lib/maintainers.nix | 1 + pkgs/applications/audio/wavegain/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 174eced43c2..4b7d48564d9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -186,6 +186,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; + robbinch = "Robbin C. "; roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 2ce59f005fd..caf579d8765 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { homepage = https://github.com/MestreLion/wavegain; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + maintainers = [ stdenv.lib.maintainers.robbinch ]; }; } From e0db2213fc4412176ec06a23db25dcd13cb25d21 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 7 Jun 2015 22:18:02 -0500 Subject: [PATCH 119/412] Update qt-5.4.1 -> qt-5.4.2 --- .../libraries/qt-5/5.4/default.nix | 2 +- .../libraries/qt-5/5.4/manifest.nix | 300 +++++++++--------- .../libraries/qt-5/5.4/manifest.sh | 2 +- 3 files changed, 152 insertions(+), 152 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index fce2c7f1b7b..c7e3a5c6123 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -30,7 +30,7 @@ let importManifest ./manifest.nix { mirror = "http://download.qt.io"; }; srcs = mapAttrs (name: manifest: manifest.src) manifest; - version = "5.4.1"; + version = "5.4.2"; callPackage = newScope (self // { inherit qtSubmodule; }); diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix index 4647c0eef88..5fdda35f76a 100644 --- a/pkgs/development/libraries/qt-5/5.4/manifest.nix +++ b/pkgs/development/libraries/qt-5/5.4/manifest.nix @@ -2,273 +2,273 @@ { stdenv, fetchurl, mirror }: [ { - name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/32jn5sn8im7andkd6m15s95n48ald7pw-qtwayland-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz"; - sha256 = "14npf3lclkb83s8ywla67a1129ia1mbib145s1sk5gqw1dh5wfv5"; - name = "qtwayland-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz"; + sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z"; + name = "qtbase-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/604ifwwrzpm96rffszyl11xjirm0w65j-qtandroidextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtandroidextras-opensource-src-5.4.1.tar.xz"; - sha256 = "0s12hmn2lnlbp7y47v344lyli6wh670dwazl3kkzv9vdv52df4wp"; - name = "qtandroidextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz"; + sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn"; + name = "qtenginio-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/wcwaylvnlrfy6d6pc0ka7mkcam846cqb-qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; - sha256 = "071mz2w25g5svknb97y6yw55sq9171qqd92n3dp4w2qg2blg1qms"; - name = "qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz"; + sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck"; + name = "qtserialport-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/k7gayy35qqwbaf2yyr1lfydmsp6p9k3i-qtenginio-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz"; - sha256 = "0yjpx43qy6yc6hblcrkp6g9jv2ipg2hdd27q86y7s30q54f17nxf"; - name = "qtenginio-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz"; + sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0"; + name = "qtscript-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0y1p0ssxbd8wp4vyq5ad2f77inh07p1b-qtwebengine-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebengine-opensource-src-5.4.1.tar.xz"; - sha256 = "1c5akxh6wxgc72md6802fbvd601n03assv6i542siwmmnp5anhij"; - name = "qtwebengine-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz"; + sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn"; + name = "qtwebchannel-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0mdhndcp51g2160559kgd5a93c0c3317-qtmacextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmacextras-opensource-src-5.4.1.tar.xz"; - sha256 = "0hivjn3yfidzj4la3rlrqzjawrakxyhc886w2jcf0bjz3vzl9xp2"; - name = "qtmacextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0"; + name = "qtwinextras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hhana1500hq2h2l8815wq8rfrp7nizpb-qttranslations-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz"; - sha256 = "0hchmz7hjdjx0wn2v9sbgilvi0pigiriklw5pdvfxjabjxgh8k9w"; - name = "qttranslations-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz"; + sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4"; + name = "qtwebsockets-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/qfa1hycl1lh8pm2x65frxlms3waqbsfg-qtwebchannel-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebchannel-opensource-src-5.4.1.tar.xz"; - sha256 = "0ldjyyp0ym3hndd0bq5mwjry2yilf1cv9iddqb8adz46k3nbkb64"; - name = "qtwebchannel-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz"; + sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj"; + name = "qtmultimedia-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hif7dg37sz0yjj09844f0gyqqsf9cpxx-qtdoc-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdoc-opensource-src-5.4.1.tar.xz"; - sha256 = "1afg2lxyxgqhq02a58c9yshvkinlk5mw19yff1421fma6j925c8q"; - name = "qtdoc-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; + sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs"; + name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/shz5132xvpp2hvmsyl1mhps0qanrgw43-qtwebkit-examples-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz"; - sha256 = "02kj4rw40s7xhdz1ixfy5fc7n5pr2ipqkpwj1kwng71l3jrpn60r"; - name = "qtwebkit-examples-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz"; + sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa"; + name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/nl8rm1q2sqyq5y91h6d9dbks82krykn1-qtbase-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz"; - sha256 = "1dxigzgv6xj5lybs654y57ssfbl38dxff3s3wpvw0n89hf9sax45"; - name = "qtbase-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz"; + sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls"; + name = "qttranslations-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/f9cbf92nhmfkz1q2n4nidh432s5d3pls-qttools-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz"; - sha256 = "0whzcwgzwh1m6fqb7h2gvkx9hi2ijjaz8ap36jqr8cc4ff2hzphi"; - name = "qttools-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz"; + sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p"; + name = "qtdeclarative-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hl5gzwaq43afs2z7ga10161myzz3xrwb-qt5-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qt5-opensource-src-5.4.1.tar.xz"; - sha256 = "01xgf3531q60vrkg1pp07q4p0ildj42zgnw63v8fnwjg7c5m59rd"; - name = "qt5-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz"; + sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy"; + name = "qtwebkit-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/9y9qhciiqys5sm502bbflqzrjmvxpqh6-qtquick1-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz"; - sha256 = "0ba3r89j75vrjgh8h3ik64x84bhgbckc4bvy1wympwgfhk3j8lzb"; - name = "qtquick1-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz"; + sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp"; + name = "qtquick1-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/cmvv503q10qnmmbb8yxvvjlxpqqaswyb-qtwebsockets-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz"; - sha256 = "0i5bcxlwxbzq9k0kq1m90cbslby05x3j3r6js8xjarz2qnc6zxfs"; - name = "qtwebsockets-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz"; + sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877"; + name = "qtquickcontrols-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/9c4zpbngylc7cqqyai2ysglajapphxp7-qtsensors-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz"; - sha256 = "1y6vbvvcgph466whcc896lkyk2lx8lyyqj1qnm76f3jjywp8wjxc"; - name = "qtsensors-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz"; + sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb"; + name = "qtimageformats-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/njkpa0ahd4l5307b4qmqlqiv4nw1by7z-qtx11extras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz"; - sha256 = "0blcdqccxhdqj4v5zp6m34b74nw5n6pfgldyb6wrlpljkzdir9i0"; - name = "qtx11extras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz"; + sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8"; + name = "qtdoc-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/q2ji7ilipdvx0p6iyrwhhfczzw1j11ws-qtmultimedia-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz"; - sha256 = "0kjk3q7y2lr8a62rdidhn783jrq1rpj11p1jmfiw8z3j255dsc1q"; - name = "qtmultimedia-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz"; + sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0"; + name = "qtwayland-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/ikxpk38h1arms4x0qlnd7g5g3fg26fg4-qtactiveqt-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtactiveqt-opensource-src-5.4.1.tar.xz"; - sha256 = "14984cvh9cfnrgls40i28fjdhs015izzlvwck9va4167y3ix4zbx"; - name = "qtactiveqt-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80"; + name = "qtmacextras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0a30a874s507fmrsd1jlggbh9j953jb9-qtxmlpatterns-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz"; - sha256 = "062kqs8m9js8mlld1lsm01prq57zs88g7p8fad84a5gisgs2y57m"; - name = "qtxmlpatterns-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz"; + sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla"; + name = "qtactiveqt-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/cbb46kpmk6radk9v8cyngxcxr11g06f6-qtscript-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz"; - sha256 = "1bybzcp9smasw0syvb7vrz85jq124r7gywz2msgjg1kb6z4aqcpl"; - name = "qtscript-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz"; + sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw"; + name = "qtlocation-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/h5hg9z346lh2w8whf0zgq5kbwffpmnkk-qtquickcontrols-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz"; - sha256 = "1hpvbjr76q9i2idgmblr80khhjgkn78q0s0d648r3axp232m427y"; - name = "qtquickcontrols-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz"; + sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs"; + name = "qtconnectivity-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/7vxgal1cag6cakigc7h3rjvvr64b7sd3-qtimageformats-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz"; - sha256 = "0vw4bg68kwp48v49ds2vxvgjc82i5q5scff4013y5gpbd2smnv1z"; - name = "qtimageformats-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz"; + sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn"; + name = "qtx11extras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/pgcv75a5x56s88qclqvbw04dzywcxm73-qtserialport-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz"; - sha256 = "1zyhlpmh7yisk9qpk8map0myam4bkm4jvp0wcnd4d7pldf19xnbr"; - name = "qtserialport-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz"; + sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd"; + name = "qttools-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/p8jka7s4la8f83xqnl1a4ivdw95dajb8-qtwebkit-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz"; - sha256 = "1gqrf5g07q5bgr3vnfnsw5qwqd0fjyh4pgqphrvxq4x9z0g221v6"; - name = "qtwebkit-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz"; + sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf"; + name = "qtsensors-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/ggn5pkvp89qh12vzhhk572s38vg3zn72-qtconnectivity-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz"; - sha256 = "0q13gg7fmfb7cfq403ql8s5qi6s9a4fd86i7v9r6cwgnj2szzi42"; - name = "qtconnectivity-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz"; + sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8"; + name = "qtwebengine-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/pnblj6ncfvz4id84asjlnrxb2papsn1v-qtlocation-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz"; - sha256 = "113rx43349f7yn4crhgg6ciz6lyvfvfnc0vkdaz09a2r461hr7w8"; - name = "qtlocation-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz"; + sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz"; + name = "qtsvg-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0bz5yxqc9yg94jyjkvsgn7h7lph99a5v-qtdeclarative-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz"; - sha256 = "05s4imk7whm2qir9byb35dn2ndqb7c5r2cnxpv2qyjla58j4w4hm"; - name = "qtdeclarative-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz"; + sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44"; + name = "qt5-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/xdbwakyhif8cjwyii7v32zkxlrbrksmc-qtwinextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwinextras-opensource-src-5.4.1.tar.xz"; - sha256 = "01ddgvq8wny162njlzqnbphiiw565xsqy6h3s39cipa05c6mxblv"; - name = "qtwinextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz"; + sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8"; + name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/m3wk5r1ihbrjz9zpi57nllzqzha06c8j-qtsvg-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz"; - sha256 = "0b71kngnq7c5ry8bkb0rjlr6xx49h1sd25m4i4s3v1rfrv6912my"; - name = "qtsvg-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx"; + name = "qtandroidextras-opensource-src-5.4.2.tar.xz"; }; } ] diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh index 0da13f204ba..d4441cecbb3 100755 --- a/pkgs/development/libraries/qt-5/5.4/manifest.sh +++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh @@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../../../.. -A autonix.manifest) \ - http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/ \ + http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \ -A '*.tar.xz' else From bdcb721546f81c4b2c31eb84d94f10d91f1031ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 16:14:43 -0700 Subject: [PATCH 120/412] java: Refactor top level and build ordering --- .../compilers/openjdk/bootstrap.nix | 41 +++++++------ .../development/compilers/openjdk/default.nix | 6 +- .../compilers/openjdk/openjdk8.nix | 7 ++- pkgs/top-level/all-packages.nix | 61 ++++++++----------- 4 files changed, 56 insertions(+), 59 deletions(-) diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 890064538cc..bc63292a145 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -4,30 +4,33 @@ let # !!! These should be on nixos.org src = if glibc.system == "x86_64-linux" then fetchurl { - url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; - sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; + url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-x86_64-linux.tar.xz; + sha256 = "13m3df54mnr2nb67284s2zf5n8y502ck47gc39lcafrh40hzjil5"; } else if glibc.system == "i686-linux" then fetchurl { - url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; - sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; + url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-i686-linux.tar.xz; + sha256 = "18kzv4h9skxg5g5c7ar2ji3qny880h5svcn207b4d6xv4sa0a6ks"; } else throw "No bootstrap for system"; -in -runCommand "openjdk-bootstrap" {} '' - tar xvf ${src} - mv openjdk-bootstrap $out + bootstrap = runCommand "openjdk-bootstrap" { + passthru.home = "${bootstrap}/lib/openjdk"; + } '' + tar xvf ${src} + mv openjdk-bootstrap $out - for i in $out/bin/*; do - patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i - done + for i in $out/bin/*; do + patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true + patchelf --set-rpath ${glibc}/lib:$out/lib $i || true + done - # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: - exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done -'' + # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: + exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + ''; +in bootstrap diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index beab781c88d..323bf78ec59 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, jdk, nettools, xorg, file +, which, bootjdk, nettools, xorg, file , fontconfig, cpio, cacert, perl, setJavaClassPath }: let @@ -15,7 +15,7 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "65"; + update = "80"; build = "32"; @@ -81,7 +81,7 @@ let "COMPILER_PATH=" "DEVTOOLS_PATH=" "UNIXCOMMAND_PATH=" - "BOOTDIR=${jdk}" + "BOOTDIR=${bootjdk.home}" "STATIC_CXX=false" "UNLIMITED_CRYPTO=1" "FULL_DEBUG_SYMBOLS=0" diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 132f0f31b87..4406c72e229 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } : +{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig } : let update = "40"; build = "27"; @@ -44,7 +44,7 @@ let buildInputs = [ cpio file which unzip zip xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - cups freetype alsaLib openjdk perl liberation_ttf fontconfig ]; + cups freetype alsaLib perl liberation_ttf fontconfig bootjdk ]; setSourceRoot = '' sourceRoot="jdk8u${update}-jdk8u${update}-b${build}"; ''; @@ -82,10 +82,11 @@ let "--with-override-jaxws=../jaxws-${repover}" "--with-override-jaxp=../jaxp-${repover}" "--with-override-nashorn=../nashorn-${repover}" - "--with-boot-jdk=${openjdk}/lib/openjdk/" + "--with-boot-jdk=${bootjdk.home}" "--with-update-version=${update}" "--with-build-number=b${build}" "--with-milestone=fcs" + "--disable-debug-symbols" ]; NIX_LDFLAGS= "-lfontconfig"; buildFlags = "all"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b49c2e3b59d..18e0f49499d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3905,23 +3905,25 @@ let gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea7_jdk = callPackage ../development/compilers/icedtea rec { - jdk = openjdk; + icedtea7 = callPackage ../development/compilers/icedtea rec { + bootjdk = openjdk-bootstrap; giflib = giflib_5_0; - } // { outputs = [ "out" ]; }; + }; - icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs - { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; } - pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; }; + # There will not likely be an icedtea8 so users should move to openjdk + icedtea = icedtea7; icedtea7_web = callPackage ../development/compilers/icedtea-web { - jdk = icedtea7_jdk; + jdk = jdk7; xulrunner = firefox; }; - icedtea_jdk = icedtea7_jdk; - icedtea_jre = icedtea7_jre; - icedtea_web = icedtea7_web; + icedtea8_web = callPackage ../development/compilers/icedtea-web { + jdk = jdk8; + xulrunner = firefox; + }; + + icedtea_web = icedtea8_web; ikarus = callPackage ../development/compilers/ikarus { }; @@ -3929,34 +3931,25 @@ let path64 = callPackage ../development/compilers/path64 { }; - openjdk = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin { } - else - let - openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; - in (callPackage ../development/compilers/openjdk { - jdk = openjdkBootstrap; - }) // { outputs = [ "out" ]; }; + openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; - openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { } // { outputs = [ "out" ]; }; + openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; - # FIXME: Need a way to set per-output meta attributes. - openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs - { description = "The open-source Java Runtime Environment"; } - pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; + openjdk7 = callPackage ../development/compilers/openjdk { + bootjdk = openjdk-bootstrap; + }; - jdk = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgs.icedtea_jdk - else if stdenv.isDarwin - then pkgs.openjdk # TODO: Use icedtea for darwin - else pkgs.oraclejdk; + openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { + bootjdk = openjdk-bootstrap; + }; - jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgs.icedtea_jre - else if stdenv.isDarwin - then pkgs.openjre # TODO: Use icedtea for darwin - else pkgs.oraclejre; + openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; + + jdk7 = icedtea7; + + jdk8 = openjdk8; + + jdk = if stdenv.isDarwin then openjdk-darwin else jdk8; oraclejdk = pkgs.jdkdistro true false; From 0cc68fa478f26b802d1c82ef13ba055a745efbca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 21:55:09 -0700 Subject: [PATCH 121/412] openjdk-make-bootstrap: Use openjdk8 --- .../compilers/openjdk/make-bootstrap.nix | 39 +++++++++++-------- .../compilers/openjdk/openjdk8.nix | 12 +++--- pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index 090a1479741..aac54417e2a 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -1,26 +1,31 @@ { runCommand, openjdk, nukeReferences }: -let arch = openjdk.architecture; in - runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' - mkdir -p openjdk-bootstrap/bin - mkdir -p openjdk-bootstrap/lib - mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}} - cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin - cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib - cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib - cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security - cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext - cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch} - cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli - cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server - cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client || - rmdir openjdk-bootstrap/jre/lib/${arch}/client - cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless - cp -a ${openjdk}/include openjdk-bootstrap + mkdir -pv openjdk-bootstrap/lib + + # Do a deep copy of the openjdk + cp -vrL ${openjdk.home} openjdk-bootstrap/lib + + # Includes are needed for building the native jvm + cp -vrL ${openjdk}/include openjdk-bootstrap + + # The binaries are actually stored in the openjdk lib + ln -sv lib/openjdk/bin openjdk-bootstrap/bin + find . -name libjli.so + (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;) chmod -R +w openjdk-bootstrap + + # Remove components we don't need + find openjdk-bootstrap -name \*.diz -exec rm {} \; + find openjdk-bootstrap -name \*.ttf -exec rm {} \; + find openjdk-bootstrap -name \*.gif -exec rm {} \; + find openjdk-bootstrap -name src.zip -exec rm {} \; + rm -rf openjdk-bootstrap/lib/openjdk/jre/bin + + # Remove all of the references to the native nix store find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs + # Create the output tarball tar cv openjdk-bootstrap | xz > $out '' diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 4406c72e229..8226f2ea146 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig } : +{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig + +, minimal ? false } : let update = "40"; build = "27"; @@ -66,7 +68,6 @@ let ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch ./JDK-8074312-hotspot.patch - ]; preConfigure = '' chmod +x configure @@ -84,11 +85,11 @@ let "--with-override-nashorn=../nashorn-${repover}" "--with-boot-jdk=${bootjdk.home}" "--with-update-version=${update}" - "--with-build-number=b${build}" + "--with-build-number=${build}" "--with-milestone=fcs" "--disable-debug-symbols" - ]; - NIX_LDFLAGS= "-lfontconfig"; + ] ++ stdenv.lib.optional minimal "--disable-headful"; + NIX_LDFLAGS= if minimal then null else "-lfontconfig"; buildFlags = "all"; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk @@ -142,7 +143,6 @@ let ln -s $out/lib/openjdk/bin $out/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin - ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18e0f49499d..51dc6609660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3933,6 +3933,10 @@ let openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; + openjdk-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { + openjdk = openjdk.override { minimal = true; }; + }; + openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; openjdk7 = callPackage ../development/compilers/openjdk { From a8d10100279636146b8d66da582e1f23d9d91742 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 7 Jun 2015 02:53:12 -0700 Subject: [PATCH 122/412] icedtea: Remove --- .../icedtea/cppflags-include-fix.patch | 17 - .../development/compilers/icedtea/default.nix | 181 --------- .../compilers/icedtea/fix-java-home.patch | 17 - .../compilers/icedtea/generate-cacerts.pl | 366 ------------------ .../development/compilers/icedtea/sources.nix | 48 --- pkgs/development/compilers/icedtea/update.py | 261 ------------- pkgs/top-level/all-packages.nix | 10 +- 7 files changed, 1 insertion(+), 899 deletions(-) delete mode 100644 pkgs/development/compilers/icedtea/cppflags-include-fix.patch delete mode 100644 pkgs/development/compilers/icedtea/default.nix delete mode 100644 pkgs/development/compilers/icedtea/fix-java-home.patch delete mode 100644 pkgs/development/compilers/icedtea/generate-cacerts.pl delete mode 100644 pkgs/development/compilers/icedtea/sources.nix delete mode 100755 pkgs/development/compilers/icedtea/update.py diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch deleted file mode 100644 index 731a8d07548..00000000000 --- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk -index c6ab06d..23a14da 100644 ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk -+++ openjdk/jdk/make/sun/awt/mawt.gmk -@@ -270,12 +270,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) - endif # !HEADLESS - endif # PLATFORM - --ifeq ($(PLATFORM), linux) -- # Checking for the X11/extensions headers at the additional location -- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -- $(wildcard /usr/include/X11/extensions)) --endif -- - ifeq ($(PLATFORM), macosx) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix deleted file mode 100644 index 8a96d1c380d..00000000000 --- a/pkgs/development/compilers/icedtea/default.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, fetchurl, jdk, ant, wget, zip, unzip, cpio, file, libxslt -, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr -, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils -, cacert, setJavaClassPath -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "icedtea requires i686-linux or x86_64 linux"; - - srcInfo = (import ./sources.nix).icedtea7; - - pkgName = "icedtea7-${srcInfo.version}"; - - defSrc = name: - with (builtins.getAttr name srcInfo.bundles); fetchurl { - inherit url sha256; - name = "${pkgName}-${baseNameOf url}"; - }; - - bundleNames = builtins.attrNames srcInfo.bundles; - - sources = stdenv.lib.genAttrs bundleNames (name: defSrc name); - - bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources; - bundleFlags = map bundleFun bundleNames; - - icedtea = stdenv.mkDerivation (with srcInfo; { - name = pkgName; - - src = fetchurl { - inherit url sha256; - }; - - outputs = [ "out" "jre" ]; - - # TODO: Probably some more dependencies should be on this list but are being - # propagated instead - buildInputs = [ - jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake - autoconf which perl coreutils xorg.lndir - zlib libjpeg libpng giflib lcms2 kerberos attr alsaLib cups - xorg.libX11 xorg.libXtst gtk2 - ]; - - configureFlags = bundleFlags ++ [ - "--disable-bootstrap" - "--disable-downloading" - - "--without-rhino" - "--with-pax=paxctl" - "--with-jdk-home=${jdk.home}" - ]; - - preConfigure = '' - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' - substituteInPlace javah.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' - - ./autogen.sh - ''; - - preBuild = '' - make stamps/extract.stamp - - substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' - substituteInPlace openjdk/corba/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' - - patch -p0 < ${./cppflags-include-fix.patch} - patch -p0 < ${./fix-java-home.patch} - ''; - - NIX_NO_SELF_RPATH = true; - - makeFlags = [ - "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" - "ALT_UNIXCOMMAND_PATH=" - "ALT_USRBIN_PATH=" - "ALT_DEVTOOLS_PATH=" - "ALT_COMPILER_PATH=" - "ALT_CUPS_HEADERS_PATH=${cups}/include" - "ALT_OBJCOPY=${binutils}/bin/objcopy" - "SORT=${coreutils}/bin/sort" - "UNLIMITED_CRYPTO=1" - ]; - - installPhase = '' - mkdir -p $out/lib/icedtea $out/share $jre/lib/icedtea - - cp -av openjdk.build/j2sdk-image/* $out/lib/icedtea - - # Move some stuff to top-level. - mv $out/lib/icedtea/include $out/include - mv $out/lib/icedtea/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove some broken manpages. - rm -rf $out/share/man/ja* - - # Remove crap from the installation. - rm -rf $out/lib/icedtea/demo $out/lib/icedtea/sample - - # Move the JRE to a separate output. - mv $out/lib/icedtea/jre $jre/lib/icedtea/ - mkdir $out/lib/icedtea/jre - lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre - - # The following files cannot be symlinked, as it seems to violate Java security policies - rm $out/lib/icedtea/jre/lib/ext/* - cp $jre/lib/icedtea/jre/lib/ext/* $out/lib/icedtea/jre/lib/ext/ - - rm -rf $out/lib/icedtea/jre/bin - ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin - - # Remove duplicate binaries. - for i in $(cd $out/lib/icedtea/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/icedtea/bin/$i $jre/lib/icedtea/jre/bin/$i; then - ln -sfn $jre/lib/icedtea/jre/bin/$i $out/lib/icedtea/bin/$i - fi - done - - # Generate certificates. - pushd $jre/lib/icedtea/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - ln -s $out/lib/icedtea/bin $out/bin - ln -s $jre/lib/icedtea/jre/bin $jre/bin - ''; - - # FIXME: this is unnecessary once the multiple-outputs branch is merged. - preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedNativeBuildInputs+=" $jre" - - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/icedtea; fi - EOF - ''; - - meta = { - description = "Free Java development kit based on OpenJDK 7.0 and the IcedTea project"; - longDescription = '' - Free Java environment based on OpenJDK 7.0 and the IcedTea project. - - Full Java runtime environment - - Needed for executing Java Webstart programs and the free Java web browser plugin. - ''; - homepage = http://icedtea.classpath.org; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; - platforms = stdenv.lib.platforms.linux; - }; - - passthru = { - inherit architecture; - home = "${icedtea}/lib/icedtea"; - }; - }); -in icedtea diff --git a/pkgs/development/compilers/icedtea/fix-java-home.patch b/pkgs/development/compilers/icedtea/fix-java-home.patch deleted file mode 100644 index 5def344f171..00000000000 --- a/pkgs/development/compilers/icedtea/fix-java-home.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 -@@ -2358,12 +2358,10 @@ - CAST_FROM_FN_PTR(address, os::jvm_path), - dli_fname, sizeof(dli_fname), NULL); - assert(ret, "cannot locate libjvm"); - char *rp = NULL; - if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); -+ snprintf(buf, buflen, "%s", dli_fname); - } -- if (rp == NULL) -- return; - - if (Arguments::created_by_gamma_launcher()) { - // Support for the gamma launcher. Typical value for buf is diff --git a/pkgs/development/compilers/icedtea/generate-cacerts.pl b/pkgs/development/compilers/icedtea/generate-cacerts.pl deleted file mode 100644 index 3bdd42f7274..00000000000 --- a/pkgs/development/compilers/icedtea/generate-cacerts.pl +++ /dev/null @@ -1,366 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007, 2008 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# generate-cacerts.pl generates a JKS keystore named 'cacerts' from -# OpenSSL's certificate bundle using OpenJDK's keytool. - -# First extract each of OpenSSL's bundled certificates into its own -# aliased filename. - -# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 -# Check and prevention of duplicate aliases added by Vlastimil Babka - -$file = $ARGV[1]; -open(CERTS, $file); -@certs = ; -close(CERTS); - -$pem_file_count = 0; -$in_cert_block = 0; -$write_current_cert = 1; -foreach $cert (@certs) -{ - if ($cert =~ /Issuer: /) - { - $_ = $cert; - if ($cert =~ /personal-freemail/) - { - $cert_alias = "thawtepersonalfreemailca"; - } - elsif ($cert =~ /personal-basic/) - { - $cert_alias = "thawtepersonalbasicca"; - } - elsif ($cert =~ /personal-premium/) - { - $cert_alias = "thawtepersonalpremiumca"; - } - elsif ($cert =~ /server-certs/) - { - $cert_alias = "thawteserverca"; - } - elsif ($cert =~ /premium-server/) - { - $cert_alias = "thawtepremiumserverca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass1ca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass1g2ca"; - } - elsif ($cert =~ - /VeriSign Class 1 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass1g3ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass2ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass2g2ca"; - } - elsif ($cert =~ - /VeriSign Class 2 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass2g3ca"; - } - elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass3ca"; - } - # Version 1 of Class 3 Public Primary Certification Authority - # - G2 is added. Version 3 is excluded. See below. - elsif ($cert =~ - /VeriSign Class 3 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass3g3ca"; - } - elsif ($cert =~ - /RSA Data Security.*Secure Server Certification Authority/) - { - $cert_alias = "verisignserverca"; - } - elsif ($cert =~ /GTE CyberTrust Global Root/) - { - $cert_alias = "gtecybertrustglobalca"; - } - elsif ($cert =~ /Baltimore CyberTrust Root/) - { - $cert_alias = "baltimorecybertrustca"; - } - elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) - { - $cert_alias = "entrustclientca"; - } - elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) - { - $cert_alias = "entrustglobalclientca"; - } - elsif ($cert =~ /www.entrust.net\/CPS_2048/) - { - $cert_alias = "entrust2048ca"; - } - elsif ($cert =~ /www.entrust.net\/CPS /) - { - $cert_alias = "entrustsslca"; - } - elsif ($cert =~ /www.entrust.net\/SSL_CPS/) - { - $cert_alias = "entrustgsslca"; - } - elsif ($cert =~ /The Go Daddy Group/) - { - $cert_alias = "godaddyclass2ca"; - } - elsif ($cert =~ /Starfield Class 2 Certification Authority/) - { - $cert_alias = "starfieldclass2ca"; - } - elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/) - { - $cert_alias = "valicertclass2ca"; - } - elsif ($cert =~ /GeoTrust Global CA$/) - { - $cert_alias = "geotrustglobalca"; - } - elsif ($cert =~ /Equifax Secure Certificate Authority/) - { - $cert_alias = "equifaxsecureca"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-1/) - { - $cert_alias = "equifaxsecureebusinessca1"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-2/) - { - $cert_alias = "equifaxsecureebusinessca2"; - } - elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/) - { - $cert_alias = "equifaxsecureglobalebusinessca1"; - } - elsif ($cert =~ /Sonera Class1 CA/) - { - $cert_alias = "soneraclass1ca"; - } - elsif ($cert =~ /Sonera Class2 CA/) - { - $cert_alias = "soneraclass2ca"; - } - elsif ($cert =~ /AAA Certificate Services/) - { - $cert_alias = "comodoaaaca"; - } - elsif ($cert =~ /AddTrust Class 1 CA Root/) - { - $cert_alias = "addtrustclass1ca"; - } - elsif ($cert =~ /AddTrust External CA Root/) - { - $cert_alias = "addtrustexternalca"; - } - elsif ($cert =~ /AddTrust Qualified CA Root/) - { - $cert_alias = "addtrustqualifiedca"; - } - elsif ($cert =~ /UTN-USERFirst-Hardware/) - { - $cert_alias = "utnuserfirsthardwareca"; - } - elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/) - { - $cert_alias = "utnuserfirstclientauthemailca"; - } - elsif ($cert =~ /UTN - DATACorp SGC/) - { - $cert_alias = "utndatacorpsgcca"; - } - elsif ($cert =~ /UTN-USERFirst-Object/) - { - $cert_alias = "utnuserfirstobjectca"; - } - elsif ($cert =~ /America Online Root Certification Authority 1/) - { - $cert_alias = "aolrootca1"; - } - elsif ($cert =~ /DigiCert Assured ID Root CA/) - { - $cert_alias = "digicertassuredidrootca"; - } - elsif ($cert =~ /DigiCert Global Root CA/) - { - $cert_alias = "digicertglobalrootca"; - } - elsif ($cert =~ /DigiCert High Assurance EV Root CA/) - { - $cert_alias = "digicerthighassuranceevrootca"; - } - elsif ($cert =~ /GlobalSign Root CA$/) - { - $cert_alias = "globalsignca"; - } - elsif ($cert =~ /GlobalSign Root CA - R2/) - { - $cert_alias = "globalsignr2ca"; - } - elsif ($cert =~ /Elektronik.*Kas.*2005/) - { - $cert_alias = "extra-elektronikkas2005"; - } - elsif ($cert =~ /Elektronik/) - { - $cert_alias = "extra-elektronik2005"; - } - # Mozilla does not provide these certificates: - # baltimorecodesigningca - # gtecybertrust5ca - # trustcenterclass2caii - # trustcenterclass4caii - # trustcenteruniversalcai - else - { - # Generate an alias using the OU and CN attributes of the - # Issuer field if both are present, otherwise use only the - # CN attribute. The Issuer field must have either the OU - # or the CN attribute. - $_ = $cert; - if ($cert =~ /OU=/) - { - s/Issuer:.*?OU=//; - # Remove other occurrences of OU=. - s/OU=.*CN=//; - # Remove CN= if there were not other occurrences of OU=. - s/CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - elsif ($cert =~ /CN=/) - { - s/Issuer:.*CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - s/\W//g; - tr/A-Z/a-z/; - $cert_alias = "extra-$_"; - - } - while (-e "$cert_alias.pem") - { - $cert_alias = "$cert_alias" . "_"; - } - } - # When it attempts to parse: - # - # Class 3 Public Primary Certification Authority - G2, Version 3 - # - # keytool says: - # - # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false - # Unparseable AuthorityInfoAccess extension due to - # java.io.IOException: Invalid encoding of URI - # - # If we do not exclude this file - # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails - # on this cert, printing: - # - # Couldn't verify: java.security.SignatureException: Signature - # does not match. - # - elsif ($cert =~ - /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/) - { - $write_current_cert = 0; - $pem_file_count--; - } - elsif ($cert eq "-----BEGIN CERTIFICATE-----\n") - { - $_ = $cert; - s/\W//g; - tr/A-Z/a-z/; - $cert_alias = "extra-$_"; - while (-e "$cert_alias.pem") - { - $cert_alias = "$cert_alias" . "_"; - } - if ($in_cert_block != 0) - { - die "$file is malformed."; - } - $in_cert_block = 1; - if ($write_current_cert == 1) - { - $pem_file_count++; - if (-e "$cert_alias.pem") - { - print "$cert_alias"; - die "already exists" - } - open(PEM, ">$cert_alias.pem"); - print PEM $cert; - } - } - elsif ($cert eq "-----END CERTIFICATE-----\n") - { - $in_cert_block = 0; - if ($write_current_cert == 1) - { - print PEM $cert; - close(PEM); - } - $write_current_cert = 1 - } - else - { - if ($in_cert_block == 1 && $write_current_cert == 1) - { - print PEM $cert; - } - } -} - -# Check that the correct number of .pem files were produced. -@pem_files = <*.pem>; -if (@pem_files != $pem_file_count) -{ - print "$pem_file_count"; - die "Number of .pem files produced does not match". - " number of certs read from $file."; -} - -# Now store each cert in the 'cacerts' file using keytool. -$certs_written_count = 0; -foreach $pem_file (@pem_files) -{ - system "$ARGV[0] -noprompt -import". - " -alias `basename $pem_file .pem`". - " -keystore cacerts -storepass 'changeit' -file $pem_file"; - unlink($pem_file); - $certs_written_count++; -} - -# Check that the correct number of certs were added to the keystore. -if ($certs_written_count != $pem_file_count) -{ - die "Number of certs added to keystore does not match". - " number of certs read from $file."; -} diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix deleted file mode 100644 index 80d96b4660a..00000000000 --- a/pkgs/development/compilers/icedtea/sources.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file is autogenerated from update.py in the same directory. -{ - icedtea7 = rec { - version = "2.5.5"; - - url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz"; - sha256 = "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9"; - - common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}"; - - bundles = { - openjdk = rec { - url = "${common_url}/openjdk.tar.bz2"; - sha256 = "5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d"; - }; - - corba = rec { - url = "${common_url}/corba.tar.bz2"; - sha256 = "f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51"; - }; - - jaxp = rec { - url = "${common_url}/jaxp.tar.bz2"; - sha256 = "293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256"; - }; - - jaxws = rec { - url = "${common_url}/jaxws.tar.bz2"; - sha256 = "76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be"; - }; - - jdk = rec { - url = "${common_url}/jdk.tar.bz2"; - sha256 = "c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483"; - }; - - langtools = rec { - url = "${common_url}/langtools.tar.bz2"; - sha256 = "71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660"; - }; - - hotspot = rec { - url = "${common_url}/hotspot.tar.bz2"; - sha256 = "d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb"; - }; - }; - }; -} diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py deleted file mode 100755 index c41cf3d38d2..00000000000 --- a/pkgs/development/compilers/icedtea/update.py +++ /dev/null @@ -1,261 +0,0 @@ -#!/usr/bin/env python3 - -import subprocess, urllib.request, re, os, tarfile -from html.parser import HTMLParser - -URL = 'http://icedtea.classpath.org/download/drops/icedtea{}/{}' -DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/' -DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D' - -ICEDTEA_JDKS = [7] - -BUNDLES = ['openjdk', 'corba', 'jaxp', 'jaxws', 'jdk', 'langtools', 'hotspot'] - -SRC_PATH = './sources.nix' - -def get_output(cmd, env = None): - try: - proc = subprocess.Popen(cmd, env = env, stdout = subprocess.PIPE) - out = proc.communicate()[0] - except subprocess.CalledProcessError as e: - return None - - return out.decode('utf-8').strip() - -def nix_prefetch_url(url): - env = os.environ.copy() - env['PRINT_PATH'] = '1' - out = get_output(['nix-prefetch-url', url], env = env) - - return out.split('\n') - -def get_nix_attr(path, attr): - out = get_output(['nix-instantiate', '--eval-only', '-A', attr, path]) - - if len(out) < 2 or out[0] != '"' or out[-1] != '"': - raise Exception('Cannot find Nix attribute "{}" (parsing failure?)'.format(attr)) - - # Strip quotes - return out[1:-1] - -def get_jdk_attr(jdk, attr): - return get_nix_attr(SRC_PATH, 'icedtea{}.{}'.format(jdk, attr)) - -class Parser(HTMLParser): - def __init__(self, link_regex): - HTMLParser.__init__(self) - - self.regex = link_regex - self.href = None - self.version = None - - def handle_starttag(self, tag, attrs): - if self.href != None or tag != 'a': - return - - href = None - for attr in attrs: - if attr[0] == 'href': - href = attr[1] - if href == None: - return - - m = re.match(self.regex, href) - if m != None: - self.href = href - self.version = m.group(1) - -def get_latest_version_url(major): - f = urllib.request.urlopen(DOWNLOAD_HTML) - html = f.read().decode('utf-8') - f.close() - - parser = Parser(r'^icedtea\d?-({}\.\d[\d.]*)\.tar\.xz$'.format(major)) - parser.feed(html) - parser.close() - - if parser.href == None: - raise Exception('Error: could not find download url for major version "{}"'.format(major)) - - return parser.version, DOWNLOAD_URL + parser.href - -def get_old_bundle_attrs(jdk, bundle): - attrs = {} - for attr in ('url', 'sha256'): - attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr)) - - return attrs - -def get_old_attrs(jdk): - attrs = {} - - for attr in ('version', 'url', 'sha256'): - attrs[attr] = get_jdk_attr(jdk, attr) - - attrs['bundles'] = {} - - for bundle in BUNDLES: - attrs['bundles'][bundle] = get_old_bundle_attrs(jdk, bundle) - - return attrs - -def get_member_filename(tarball, name): - for fname in tarball.getnames(): - m = re.match(r'^icedtea\d?-\d[\d.]*/{}$'.format(name), fname) - if m != None: - return m.group(0) - - return None - -def get_member_file(tarball, name): - path = get_member_filename(tarball, name) - if path == None: - raise Exception('Could not find "{}" inside tarball'.format(name)) - - f = tarball.extractfile(path) - data = f.read().decode('utf-8') - f.close() - - return data - -def get_new_bundle_attr(makefile, bundle, attr): - var = '{}_{}'.format(bundle.upper(), attr.upper()) - regex = r'^{} = (.*?)$'.format(var) - - m = re.search(regex, makefile, re.MULTILINE) - if m == None: - raise Exception('Could not find variable "{}" in Makefile.am'.format(var)) - - return m.group(1) - -def get_new_bundle_attrs(jdk, version, path): - url = URL.format(jdk, version) - - attrs = {} - - print('Opening file: "{}"'.format(path)) - tar = tarfile.open(name = path, mode = 'r:xz') - - makefile = get_member_file(tar, 'Makefile.am') - hotspot_map = get_member_file(tar, 'hotspot.map.in') - - hotspot_map = hotspot_map.replace('@ICEDTEA_RELEASE@', version) - - for bundle in BUNDLES: - battrs = {} - - battrs['url'] = '{}/{}.tar.bz2'.format(url, bundle) - if bundle == 'hotspot': - m = re.search(r'^default (.*?) (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE) - if m == None: - raise Exception('Could not find info for hotspot bundle in hotspot.map.in') - - battrs['sha256'] = m.group(4) - else: - battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum') - - attrs[bundle] = battrs - - tar.close() - - return attrs - -def get_new_attrs(jdk): - print('Getting old attributes for JDK {}...'.format(jdk)) - old_attrs = get_old_attrs(jdk) - attrs = {} - - # The major version corresponds to a specific JDK (1 = OpenJDK6, 2 = OpenJDK7, 3 = OpenJDK8) - major = jdk - 5 - - print('Getting latest version for JDK {}...'.format(jdk)) - version, url = get_latest_version_url(major) - - print() - print('Old version: {}'.format(old_attrs['version'])) - print('New version: {}'.format(version)) - print() - - if version == old_attrs['version']: - print('No update available, skipping...') - print() - return old_attrs - - print('Update available, generating new attributes for JDK {}...'.format(jdk)) - - attrs['version'] = version - attrs['url'] = url - - print('Downloading tarball from url "{}"...'.format(url)) - print() - attrs['sha256'], path = nix_prefetch_url(url) - print() - - print('Inspecting tarball for bundle information...') - - attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['version'], path) - - print('Done!') - - return attrs - -def generate_jdk(jdk): - attrs = get_new_attrs(jdk) - - version = attrs['version'] - src_url = attrs['url'].replace(version, '${version}') - - common_url = URL.format(jdk, version) - src_common_url = URL.format(jdk, '${version}') - - src = ' icedtea{} = rec {{\n'.format(jdk) - src += ' version = "{}";\n'.format(version) - src += '\n' - src += ' url = "{}";\n'.format(src_url) - src += ' sha256 = "{}";\n'.format(attrs['sha256']) - src += '\n' - src += ' common_url = "{}";\n'.format(src_common_url) - src += '\n' - src += ' bundles = {\n' - - for bundle in BUNDLES: - battrs = attrs['bundles'][bundle] - - b_url = battrs['url'] - b_url = b_url.replace(common_url, '${common_url}') - - src += ' {} = rec {{\n'.format(bundle) - src += ' url = "{}";\n'.format(b_url) - src += ' sha256 = "{}";\n'.format(battrs['sha256']) - src += ' };\n' - - if bundle != BUNDLES[-1]: - src += '\n' - - src += ' };\n' - src += ' };\n' - - return src - -def generate_sources(jdks): - src = '# This file is autogenerated from update.py in the same directory.\n' - src += '{\n' - - for jdk in jdks: - print() - print('Generating sources for JDK {}...'.format(jdk)) - src += generate_jdk(jdk) - - src += '}\n' - return src - -if __name__ == '__main__': - print('Generating {}...'.format(SRC_PATH)) - src = generate_sources(ICEDTEA_JDKS) - - f = open(SRC_PATH, 'w', encoding = 'utf-8') - f.write(src) - f.close() - - print() - print('Update complete!') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51dc6609660..60c941a7e27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3905,14 +3905,6 @@ let gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea7 = callPackage ../development/compilers/icedtea rec { - bootjdk = openjdk-bootstrap; - giflib = giflib_5_0; - }; - - # There will not likely be an icedtea8 so users should move to openjdk - icedtea = icedtea7; - icedtea7_web = callPackage ../development/compilers/icedtea-web { jdk = jdk7; xulrunner = firefox; @@ -3949,7 +3941,7 @@ let openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; - jdk7 = icedtea7; + jdk7 = openjdk7; jdk8 = openjdk8; From a5ef488b11734c16151ddad5105c84fc155babf2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 7 Jun 2015 21:01:17 -0700 Subject: [PATCH 123/412] opendjk: Make boostraps for each major version and update openjdk7 --- .../compilers/openjdk/bootstrap.nix | 44 +++- .../development/compilers/openjdk/default.nix | 57 ++++- .../compilers/openjdk/openjdk8.nix | 212 +++++++++--------- pkgs/top-level/all-packages.nix | 19 +- 4 files changed, 203 insertions(+), 129 deletions(-) diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index bc63292a145..a9ca7673dfe 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,17 +1,34 @@ -{ stdenv, runCommand, glibc, fetchurl, file }: +{ stdenv, runCommand, glibc, fetchurl, file + +, version +}: let # !!! These should be on nixos.org src = if glibc.system == "x86_64-linux" then - fetchurl { - url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-x86_64-linux.tar.xz; - sha256 = "13m3df54mnr2nb67284s2zf5n8y502ck47gc39lcafrh40hzjil5"; - } + (if version == "8" then + fetchurl { + url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1"; + sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"; + } + else if version == "7" then + fetchurl { + url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1"; + sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra"; + } + else throw "No bootstrap for version") else if glibc.system == "i686-linux" then - fetchurl { - url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-i686-linux.tar.xz; - sha256 = "18kzv4h9skxg5g5c7ar2ji3qny880h5svcn207b4d6xv4sa0a6ks"; - } + (if version == "8" then + fetchurl { + url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1"; + sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"; + } + else if version == "7" then + fetchurl { + url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1"; + sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx"; + } + else throw "No bootstrap for version") else throw "No bootstrap for system"; bootstrap = runCommand "openjdk-bootstrap" { @@ -20,9 +37,16 @@ let tar xvf ${src} mv openjdk-bootstrap $out + LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" + for i in $out/bin/*; do patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true - patchelf --set-rpath ${glibc}/lib:$out/lib $i || true + patchelf --set-rpath "${glibc}/lib:$LIBDIRS" $i || true + done + + find $out -name \*.so\* | while read lib; do + patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $lib || true + patchelf --set-rpath "${glibc}/lib:${stdenv.cc.cc}/lib:$LIBDIRS" $lib || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 323bf78ec59..9bdea7bc7ab 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype , which, bootjdk, nettools, xorg, file -, fontconfig, cpio, cacert, perl, setJavaClassPath }: +, fontconfig, cpio, cacert, perl, setJavaClassPath +, minimal ? false +}: let @@ -27,13 +29,41 @@ let md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; }; + baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; + repover = "jdk7u${update}-b${build}"; + jdk7 = fetchurl { + url = "${baseurl}/archive/${repover}.tar.gz"; + sha256 = "1r8xnn87nmqaq2f8i3cp3i9ngq66k0c0wgkdq5cf59lkgs8wkcdi"; + }; + langtools = fetchurl { + url = "${baseurl}/langtools/archive/${repover}.tar.gz"; + sha256 = "01alj6pfrjqyf4irll9wg34h4w9nmb3973lvbacs528qm1nxgh9r"; + }; + hotspot = fetchurl { + url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; + sha256 = "14zla8axmg5344zf45i4cj7yyli0kmdjsh9yalmzqaphpkqjqpf2"; + }; + corba = fetchurl { + url = "${baseurl}/corba/archive/${repover}.tar.gz"; + sha256 = "19z3ay3f2q7r2ra03c6wy8b5rbdbrkq5g2dzhrqcg0n4iydd3c40"; + }; + jdk = fetchurl { + url = "${baseurl}/jdk/archive/${repover}.tar.gz"; + sha256 = "1q0r2l9bz2cyx4fq79x6cb2f5xycw83hl5cn1d1mazgsckp590lb"; + }; + jaxws = fetchurl { + url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; + sha256 = "1lp0mww2x3b6xavb7idrzckh6iw8jd6s1fvqgfvzs853z4ifksqj"; + }; + jaxp = fetchurl { + url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; + sha256 = "0pd874dkgxkb7frxg4n9py61kkhhck4x33dcynynwb3vl6k6iy79"; + }; openjdk = stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; - src = fetchurl { - url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz"; - sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx"; - }; + srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ]; + sourceRoot = "."; outputs = [ "out" "jre" ]; @@ -41,18 +71,23 @@ let [ unzip procps ant which zip cpio nettools alsaLib xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - fontconfig perl file + fontconfig perl file bootjdk ]; - NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; + NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; postUnpack = '' + ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do + mv $p-* $(ls | grep '^jdk7u')/$p + done + cd jdk7u-* + sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk*/hotspot/make/linux/makefiles/sa.make + hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk + {jdk,corba}/make/common/shared/Defs-utils.gmk tar xf ${cupsSrc} cupsDir=$(echo $(pwd)/cups-*) @@ -75,7 +110,7 @@ let "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "FREETYPE_HEADERS_PATH=${freetype}/include" "FREETYPE_LIB_PATH=${freetype}/lib" - "MILESTONE=u${update}" + "MILESTONE=${update}" "BUILD_NUMBER=b${build}" "USRBIN_PATH=" "COMPILER_PATH=" @@ -85,7 +120,7 @@ let "STATIC_CXX=false" "UNLIMITED_CRYPTO=1" "FULL_DEBUG_SYMBOLS=0" - ]; + ] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1"; configurePhase = "true"; diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 8226f2ea146..dfac59d859f 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig +{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib , minimal ? false } : let @@ -40,118 +41,123 @@ let sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}b${build}"; - srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; - outputs = [ "out" "jre" ]; - buildInputs = [ cpio file which unzip zip - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - cups freetype alsaLib perl liberation_ttf fontconfig bootjdk ]; - setSourceRoot = '' - sourceRoot="jdk8u${update}-jdk8u${update}-b${build}"; - ''; - prePatch = '' - # despite --with-override-jdk the build still searchs here - # GNU Patch bug, --follow-symlinks only follow the last dir part symlink - mv "../jdk-${repover}" "jdk"; - mv "../hotspot-${repover}" "hotspot"; - ''; - postPatch = '' - mv jdk "../jdk-${repover}"; - mv hotspot "../hotspot-${repover}"; - # Patching is over, lets re-add the links - ln -s "../jdk-${repover}" "jdk" - ln -s "../hotspot-${repover}" "hotspot" - ''; - patches = [ - ./fix-java-home-jdk8.patch - ./read-truststore-from-env-jdk8.patch - ./currency-date-range-jdk8.patch - ./JDK-8074312-hotspot.patch - ]; - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "$shell" - substituteInPlace ../hotspot-${repover}/make/linux/adlc_updater --replace /bin/sh "$shell" - ''; - configureFlags = [ - "--with-freetype=${freetype}" - "--with-override-langtools=../langtools-${repover}" - "--with-override-hotspot=../hotspot-${repover}" - "--with-override-corba=../corba-${repover}" - "--with-override-jdk=../jdk-${repover}" - "--with-override-jaxws=../jaxws-${repover}" - "--with-override-jaxp=../jaxp-${repover}" - "--with-override-nashorn=../nashorn-${repover}" - "--with-boot-jdk=${bootjdk.home}" - "--with-update-version=${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--disable-debug-symbols" - ] ++ stdenv.lib.optional minimal "--disable-headful"; - NIX_LDFLAGS= if minimal then null else "-lfontconfig"; - buildFlags = "all"; - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + name = "openjdk-8u${update}b${build}"; - cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk + srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; + sourceRoot = "."; - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man + outputs = [ "out" "jre" ]; - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux"/"*_md.h $out/include/ + buildInputs = [ + cpio file which unzip zip + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst + xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir + cups freetype alsaLib perl liberation_ttf fontconfig bootjdk zlib + ]; - # Remove some broken manpages. - rm -rf $out/share/man/ja* + prePatch = '' + ls | grep jdk | grep -v '^jdk8u' | awk -F- '{print $1}' | while read p; do + mv $p-* $(ls | grep '^jdk8u')/$p + done + cd $(ls | grep '^jdk8u') + ''; - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + patches = [ + ./fix-java-home-jdk8.patch + ./read-truststore-from-env-jdk8.patch + ./currency-date-range-jdk8.patch + ./JDK-8074312-hotspot.patch + ]; - # Move the JRE to a separate output and setup fallback fonts - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "$shell" + substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" + ''; - rm -rf $out/lib/openjdk/jre/bina - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + configureFlags = [ + "--with-freetype=${freetype}" + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--disable-freetype-bundling" + ] ++ (if minimal then [ + "--disable-headful" + "--with-zlib=bundled" + "--with-giflib=bundled" + ] else [ + "--with-zlib=system" + ]); - # Set PaX markings - exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done + NIX_LDFLAGS= if minimal then null else "-lfontconfig"; - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done + buildFlags = "all"; - # Generate certificates. - pushd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd + installPhase = '' + mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ''; + cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk - meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + # Move some stuff to top-level. + mv $out/lib/openjdk/include $out/include + mv $out/lib/openjdk/man $out/share/man + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux"/"*_md.h $out/include/ + + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + + # Move the JRE to a separate output and setup fallback fonts + mv $out/lib/openjdk/jre $jre/lib/openjdk/ + mkdir $out/lib/openjdk/jre + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + rm -rf $out/lib/openjdk/jre/bina + ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + + # Set PaX markings + exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + echo "to mark: *$exes*" + for file in $exes; do + echo "marking *$file*" + paxmark ${paxflags} "$file" + done + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + # Generate certificates. + pushd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + ln -s $out/lib/openjdk/bin $out/bin + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + + passthru.home = "${openjdk8}/lib/openjdk"; }; - - passthru.home = "${openjdk8}/lib/openjdk"; -}; in openjdk8 +in openjdk8 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60c941a7e27..6daa4b07595 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3923,29 +3923,38 @@ let path64 = callPackage ../development/compilers/path64 { }; - openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; + openjdk7-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; + openjdk8-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; - openjdk-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { - openjdk = openjdk.override { minimal = true; }; + openjdk7-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { + openjdk = openjdk7.override { minimal = true; }; + }; + openjdk8-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { + openjdk = openjdk8.override { minimal = true; }; }; openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; openjdk7 = callPackage ../development/compilers/openjdk { - bootjdk = openjdk-bootstrap; + bootjdk = openjdk7-bootstrap; }; + openjdk7_jre = openjdk7.jre; openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { - bootjdk = openjdk-bootstrap; + bootjdk = openjdk8-bootstrap; }; + openjdk8_jre = openjdk8.jre; openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; jdk7 = openjdk7; + jre7 = jdk7.jre; jdk8 = openjdk8; + jre8 = jdk8.jre; jdk = if stdenv.isDarwin then openjdk-darwin else jdk8; + jre = jdk.jre; oraclejdk = pkgs.jdkdistro true false; From 6e68e874b54849a7fe6d9be10dde24d203bfc90d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 00:00:12 -0700 Subject: [PATCH 124/412] openjdk8: Fix refernces to the bootstrap --- .../compilers/openjdk/openjdk8.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index dfac59d859f..530391c8e7d 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -150,6 +150,32 @@ let ln -s $jre/lib/openjdk/jre/bin $jre/bin ''; + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR="$(eval echo \$$output)" + BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + meta = with stdenv.lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; From c3d9e90f0eeac0fc0f182ffb87d9e074d9d52b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= Date: Mon, 8 Jun 2015 08:52:06 +0200 Subject: [PATCH 125/412] Updated apcupsd to version 3.14.13 --- pkgs/servers/apcupsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index ad8685d3d42..e60f6173c0f 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null; stdenv.mkDerivation rec { pname = "apcupsd"; - name = "${pname}-3.14.12"; + name = "${pname}-3.14.13"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0h54ahj65nqrgmdcg81h1gp0zlxg9hwwhg8pmx6z9zcwn4y70kqv"; + sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p"; }; buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; From b9de32de5bd26dd7279622f6a4c6aa336e044d1b Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 8 Jun 2015 00:48:13 -0700 Subject: [PATCH 126/412] update GHC HEAD and configuration --- pkgs/development/compilers/ghc/head.nix | 6 +++--- .../configuration-ghc-head.nix | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 45bb4342088..bc59a53bc17 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150402"; + version = "7.11.20150607"; name = "ghc-${version}"; - rev = "47f821a1a24553dc29b9581b1a259a9b1394c955"; + rev = "89223ce1340654455a9f3aa9cbf25f30884227fd"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj"; + sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs"; }; postUnpack = '' diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 73da57d7350..dabdeec3a23 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -42,10 +42,31 @@ self: super: { # haddock: No input file(s). nats = dontHaddock super.nats; + bytestring-builder = dontHaddock super.bytestring-builder; + + alex = dontCheck super.alex; # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; + # Show works differently for record syntax now, breaking haskell-src-exts' parser tests + # https://github.com/haskell-suite/haskell-src-exts/issues/224 + haskell-src-exts = dontCheck super.haskell-src-exts; + + process-extras = appendPatch super.process-extras (pkgs.fetchpatch { + url = "https://github.com/seereason/process-extras/pull/4.patch"; + sha256 = "0wfd8dmr0a4dvgp6nhmkznxq1nq8ciprsacn1canmkzjkdidn6kj"; + }); + mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { + url = "https://github.com/snoyberg/mono-traversable/pull/77.patch"; + sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1"; + }); + yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch { + url = "https://github.com/yesodweb/yesod/pull/1006.patch"; + sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar"; + stripLen = 1; + }); + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; From 50e9fa5719b233c6c679033871a20427fd619949 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Thu, 4 Jun 2015 13:01:01 -0700 Subject: [PATCH 127/412] dirt: include sound samples (close #8179) also add self as maintainer --- lib/maintainers.nix | 1 + pkgs/applications/audio/dirt/default.nix | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 174eced43c2..3ae9d5ceb94 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -16,6 +16,7 @@ amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; + anderspapitto = "Anders Papitto "; andres = "Andres Loeh "; antono = "Antono Vasiljev "; ardumont = "Antoine R. Dumont "; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 1db4515ae23..74adf4533fa 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -9,13 +9,21 @@ stdenv.mkDerivation rec { sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; }; buildInputs = [ libsndfile libsamplerate liblo jack2 ]; + postPatch = '' + sed -i "s|./samples|$out/share/dirt/samples|" file.h + ''; configurePhase = '' export DESTDIR=$out ''; + postInstall = '' + mkdir -p $out/share/dirt/ + cp -r samples $out/share/dirt/ + ''; - meta = { + meta = with stdenv.lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; homepage = "https://github.com/tidalcycles/Dirt"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; + maintainers = with maintainers; [ anderspapitto ]; }; } From d85be1cfa3e5e2c50e57e8e143b562b91541ea77 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 8 Jun 2015 08:35:12 +0000 Subject: [PATCH 128/412] mwlib uses pdftk to create books --- nixos/modules/services/misc/mwlib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index d02e1e021a7..a8edecff2a1 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -226,7 +226,7 @@ in chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' ''; - path = with pkgs; [ imagemagick ]; + path = with pkgs; [ imagemagick pdftk ]; environment = { PYTHONPATH = concatMapStringsSep ":" (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") From 02b79010234cc6ed670ab6c0353f2b08283bdec6 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 10 Feb 2015 10:40:36 +0100 Subject: [PATCH 129/412] New flag for compiling libyaml-cpp as PIC. --- pkgs/development/libraries/libyaml-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 1ba31a7a6d5..f56bf77abfe 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost }: +{ stdenv, fetchurl, cmake, boost, makePIC ? false }: stdenv.mkDerivation { name = "libyaml-cpp-0.5.1"; @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = [ cmake boost ]; + cmakeFlags = stdenv.lib.optionals makePIC [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]; + meta = with stdenv.lib; { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; From d3435d7ce006436a4056d0800083daffbfa8bca6 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 8 Jun 2015 11:18:26 +0200 Subject: [PATCH 130/412] New package: Calamares Add Calamares, a distribution independent installer framework. --- pkgs/tools/misc/calamares/default.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/calamares/default.nix diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix new file mode 100644 index 00000000000..c8fe39f6a7a --- /dev/null +++ b/pkgs/tools/misc/calamares/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted +, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart }: + +stdenv.mkDerivation rec { + name = "calamares-${version}"; + version = "1.0"; + + src = fetchgit { + url = "https://github.com/calamares/calamares.git"; + rev = "dabfb68a68cb012a90cd7b94a22e1ea08f7dd8ad"; + sha256 = "2851ce487aaac61d2df342a47f91ec87fe52ff036227ef697caa7056fe5f188c"; + }; + + buildInputs = [ + cmake qt5.base qt5.tools libyamlcpp python boost polkit_qt5 parted + extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart + ]; + + cmakeFlags = [ + "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DWITH_PARTITIONMANAGER=1" + ]; + + preInstall = '' + substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out" + ''; + + meta = with stdenv.lib; { + description = "Distribution-independent installer framework"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0311f6ac7b8..17f05d0eaad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1639,6 +1639,13 @@ let ghostscript = null; }; + calamares = callPackage ../tools/misc/calamares rec { + python = python3; + boost = callPackage ../development/libraries/boost/1.57.nix { python=python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; + inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid; + }; + grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; automake = automake112x; # fails with 13 and 14 From 8e7f4d3c336088dfe1ec6d6d3c2b64d5dd361151 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Mon, 8 Jun 2015 10:36:18 +0100 Subject: [PATCH 131/412] Remind update to 3.1.14, changes: * Version 3.1 Patch 14 - 2014-04-24 - NEW FEATURE: Putting the line __EOF__ in a .rem file causes Remind to treat it as end-of-file. - IMPROVEMENT: Use better PNG images for moons in the HTML display - CHANGE: Author name updated from "David" to "Dianne" - BUG FIX: The "-n" command-line option should really run in "ADVANCE_MODE" rather than "CAL_MODE" internally; otherwise, the substitution sequences may be misinterpreted. - BUG FIX: A typo in clearing out MD5 sum context has been fixed. - BUG FIX: Typo in Spanish translation was fixed. --- pkgs/tools/misc/remind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 18137312a3d..574178222c6 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.13"; + name = "remind-3.1.14"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz; - sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz; + sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a"; }; meta = { From f4dce11c19783d73e18b55c10c556da9341a4fca Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Mon, 8 Jun 2015 10:56:00 +0100 Subject: [PATCH 132/412] Major update to vips and nip2 to 8.0.2, changes: - Much better conversion to greyscale - More efficient use of file descriptors - Rewritten TIFF pyramid creator - Removed old stuff See http://libvips.blogspot.co.uk/2015/05/whats-new-in-80.html and https://github.com/jcupitt/libvips/blob/master/ChangeLog --- pkgs/tools/graphics/nip2/default.nix | 4 ++-- pkgs/tools/graphics/vips/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 81222cde2ed..e61488e202d 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -2,11 +2,11 @@ fftw, gsl, goffice_0_8, libgsf }: stdenv.mkDerivation rec { - name = "nip2-7.42.1"; + name = "nip2-8.0"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "14lfyn0azswrz8r81ign9lbpxzk7ibmnnp03a3l8wgxvm2j9a7jl"; + sha256 = "10ybac0qrz63x1yk1d0gpv9z1vzpadyii2qhrai6lllplzw6jqx7"; }; buildInputs = diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 28b65da24a5..a411080c390 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "vips-7.42.1"; + name = "vips-8.0.2"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "1gvazsyfa8w9wdwz89rpa1xmfpyk3b0cp4kkila1r9jc3sqp5qjy"; + sha256 = "0fpshv71sxbkbycxgd2hvwn7fyq9rm0rsgq0b1zld1an88mi0v8y"; }; buildInputs = From 98d5b81dadcb7ee6156910ac460a5a30f8f535fe Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 16:02:44 +0200 Subject: [PATCH 133/412] nixos: add grafana module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/grafana.nix | 335 ++++++++++++++++++ 3 files changed, 338 insertions(+) create mode 100644 nixos/modules/services/monitoring/grafana.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cc1976e236b..280e8d7238b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -217,6 +217,7 @@ asterisk = 192; plex = 193; bird = 195; + grafana = 196; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -412,6 +413,7 @@ plex = 193; sabnzbd = 194; bird = 195; + #grafana = 196; #unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d7b8b34aefe..6225c568dfc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -225,6 +225,7 @@ ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/dd-agent.nix + ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix new file mode 100644 index 00000000000..ef0cc68a535 --- /dev/null +++ b/nixos/modules/services/monitoring/grafana.nix @@ -0,0 +1,335 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.grafana; + + b2s = val: if val then "true" else "false"; + + cfgFile = pkgs.writeText "grafana.ini" '' + app_name = grafana + app_mode = production + + [server] + ; protocol (http or https) + protocol = ${cfg.protocol} + ; the ip address to bind to, empty will bind to all interfaces + http_addr = ${cfg.addr} + ; the http port to use + http_port = ${toString cfg.port} + ; The public facing domain name used to access grafana from a browser + domain = ${cfg.domain} + ; the full public facing url + root_url = ${cfg.rootUrl} + router_logging = false + ; the path relative to the binary where the static (html/js/css) files are placed + static_root_path = ${cfg.staticRootPath} + ; enable gzip + enable_gzip = false + ; https certs & key file + cert_file = ${cfg.certFile} + cert_key = ${cfg.certKey} + + [analytics] + # Server reporting, sends usage counters to stats.grafana.org every 24 hours. + # No ip addresses are being tracked, only simple counters to track + # running instances, dashboard and error counts. It is very helpful to us. + # Change this option to false to disable reporting. + reporting_enabled = true + ; Google Analytics universal tracking code, only enabled if you specify an id here + google_analytics_ua_id = + + [database] + ; Either "mysql", "postgres" or "sqlite3", it's your choice + type = ${cfg.database.type} + host = ${cfg.database.host} + name = ${cfg.database.name} + user = ${cfg.database.user} + password = ${cfg.database.password} + ; For "postgres" only, either "disable", "require" or "verify-full" + ssl_mode = disable + ; For "sqlite3" only + path = ${cfg.database.path} + + [session] + ; Either "memory", "file", "redis", "mysql", default is "memory" + provider = file + ; Provider config options + ; memory: not have any config yet + ; file: session file path, e.g. `data/sessions` + ; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` + ; mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` + provider_config = data/sessions + ; Session cookie name + cookie_name = grafana_sess + ; If you use session in https only, default is false + cookie_secure = false + ; Session life time, default is 86400 + session_life_time = 86400 + ; session id hash func, Either "sha1", "sha256" or "md5" default is sha1 + session_id_hashfunc = sha1 + ; Session hash key, default is use random string + session_id_hashkey = + + [security] + ; default admin user, created on startup + admin_user = ${cfg.security.adminUser} + ; default admin password, can be changed before first start of grafana, or in profile settings + admin_password = ${cfg.security.adminPassword} + ; used for signing + secret_key = ${cfg.security.secretKey} + ; Auto-login remember days + login_remember_days = 7 + cookie_username = grafana_user + cookie_remember_name = grafana_remember + + [users] + ; disable user signup / registration + allow_sign_up = ${b2s cfg.users.allowSignUp} + ; Allow non admin users to create organizations + allow_org_create = ${b2s cfg.users.allowOrgCreate} + # Set to true to automatically assign new users to the default organization (id 1) + auto_assign_org = ${b2s cfg.users.autoAssignOrg} + ; Default role new users will be automatically assigned (if disabled above is set to true) + auto_assign_org_role = ${cfg.users.autoAssignOrgRole} + + [auth.anonymous] + ; enable anonymous access + enabled = ${b2s cfg.auth.anonymous.enable} + ; specify organization name that should be used for unauthenticated users + org_name = Main Org. + ; specify role for unauthenticated users + org_role = Viewer + + [auth.github] + enabled = false + client_id = some_id + client_secret = some_secret + scopes = user:email + auth_url = https://github.com/login/oauth/authorize + token_url = https://github.com/login/oauth/access_token + + [auth.google] + enabled = false + client_id = some_client_id + client_secret = some_client_secret + scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email + auth_url = https://accounts.google.com/o/oauth2/auth + token_url = https://accounts.google.com/o/oauth2/token + + [log] + root_path = data/log + ; Either "console", "file", default is "console" + ; Use comma to separate multiple modes, e.g. "console, file" + mode = console + ; Buffer length of channel, keep it as it is if you don't know what it is. + buffer_len = 10000 + ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" + level = Info + + ; For "console" mode only + [log.console] + level = + + ; For "file" mode only + [log.file] + level = + ; This enables automated log rotate(switch of following options), default is true + log_rotate = true + ; Max line number of single file, default is 1000000 + max_lines = 1000000 + ; Max size shift of single file, default is 28 means 1 << 28, 256MB + max_lines_shift = 28 + ; Segment log daily, default is true + daily_rotate = true + ; Expired days of log file(delete after max days), default is 7 + max_days = 7 + + [event_publisher] + enabled = false + rabbitmq_url = amqp://localhost/ + exchange = grafana_events + ''; + +in { + options.services.grafana = { + enable = mkEnableOption "Whether to enable grafana."; + + protocol = mkOption { + description = "Which protocol to listen."; + default = "http"; + type = types.enum ["http" "https"]; + }; + + addr = mkOption { + description = "Listening address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Listening port."; + default = 3000; + type = types.int; + }; + + domain = mkOption { + description = "The public facing domain name used to access grafana from a browser."; + default = "localhost"; + type = types.str; + }; + + rootUrl = mkOption { + description = "Full public facing url."; + default = "%(protocol)s://%(domain)s:%(http_port)s/"; + type = types.str; + }; + + certFile = mkOption { + description = "Cert file for ssl."; + default = ""; + type = types.str; + }; + + certKey = mkOption { + description = "Cert key for ssl."; + default = ""; + type = types.str; + }; + + staticRootPath = mkOption { + description = "Root path for static assets."; + default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public"; + type = types.str; + }; + + package = mkOption { + description = "Package to use."; + default = pkgs.goPackages.grafana; + type = types.package; + }; + + dataDir = mkOption { + description = "Data directory."; + default = "/var/lib/grafana"; + type = types.path; + }; + + database = { + type = mkOption { + description = "Database type."; + default = "sqlite3"; + type = types.enum ["mysql" "sqlite3" "postgresql"]; + }; + + host = mkOption { + description = "Database host."; + default = "127.0.0.1:3306"; + type = types.str; + }; + + name = mkOption { + description = "Database name."; + default = "grafana"; + type = types.str; + }; + + user = mkOption { + description = "Database user."; + default = "root"; + type = types.str; + }; + + password = mkOption { + description = "Database password."; + default = ""; + type = types.str; + }; + + path = mkOption { + description = "Database path."; + default = "${cfg.dataDir}/data/grafana.db"; + type = types.path; + }; + }; + + security = { + adminUser = mkOption { + description = "Default admin username."; + default = "admin"; + type = types.str; + }; + + adminPassword = mkOption { + description = "Default admin password."; + default = "admin"; + type = types.str; + }; + + secretKey = mkOption { + description = "Secret key used for signing."; + default = "SW2YcwTIb9zpOOhoPsMm"; + type = types.str; + }; + }; + + users = { + allowSignUp = mkOption { + description = "Disable user signup / registration"; + default = false; + type = types.bool; + }; + + allowOrgCreate = mkOption { + description = "Whether user is allowed to create organizations."; + default = false; + type = types.bool; + }; + + autoAssignOrg = mkOption { + description = "Whether to automatically assign new users to default org."; + default = true; + type = types.bool; + }; + + autoAssignOrgRole = mkOption { + description = "Default role new users will be auto assigned."; + default = "Viewer"; + type = types.enum ["Viewer" "Editor"]; + }; + }; + + auth.anonymous = { + enable = mkOption { + description = "Whether to allow anonymous access"; + default = false; + type = types.bool; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = [ + "Grafana passwords will be stored as plaintext in nix store!" + ]; + + systemd.services.grafana = { + description = "Grafana Service Daemon"; + wantedBy = ["multi-user.target"]; + after = ["networking.target"]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web"; + WorkingDirectory = cfg.dataDir; + User = "grafana"; + }; + }; + + users.extraUsers.grafana = { + uid = config.ids.uids.grafana; + description = "Grafana user"; + home = cfg.dataDir; + createHome = true; + }; + }; +} From eac4f2aa313466855843143571879d61061571c9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 12:16:34 +0200 Subject: [PATCH 134/412] calibre: update from 2.29.0 to 2.30.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e821e92703..b5dbfe207fe 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.29.0"; + name = "calibre-2.30.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l"; + sha256 = "1k2rpn06nfzqjy5k6fh8pwfj8vbhpn7rgkpkkpz5n2fqg3z8ph1j"; }; inherit python; From ef1c9cdeef21c2c1b11931182662f644701367f1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 12:29:53 +0200 Subject: [PATCH 135/412] llpp: update to HEAD --- pkgs/applications/misc/llpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index bbae8aca2b8..601ffe25200 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,12 +4,12 @@ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2015-04-27"; + version = "21-git-2015-06-06"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "66868744188151eaa433d42c807e1efc5f623aa4"; - sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c"; + rev = "492d761c0c7c8c4ccdd4f0d3fa7c51434ce8acf2"; + sha256 = "14dp5sw7cd6bja9d3zpxmswbk0k0b7x2fzb1fflhnnnhjc39irk9"; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl From 9f7d7adb052ceed89d817b46facbe7c192e36ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 8 Jun 2015 11:22:36 +0200 Subject: [PATCH 136/412] Revert "kmod-blacklist-ubuntu: update to Vivid" This reverts commit 0307c27219ba43cc0a78cd370f825deca16eeaa2. The only change was blacklisting bochs-drm, but that breaks our VM setup and I don't see a good reason to do that on the Ubuntu issue (just some PowerPC failure). Defaulting to qxl driver might be better anyway, but I'm not venturing such changes now. --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index b894908eb13..c750006fcd2 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gnugrep, findutils }: let - version = "18-3ubuntu1"; # Vivid + version = "3ubuntu1"; # Saucy in stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; - sha256 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; + sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; }; installPhase = '' From 6ceecb5548f67640efe9fb350789d206a30ea01a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 12:54:29 +0200 Subject: [PATCH 137/412] zsh: update from 5.0.7 to 5.0.8 add myself as maintainer --- pkgs/shells/zsh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index ada34030034..b755d28c851 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.7"; + version = "5.0.8"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23"; + sha256 = "0h4y6f0fjb1lf83j4cixl0h5jgyy5q7y1iw7w33flp7s8y60ir8f"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl"; + sha256 = "08vxw74v8cx6hcynz0cdf7s2z5p6nqmxfsxmhhpz5vwbrc4cyyc0"; }; buildInputs = [ ncurses coreutils pcre ]; @@ -69,7 +69,7 @@ EOF ''; license = "MIT-like"; homepage = "http://www.zsh.org/"; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; }; } From 392fc849e41e4d9175c185bac4a8fa480bf832b2 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 13:10:32 +0200 Subject: [PATCH 138/412] Update kubernetes to 0.18.0, fix module --- nixos/modules/services/cluster/kubernetes.nix | 49 +++++++++---------- .../networking/cluster/kubernetes/default.nix | 12 +++-- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 6a775bb159f..8362589f155 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -343,26 +343,25 @@ in { (concatImapStringsSep "\n" (i: v: v + "," + (toString i)) (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth)); in ''${cfg.package}/bin/kube-apiserver \ - --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - --address=${cfg.apiserver.address} \ - --port=${toString cfg.apiserver.port} \ - --read_only_port=${toString cfg.apiserver.readOnlyPort} \ - --public_address_override=${cfg.apiserver.publicAddress} \ - --allow_privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ + --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ + --insecure-bind-address=${cfg.apiserver.address} \ + --insecure-port=${toString cfg.apiserver.port} \ + --read-only-port=${toString cfg.apiserver.readOnlyPort} \ + --bind-address=${cfg.apiserver.publicAddress} \ + --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ ${optionalString (cfg.apiserver.tlsCertFile!="") - "--tls_cert_file=${cfg.apiserver.tlsCertFile}"} \ + "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="") - "--tls_private_key_file=${cfg.apiserver.tlsPrivateKeyFile}"} \ + "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \ ${optionalString (cfg.apiserver.tokenAuth!=[]) - "--token_auth_file=${tokenAuthFile}"} \ - --authorization_mode=${cfg.apiserver.authorizationMode} \ + "--token-auth-file=${tokenAuthFile}"} \ + --authorization-mode=${cfg.apiserver.authorizationMode} \ ${optionalString (cfg.apiserver.authorizationMode == "ABAC") - "--authorization_policy_file=${authorizationPolicyFile}"} \ - --secure_port=${toString cfg.apiserver.securePort} \ - --portal_net=${cfg.apiserver.portalNet} \ + "--authorization-policy-file=${authorizationPolicyFile}"} \ + --secure-port=${toString cfg.apiserver.securePort} \ + --service-cluster-ip-range=${cfg.apiserver.portalNet} \ --logtostderr=true \ - --runtime_config=api/v1beta3 \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; User = "kubernetes"; @@ -386,7 +385,7 @@ in { --port=${toString cfg.scheduler.port} \ --master=${cfg.scheduler.master} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.scheduler.extraOpts} ''; User = "kubernetes"; @@ -406,7 +405,7 @@ in { --master=${cfg.controllerManager.master} \ --machines=${concatStringsSep "," cfg.controllerManager.machines} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.controllerManager.extraOpts} ''; User = "kubernetes"; @@ -423,17 +422,17 @@ in { script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" exec ${cfg.package}/bin/kubelet \ - --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ + --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ - --hostname_override=${cfg.kubelet.hostname} \ - --allow_privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ - --root_dir=${cfg.dataDir} \ + --hostname-override=${cfg.kubelet.hostname} \ + --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ + --root-dir=${cfg.dataDir} \ --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ ${optionalString (cfg.kubelet.clusterDns != "") - ''--cluster_dns=${cfg.kubelet.clusterDns}''} \ + ''--cluster-dns=${cfg.kubelet.clusterDns}''} \ ${optionalString (cfg.kubelet.clusterDomain != "") - ''--cluster_domain=${cfg.kubelet.clusterDomain}''} \ + ''--cluster-domain=${cfg.kubelet.clusterDomain}''} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.kubelet.extraOpts} @@ -450,9 +449,9 @@ in { serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ --master=${cfg.proxy.master} \ - --bind_address=${cfg.proxy.address} \ + --bind-address=${cfg.proxy.address} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.proxy.extraOpts} ''; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index fbfe4de23b8..a096d43b11c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,27 +2,33 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; + sha256 = "1adbd5n2fs1278f6kz6pd23813w2k4pgcxjl21idflh8jafxsyj7"; }; buildInputs = [ makeWrapper which go iptables rsync ]; buildPhase = '' + GOPATH=$(pwd):$(pwd)/Godeps/_workspace + mkdir -p $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform + ln -s $(pwd) $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" - GOPATH=$(pwd) patchShebangs ./hack hack/build-go.sh --use_go_build + + (cd cluster/addons/dns/kube2sky && go build ./kube2sky.go) ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" + cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/" ''; preFixup = '' From f7a452c8c14ca4f9c384482eec89e7a758310352 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 13:15:26 +0200 Subject: [PATCH 139/412] nixos/kubernetes: skydns integration --- nixos/modules/services/cluster/kubernetes.nix | 57 +++++++++++++++++-- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 8362589f155..a7f4ec7b008 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -286,7 +286,7 @@ in { clusterDomain = mkOption { description = "Use alternative domain."; - default = ""; + default = "kubernetes.io"; type = types.str; }; @@ -322,13 +322,35 @@ in { type = types.str; }; }; + + kube2sky = { + enable = mkEnableOption "Whether to enable kube2sky dns service."; + + domain = mkOption { + description = "Kuberntes kube2sky domain under which all DNS names will be hosted."; + default = cfg.kubelet.clusterDomain; + type = types.str; + }; + + master = mkOption { + description = "Kubernetes apiserver address"; + default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + + extraOpts = mkOption { + description = "Kubernetes kube2sky extra command line options."; + default = ""; + type = types.str; + }; + }; }; ###### implementation config = mkMerge [ (mkIf cfg.apiserver.enable { - systemd.services.kubernetes-apiserver = { + systemd.services.kube-apiserver = { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; @@ -375,7 +397,7 @@ in { }) (mkIf cfg.scheduler.enable { - systemd.services.kubernetes-scheduler = { + systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; @@ -394,7 +416,7 @@ in { }) (mkIf cfg.controllerManager.enable { - systemd.services.kubernetes-controller-manager = { + systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; @@ -414,7 +436,7 @@ in { }) (mkIf cfg.kubelet.enable { - systemd.services.kubernetes-kubelet = { + systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; @@ -442,7 +464,7 @@ in { }) (mkIf cfg.proxy.enable { - systemd.services.kubernetes-proxy = { + systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "etcd.service" ]; @@ -458,10 +480,33 @@ in { }; }) + (mkIf cfg.kube2sky.enable { + systemd.services.kube2sky = { + description = "Kubernetes Dns Bridge Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "skydns.service" "etcd.service" "kubernetes-apiserver.service" ]; + serviceConfig = { + ExecStart = ''${cfg.package}/bin/kube2sky \ + -etcd-server=http://${head cfg.etcdServers} \ + -domain=${cfg.kube2sky.domain} \ + -kube_master_url=http://${cfg.kube2sky.master} \ + -logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ + ${cfg.kube2sky.extraOpts} + ''; + User = "kubernetes"; + }; + }; + + services.skydns.enable = mkDefault true; + services.skydns.domain = mkDefault cfg.kubelet.clusterDomain; + }) + (mkIf (any (el: el == "master") cfg.roles) { services.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true; + services.kubernetes.kube2sky.enable = mkDefault true; }) (mkIf (any (el: el == "node") cfg.roles) { From 9cd6786acb2091a59b3647543cbb1197693b28f9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 13:21:58 +0200 Subject: [PATCH 140/412] elasticsearch: update from 1.4.4 to 1.4.5, potenially fixes CVE-2015-3337 --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 635934db23c..be30e12258b 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.4.4"; + name = "elasticsearch-1.4.5"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "11l57r0pnx20v6zy047lw5zgq9r3w95k1smsvrj0clk89r3qs5d3"; + sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w"; }; patches = [ ./es-home.patch ]; From 8895716869e49f0a9d370e73d40a0df71010b154 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 13:28:25 +0200 Subject: [PATCH 141/412] zeromq: update from 4.0.5 to 4.0.6, fixes CVE-2014-9721 --- pkgs/development/libraries/zeromq/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index eaa719b92c9..744703adb24 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "zeromq-4.0.5"; + name = "zeromq-4.0.6"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v"; + sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj91"; }; buildInputs = [ libuuid ]; From 23504e5bf20d5df882c7ea9199299967be02ec10 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 13:36:05 +0200 Subject: [PATCH 142/412] Add skydns module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/skydns.nix | 91 ++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 nixos/modules/services/networking/skydns.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 280e8d7238b..5b4cb54517c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -218,6 +218,7 @@ plex = 193; bird = 195; grafana = 196; + skydns = 197; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -414,6 +415,7 @@ sabnzbd = 194; bird = 195; #grafana = 196; #unused + #skydns = 197; #unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6225c568dfc..fa39a5d9432 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -318,6 +318,7 @@ ./services/networking/sabnzbd.nix ./services/networking/searx.nix ./services/networking/seeks.nix + ./services/networking/skydns.nix ./services/networking/spiped.nix ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix new file mode 100644 index 00000000000..2d0129d6310 --- /dev/null +++ b/nixos/modules/services/networking/skydns.nix @@ -0,0 +1,91 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.skydns; + +in { + options.services.skydns = { + enable = mkEnableOption "Whether to enable skydns service."; + + etcd = { + machines = mkOption { + default = [ "http://localhost:4001" ]; + type = types.listOf types.str; + description = "Skydns list of etcd endpoints to connect to."; + }; + + tlsKey = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS client certificate - private key."; + }; + + tlsPem = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS client certificate - public key."; + }; + + caCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS certificate authority public key."; + }; + }; + + address = mkOption { + default = "0.0.0.0:53"; + type = types.str; + description = "Skydns address to bind to."; + }; + + domain = mkOption { + default = "skydns.local."; + type = types.str; + description = "Skydns default domain if not specified by etcd config."; + }; + + nameservers = mkOption { + default = map (n: n + ":53") config.networking.nameservers; + type = types.listOf types.str; + description = "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain."; + example = ["8.8.8.8:53" "8.8.4.4:53"]; + }; + + package = mkOption { + default = pkgs.goPackages.skydns; + type = types.package; + description = "Skydns package to use."; + }; + + extraConfig = mkOption { + default = {}; + type = types.attrsOf types.str; + description = "Skydns attribute set of extra config options passed as environemnt variables."; + }; + }; + + config = mkIf (cfg.enable) { + systemd.services.skydns = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "etcd.service" ]; + description = "Skydns Service"; + environment = { + ETCD_MACHINES = concatStringsSep "," cfg.etcd.machines; + ETCD_TLSKEY = cfg.etcd.tlsKey; + ETCD_TLSPEM = cfg.etcd.tlsPem; + ETCD_CACERT = cfg.etcd.caCert; + SKYDNS_ADDR = cfg.address; + SKYDNS_DOMAIN = cfg.domain; + SKYDNS_NAMESERVER = concatStringsSep "," cfg.nameservers; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/skydns"; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} From c9da002a07a835bef8b6e7e3eeeb5f4a85b39ba3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 13:41:43 +0200 Subject: [PATCH 143/412] nixos/consul: fix consul alerts enable --- nixos/modules/services/networking/consul.nix | 189 ++++++++++--------- 1 file changed, 100 insertions(+), 89 deletions(-) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 53a9f462625..31bae628050 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -106,6 +106,12 @@ in alerts = { enable = mkEnableOption "Whether to enable consul-alerts"; + package = mkOption { + description = "Package to use for consul-alerts."; + default = pkgs.consul-alerts; + type = types.package; + }; + listenAddr = mkOption { description = "Api listening address."; default = "localhost:9000"; @@ -135,96 +141,101 @@ in }; - config = mkIf cfg.enable { + config = mkIf cfg.enable ( + mkMerge [{ - users.extraUsers."consul" = { - description = "Consul agent daemon user"; - uid = config.ids.uids.consul; - # The shell is needed for health checks - shell = "/run/current-system/sw/bin/bash"; - }; - - environment = { - etc."consul.json".text = builtins.toJSON configOptions; - # We need consul.d to exist for consul to start - etc."consul.d/dummy.json".text = "{ }"; - systemPackages = with pkgs; [ consul ]; - }; - - systemd.services.consul = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ] ++ systemdDevices; - bindsTo = systemdDevices; - restartTriggers = [ config.environment.etc."consul.json".source ] - ++ mapAttrsToList (_: d: d.source) - (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); - - serviceConfig = { - ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" - + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecReload = "${pkgs.consul}/bin/consul reload"; - PermissionsStartOnly = true; - User = if cfg.dropPrivileges then "consul" else null; - TimeoutStartSec = "0"; - } // (optionalAttrs (cfg.leaveOnStop) { - ExecStop = "${pkgs.consul}/bin/consul leave"; - }); - - path = with pkgs; [ iproute gnugrep gawk consul ]; - preStart = '' - mkdir -m 0700 -p ${dataDir} - chown -R consul ${dataDir} - - # Determine interface addresses - getAddrOnce () { - ip addr show dev "$1" \ - | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \ - | awk -F '[ /\t]*' '{print $3}' | head -n 1 - } - getAddr () { - ADDR="$(getAddrOnce $1)" - LEFT=60 # Die after 1 minute - while [ -z "$ADDR" ]; do - sleep 1 - LEFT=$(expr $LEFT - 1) - if [ "$LEFT" -eq "0" ]; then - echo "Address lookup timed out" - exit 1 - fi - ADDR="$(getAddrOnce $1)" - done - echo "$ADDR" - } - echo "{" > /etc/consul-addrs.json - delim=" " - '' - + concatStrings (flip mapAttrsToList cfg.interface (name: i: - optionalString (i != null) '' - echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json - delim="," - '')) - + '' - echo "}" >> /etc/consul-addrs.json - ''; - }; - - 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; + users.extraUsers."consul" = { + description = "Consul agent daemon user"; + uid = config.ids.uids.consul; + # The shell is needed for health checks + shell = "/run/current-system/sw/bin/bash"; }; - }; - }; + environment = { + etc."consul.json".text = builtins.toJSON configOptions; + # We need consul.d to exist for consul to start + etc."consul.d/dummy.json".text = "{ }"; + systemPackages = with pkgs; [ consul ]; + }; + + systemd.services.consul = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] ++ systemdDevices; + bindsTo = systemdDevices; + restartTriggers = [ config.environment.etc."consul.json".source ] + ++ mapAttrsToList (_: d: d.source) + (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); + + serviceConfig = { + ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" + + concatMapStrings (n: " -config-file ${n}") configFiles; + ExecReload = "${pkgs.consul}/bin/consul reload"; + PermissionsStartOnly = true; + User = if cfg.dropPrivileges then "consul" else null; + TimeoutStartSec = "0"; + } // (optionalAttrs (cfg.leaveOnStop) { + ExecStop = "${pkgs.consul}/bin/consul leave"; + }); + + path = with pkgs; [ iproute gnugrep gawk consul ]; + preStart = '' + mkdir -m 0700 -p ${dataDir} + chown -R consul ${dataDir} + + # Determine interface addresses + getAddrOnce () { + ip addr show dev "$1" \ + | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \ + | awk -F '[ /\t]*' '{print $3}' | head -n 1 + } + getAddr () { + ADDR="$(getAddrOnce $1)" + LEFT=60 # Die after 1 minute + while [ -z "$ADDR" ]; do + sleep 1 + LEFT=$(expr $LEFT - 1) + if [ "$LEFT" -eq "0" ]; then + echo "Address lookup timed out" + exit 1 + fi + ADDR="$(getAddrOnce $1)" + done + echo "$ADDR" + } + echo "{" > /etc/consul-addrs.json + delim=" " + '' + + concatStrings (flip mapAttrsToList cfg.interface (name: i: + optionalString (i != null) '' + echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json + delim="," + '')) + + '' + echo "}" >> /etc/consul-addrs.json + ''; + }; + } + + (mkIf (cfg.alerts.enable) { + systemd.services.consul-alerts = { + wantedBy = [ "multi-user.target" ]; + after = [ "consul.service" ]; + + path = [ pkgs.consul ]; + + serviceConfig = { + ExecStart = '' + ${cfg.alerts.package}/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; + Restart = "on-failure"; + }; + }; + }) + + ]); } From 2e5dbc474637e092392b376be0c64a37dfc1cc99 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 12:58:33 +0200 Subject: [PATCH 144/412] Add ripple rest module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/ripple-rest.nix | 110 + pkgs/servers/rippled/package.nix | 4912 +++++++++++++------ pkgs/servers/rippled/ripple-rest.nix | 26 + 5 files changed, 3655 insertions(+), 1396 deletions(-) create mode 100644 nixos/modules/services/misc/ripple-rest.nix create mode 100644 pkgs/servers/rippled/ripple-rest.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5b4cb54517c..d283a633734 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -219,6 +219,7 @@ bird = 195; grafana = 196; skydns = 197; + ripple-rest = 198; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -416,6 +417,7 @@ bird = 195; #grafana = 196; #unused #skydns = 197; #unused + #ripple-rest = 198; #unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fa39a5d9432..d33d3ca91d4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -212,6 +212,7 @@ ./services/misc/plex.nix ./services/misc/redmine.nix ./services/misc/rippled.nix + ./services/misc/ripple-rest.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix new file mode 100644 index 00000000000..dc07ee132fa --- /dev/null +++ b/nixos/modules/services/misc/ripple-rest.nix @@ -0,0 +1,110 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.rippleRest; + + configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON { + config_version = "2.0.3"; + debug = cfg.debug; + port = cfg.port; + host = cfg.host; + ssl_enabled = cfg.ssl.enable; + ssl = { + key_path = cfg.ssl.keyPath; + cert_path = cfg.ssl.certPath; + reject_unathorized = cfg.ssl.rejectUnathorized; + }; + db_path = cfg.dbPath; + max_transaction_fee = cfg.maxTransactionFee; + rippled_servers = cfg.rippleds; + }); + +in { + options.services.rippleRest = { + enable = mkEnableOption "Whether to enable ripple rest."; + + debug = mkEnableOption "Wheter to enable debug for ripple-rest."; + + host = mkOption { + description = "Ripple rest host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple rest port."; + default = 5990; + type = types.int; + }; + + ssl = { + enable = mkEnableOption "Whether to enable ssl."; + + keyPath = mkOption { + description = "Path to the ripple rest key file."; + default = null; + type = types.nullOr types.path; + }; + + + certPath = mkOption { + description = "Path to the ripple rest cert file."; + default = null; + type = types.nullOr types.path; + }; + + rejectUnathorized = mkOption { + description = "Whether to reject unatohroized."; + default = true; + type = types.bool; + }; + }; + + dbPath = mkOption { + description = "Ripple rest database path."; + default = "${cfg.dataDir}/ripple-rest.db"; + type = types.path; + }; + + maxTransactionFee = mkOption { + description = "Ripple rest max transaction fee."; + default = 1000000; + type = types.int; + }; + + rippleds = mkOption { + description = "List of rippled servers."; + default = [ + "wss://s1.ripple.com:443" + ]; + type = types.listOf types.str; + }; + + dataDir = mkOption { + description = "Ripple rest data directory."; + default = "/var/lib/ripple-rest"; + type = types.path; + }; + }; + + config = mkIf (cfg.enable) { + systemd.services.ripple-rest = { + wantedBy = [ "multi-user.target"]; + after = ["network.target" ]; + environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules"; + serviceConfig = { + ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}"; + User = "ripple-rest"; + }; + }; + + users.extraUsers.postgres = { + name = "ripple-rest"; + uid = config.ids.uids.ripple-rest; + createHome = true; + home = cfg.dataDir; + }; + }; +} diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index fd318c979fe..6f5bb1d3a71 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,20 +1,226 @@ { self, fetchurl, fetchgit ? null, lib }: { - by-spec."accepts"."~1.2.5" = - self.by-version."accepts"."1.2.5"; - by-version."accepts"."1.2.5" = self.buildNodePackage { - name = "accepts-1.2.5"; - version = "1.2.5"; + by-spec."abbrev"."1" = + self.by-version."abbrev"."1.0.5"; + by-version."abbrev"."1.0.5" = self.buildNodePackage { + name = "abbrev-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz"; - name = "accepts-1.2.5.tgz"; - sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9"; + url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; + name = "abbrev-1.0.5.tgz"; + sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; }; deps = { - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."abbrev"."1.0.x" = + self.by-version."abbrev"."1.0.5"; + by-spec."accepts"."~1.2.5" = + self.by-version."accepts"."1.2.7"; + by-version."accepts"."1.2.7" = self.buildNodePackage { + name = "accepts-1.2.7"; + version = "1.2.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; + name = "accepts-1.2.7.tgz"; + sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; + }; + deps = { + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."accepts"."~1.2.7" = + self.by-version."accepts"."1.2.7"; + by-spec."amdefine".">=0.0.4" = + self.by-version."amdefine"."0.1.0"; + by-version."amdefine"."0.1.0" = self.buildNodePackage { + name = "amdefine-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + name = "amdefine-0.1.0.tgz"; + sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi"."^0.3.0" = + self.by-version."ansi"."0.3.0"; + by-version."ansi"."0.3.0" = self.buildNodePackage { + name = "ansi-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; + name = "ansi-0.3.0.tgz"; + sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi"."~0.3.0" = + self.by-version."ansi"."0.3.0"; + by-spec."ansi-regex"."^0.2.0" = + self.by-version."ansi-regex"."0.2.1"; + by-version."ansi-regex"."0.2.1" = self.buildNodePackage { + name = "ansi-regex-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + name = "ansi-regex-0.2.1.tgz"; + sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^0.2.1" = + self.by-version."ansi-regex"."0.2.1"; + by-spec."ansi-regex"."^1.0.0" = + self.by-version."ansi-regex"."1.1.1"; + by-version."ansi-regex"."1.1.1" = self.buildNodePackage { + name = "ansi-regex-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + name = "ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^1.1.0" = + self.by-version."ansi-regex"."1.1.1"; + by-spec."ansi-styles"."^1.1.0" = + self.by-version."ansi-styles"."1.1.0"; + by-version."ansi-styles"."1.1.0" = self.buildNodePackage { + name = "ansi-styles-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + name = "ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-styles"."^2.0.1" = + self.by-version."ansi-styles"."2.0.1"; + by-version."ansi-styles"."2.0.1" = self.buildNodePackage { + name = "ansi-styles-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"; + name = "ansi-styles-2.0.1.tgz"; + sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."are-we-there-yet"."~1.0.0" = + self.by-version."are-we-there-yet"."1.0.4"; + by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage { + name = "are-we-there-yet-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"; + name = "are-we-there-yet-1.0.4.tgz"; + sha1 = "527fe389f7bcba90806106b99244eaa07e886f85"; + }; + deps = { + "delegates-0.1.0" = self.by-version."delegates"."0.1.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~ 0.1.11" = + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = self.buildNodePackage { + name = "argparse-0.1.16"; + version = "0.1.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }; + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~1.0.2" = + self.by-version."argparse"."1.0.2"; + by-version."argparse"."1.0.2" = self.buildNodePackage { + name = "argparse-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz"; + name = "argparse-1.0.2.tgz"; + sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136"; + }; + deps = { + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2"; }; optionalDependencies = { }; @@ -41,6 +247,47 @@ os = [ ]; cpu = [ ]; }; + by-spec."assert-diff"."^0.0.4" = + self.by-version."assert-diff"."0.0.4"; + by-version."assert-diff"."0.0.4" = self.buildNodePackage { + name = "assert-diff-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-diff/-/assert-diff-0.0.4.tgz"; + name = "assert-diff-0.0.4.tgz"; + sha1 = "bf181c1575d5ad7c73df8076a689f4ae19951608"; + }; + deps = { + "assert-plus-0.1.4" = self.by-version."assert-plus"."0.1.4"; + "json-diff-0.3.1" = self.by-version."json-diff"."0.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "assert-diff" = self.by-version."assert-diff"."0.0.4"; + by-spec."assert-plus"."0.1.4" = + self.by-version."assert-plus"."0.1.4"; + by-version."assert-plus"."0.1.4" = self.buildNodePackage { + name = "assert-plus-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.4.tgz"; + name = "assert-plus-0.1.4.tgz"; + sha1 = "283eff8b140ecd768529fbf3730a4c09ebec61f7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."assert-plus"."^0.1.5" = self.by-version."assert-plus"."0.1.5"; by-version."assert-plus"."0.1.5" = self.buildNodePackage { @@ -60,16 +307,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."async"."0.2.x" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; + by-spec."assertion-error"."1.0.0" = + self.by-version."assertion-error"."1.0.0"; + by-version."assertion-error"."1.0.0" = self.buildNodePackage { + name = "assertion-error-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; + name = "assertion-error-1.0.0.tgz"; + sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; }; deps = { }; @@ -79,14 +326,26 @@ os = [ ]; cpu = [ ]; }; - by-spec."async"."^0.2.10" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.7" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = + by-spec."async"."0.2.9" = + self.by-version."async"."0.2.9"; + by-version."async"."0.2.9" = self.buildNodePackage { + name = "async-0.2.9"; + version = "0.2.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + name = "async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.9.x" = self.by-version."async"."0.9.0"; by-version."async"."0.9.0" = self.buildNodePackage { name = "async-0.9.0"; @@ -105,16 +364,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."aws-sign"."~0.2.0" = - self.by-version."aws-sign"."0.2.0"; - by-version."aws-sign"."0.2.0" = self.buildNodePackage { - name = "aws-sign-0.2.0"; - version = "0.2.0"; + by-spec."async"."^0.2.9" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; - name = "aws-sign-0.2.0.tgz"; - sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; deps = { }; @@ -124,6 +383,13 @@ os = [ ]; cpu = [ ]; }; + "async" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.6" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = self.buildNodePackage { @@ -143,16 +409,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."base64-url"."1.2.1" = - self.by-version."base64-url"."1.2.1"; - by-version."base64-url"."1.2.1" = self.buildNodePackage { - name = "base64-url-1.2.1"; - version = "1.2.1"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = self.buildNodePackage { + name = "balanced-match-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - name = "base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; }; deps = { }; @@ -162,16 +428,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."basic-auth"."1.0.0" = - self.by-version."basic-auth"."1.0.0"; - by-version."basic-auth"."1.0.0" = self.buildNodePackage { - name = "basic-auth-1.0.0"; - version = "1.0.0"; + by-spec."basic-auth"."~1.0.1" = + self.by-version."basic-auth"."1.0.1"; + by-version."basic-auth"."1.0.1" = self.buildNodePackage { + name = "basic-auth-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; - name = "basic-auth-1.0.0.tgz"; - sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637"; + url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.1.tgz"; + name = "basic-auth-1.0.1.tgz"; + sha1 = "4bae1dbfbf0aec4dc5dc47a8d3675b50140f3bf8"; }; deps = { }; @@ -181,16 +447,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."basic-auth-connect"."1.0.0" = - self.by-version."basic-auth-connect"."1.0.0"; - by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage { - name = "basic-auth-connect-1.0.0"; - version = "1.0.0"; + by-spec."bignumber.js"."^1.4.0" = + self.by-version."bignumber.js"."1.5.0"; + by-version."bignumber.js"."1.5.0" = self.buildNodePackage { + name = "bignumber.js-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - name = "basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz"; + name = "bignumber.js-1.5.0.tgz"; + sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d"; }; deps = { }; @@ -200,16 +466,17 @@ os = [ ]; cpu = [ ]; }; - by-spec."batch"."0.5.2" = - self.by-version."batch"."0.5.2"; - by-version."batch"."0.5.2" = self.buildNodePackage { - name = "batch-0.5.2"; - version = "0.5.2"; + "bignumber.js" = self.by-version."bignumber.js"."1.5.0"; + by-spec."bignumber.js"."^2.0.3" = + self.by-version."bignumber.js"."2.0.7"; + by-version."bignumber.js"."2.0.7" = self.buildNodePackage { + name = "bignumber.js-2.0.7"; + version = "2.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz"; - name = "batch-0.5.2.tgz"; - sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.7.tgz"; + name = "bignumber.js-2.0.7.tgz"; + sha1 = "86eb0707cf6a5110909d23e6ea7434c14f500f1c"; }; deps = { }; @@ -219,16 +486,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."bignumber.js"."^2.0.0" = - self.by-version."bignumber.js"."2.0.3"; - by-version."bignumber.js"."2.0.3" = self.buildNodePackage { - name = "bignumber.js-2.0.3"; - version = "2.0.3"; + by-spec."bignumber.js"."~1.4.0" = + self.by-version."bignumber.js"."1.4.1"; + by-version."bignumber.js"."1.4.1" = self.buildNodePackage { + name = "bignumber.js-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.3.tgz"; - name = "bignumber.js-2.0.3.tgz"; - sha1 = "1328f1d618f4bfe23587af73577a5a1e4f3cf105"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.4.1.tgz"; + name = "bignumber.js-1.4.1.tgz"; + sha1 = "3d19ac321f8db4ba07aace23ebd4ac976fae6bfa"; }; deps = { }; @@ -277,47 +544,71 @@ os = [ ]; cpu = [ ]; }; - by-spec."body-parser"."~1.12.2" = - self.by-version."body-parser"."1.12.2"; - by-version."body-parser"."1.12.2" = self.buildNodePackage { - name = "body-parser-1.12.2"; - version = "1.12.2"; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = self.buildNodePackage { + name = "block-stream-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.2.tgz"; - name = "body-parser-1.12.2.tgz"; - sha1 = "698368fb4dfc57a05bff1ddb1bebeba3bd2c0e87"; + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."^2.0.0" = + self.by-version."bluebird"."2.9.25"; + by-version."bluebird"."2.9.25" = self.buildNodePackage { + name = "bluebird-2.9.25"; + version = "2.9.25"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"; + name = "bluebird-2.9.25.tgz"; + sha1 = "6e36bd04064d9534c07160b9f7f26c5a738fe16a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."^2.3.4" = + self.by-version."bluebird"."2.9.25"; + "bluebird" = self.by-version."bluebird"."2.9.25"; + by-spec."bluebird"."^2.9.25" = + self.by-version."bluebird"."2.9.25"; + by-spec."body-parser"."^1.7.0" = + self.by-version."body-parser"."1.12.4"; + by-version."body-parser"."1.12.4" = self.buildNodePackage { + name = "body-parser-1.12.4"; + version = "1.12.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + name = "body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; deps = { "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - "qs-2.4.1" = self.by-version."qs"."2.4.1"; - "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3"; - "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."0.3.x" = - self.by-version."boom"."0.3.8"; - by-version."boom"."0.3.8" = self.buildNodePackage { - name = "boom-0.3.8"; - version = "0.3.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; - name = "boom-0.3.8.tgz"; - sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; - }; - deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; }; optionalDependencies = { }; @@ -325,6 +616,7 @@ os = [ ]; cpu = [ ]; }; + "body-parser" = self.by-version."body-parser"."1.12.4"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = self.buildNodePackage { @@ -346,18 +638,18 @@ cpu = [ ]; }; by-spec."boom"."2.x.x" = - self.by-version."boom"."2.6.1"; - by-version."boom"."2.6.1" = self.buildNodePackage { - name = "boom-2.6.1"; - version = "2.6.1"; + self.by-version."boom"."2.7.1"; + by-version."boom"."2.7.1" = self.buildNodePackage { + name = "boom-2.7.1"; + version = "2.7.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; - name = "boom-2.6.1.tgz"; - sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753"; + url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz"; + name = "boom-2.7.1.tgz"; + sha1 = "fb165c348d337977c61d4363c21e9e1abf526705"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; }; optionalDependencies = { }; @@ -365,18 +657,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."browser-request"."~0.3.0" = - self.by-version."browser-request"."0.3.3"; - by-version."browser-request"."0.3.3" = self.buildNodePackage { - name = "browser-request-0.3.3"; - version = "0.3.3"; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = self.buildNodePackage { + name = "brace-expansion-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; - name = "browser-request-0.3.3.tgz"; - sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; }; deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; }; optionalDependencies = { }; @@ -424,16 +718,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."caseless"."~0.6.0" = - self.by-version."caseless"."0.6.0"; - by-version."caseless"."0.6.0" = self.buildNodePackage { - name = "caseless-0.6.0"; - version = "0.6.0"; + by-spec."bytes"."2.0.1" = + self.by-version."bytes"."2.0.1"; + by-version."bytes"."2.0.1" = self.buildNodePackage { + name = "bytes-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - name = "caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; + name = "bytes-2.0.1.tgz"; + sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; }; deps = { }; @@ -462,18 +756,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."clone"."~0.1.11" = - self.by-version."clone"."0.1.19"; - by-version."clone"."0.1.19" = self.buildNodePackage { - name = "clone-0.1.19"; - version = "0.1.19"; + by-spec."chai".">=1.9.2 <3" = + self.by-version."chai"."2.3.0"; + by-version."chai"."2.3.0" = self.buildNodePackage { + name = "chai-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; - name = "clone-0.1.19.tgz"; - sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + url = "http://registry.npmjs.org/chai/-/chai-2.3.0.tgz"; + name = "chai-2.3.0.tgz"; + sha1 = "8a2f6a34748da801090fd73287b2aa739a4e909a"; }; deps = { + "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; + "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; }; optionalDependencies = { }; @@ -481,17 +777,106 @@ os = [ ]; cpu = [ ]; }; - "clone" = self.by-version."clone"."0.1.19"; - by-spec."colors"."0.6.x" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = self.buildNodePackage { - name = "colors-0.6.2"; - version = "0.6.2"; + by-spec."chai"."^1.10.0" = + self.by-version."chai"."1.10.0"; + by-version."chai"."1.10.0" = self.buildNodePackage { + name = "chai-1.10.0"; + version = "1.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz"; + name = "chai-1.10.0.tgz"; + sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9"; + }; + deps = { + "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; + "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "chai" = self.by-version."chai"."1.10.0"; + by-spec."chalk"."^1.0.0" = + self.by-version."chalk"."1.0.0"; + by-version."chalk"."1.0.0" = self.buildNodePackage { + name = "chalk-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + name = "chalk-1.0.0.tgz"; + sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; + }; + deps = { + "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; + "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3"; + "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; + "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chalk"."~0.5.1" = + self.by-version."chalk"."0.5.1"; + by-version."chalk"."0.5.1" = self.buildNodePackage { + name = "chalk-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + name = "chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + }; + deps = { + "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; + "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; + "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; + "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cli-color"."~0.1.6" = + self.by-version."cli-color"."0.1.7"; + by-version."cli-color"."0.1.7" = self.buildNodePackage { + name = "cli-color-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + name = "cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; + }; + deps = { + "es5-ext-0.8.2" = self.by-version."es5-ext"."0.8.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."colors"."1.0.x" = + self.by-version."colors"."1.0.3"; + by-version."colors"."1.0.3" = self.buildNodePackage { + name = "colors-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + name = "colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; deps = { }; @@ -523,16 +908,76 @@ }; by-spec."combined-stream"."~0.0.5" = self.by-version."combined-stream"."0.0.7"; - by-spec."commander"."2.6.0" = - self.by-version."commander"."2.6.0"; - by-version."commander"."2.6.0" = self.buildNodePackage { - name = "commander-2.6.0"; - version = "2.6.0"; + by-spec."commander"."0.6.1" = + self.by-version."commander"."0.6.1"; + by-version."commander"."0.6.1" = self.buildNodePackage { + name = "commander-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - name = "commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + name = "commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."2.3.0" = + self.by-version."commander"."2.3.0"; + by-version."commander"."2.3.0" = self.buildNodePackage { + name = "commander-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + name = "commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."^2.2.0" = + self.by-version."commander"."2.8.1"; + by-version."commander"."2.8.1" = self.buildNodePackage { + name = "commander-2.8.1"; + version = "2.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + name = "commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + deps = { + "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."^2.8.1" = + self.by-version."commander"."2.8.1"; + by-spec."commander"."~2.1.0" = + self.by-version."commander"."2.1.0"; + by-version."commander"."2.1.0" = self.buildNodePackage { + name = "commander-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; deps = { }; @@ -573,7 +1018,7 @@ sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; }; deps = { - "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; }; optionalDependencies = { }; @@ -581,22 +1026,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."compression"."~1.4.3" = - self.by-version."compression"."1.4.3"; - by-version."compression"."1.4.3" = self.buildNodePackage { - name = "compression-1.4.3"; - version = "1.4.3"; + by-spec."compression"."^1.3.0" = + self.by-version."compression"."1.4.4"; + by-version."compression"."1.4.4" = self.buildNodePackage { + name = "compression-1.4.4"; + version = "1.4.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz"; - name = "compression-1.4.3.tgz"; - sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d"; + url = "http://registry.npmjs.org/compression/-/compression-1.4.4.tgz"; + name = "compression-1.4.4.tgz"; + sha1 = "2f9994ca476e4d9ba5fdc67ac929942837d0b6a4"; }; deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; @@ -606,72 +1051,19 @@ os = [ ]; cpu = [ ]; }; - by-spec."connect"."2.29.1" = - self.by-version."connect"."2.29.1"; - by-version."connect"."2.29.1" = self.buildNodePackage { - name = "connect-2.29.1"; - version = "2.29.1"; + "compression" = self.by-version."compression"."1.4.4"; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = self.buildNodePackage { + name = "concat-map-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz"; - name = "connect-2.29.1.tgz"; - sha1 = "e0456742d25ed232b573ce156883dd4e6f208538"; + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; deps = { - "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.12.2" = self.by-version."body-parser"."1.12.2"; - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "compression-1.4.3" = self.by-version."compression"."1.4.3"; - "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5"; - "express-session-1.10.4" = self.by-version."express-session"."1.10.4"; - "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "method-override-2.3.2" = self.by-version."method-override"."2.3.2"; - "morgan-1.5.2" = self.by-version."morgan"."1.5.2"; - "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "qs-2.4.1" = self.by-version."qs"."2.4.1"; - "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; - "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; - "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3"; - "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; - "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; - "pause-0.0.1" = self.by-version."pause"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-timeout"."~1.6.1" = - self.by-version."connect-timeout"."1.6.1"; - by-version."connect-timeout"."1.6.1" = self.buildNodePackage { - name = "connect-timeout-1.6.1"; - version = "1.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz"; - name = "connect-timeout-1.6.1.tgz"; - sha1 = "1de3a2b853734820a232080b95742494ba4cd067"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; optionalDependencies = { }; @@ -736,46 +1128,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."cookie-jar"."~0.2.0" = - self.by-version."cookie-jar"."0.2.0"; - by-version."cookie-jar"."0.2.0" = self.buildNodePackage { - name = "cookie-jar-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; - name = "cookie-jar-0.2.0.tgz"; - sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-parser"."~1.3.4" = - self.by-version."cookie-parser"."1.3.4"; - by-version."cookie-parser"."1.3.4" = self.buildNodePackage { - name = "cookie-parser-1.3.4"; - version = "1.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz"; - name = "cookie-parser-1.3.4.tgz"; - sha1 = "193035a5be97117a21709b3aa737f6132717bda6"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."cookie-signature"."1.0.6" = self.by-version."cookie-signature"."1.0.6"; by-version."cookie-signature"."1.0.6" = self.buildNodePackage { @@ -795,16 +1147,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."cookiejar"."2.0.1" = - self.by-version."cookiejar"."2.0.1"; - by-version."cookiejar"."2.0.1" = self.buildNodePackage { - name = "cookiejar-2.0.1"; - version = "2.0.1"; + by-spec."cookiejar"."1.3.2" = + self.by-version."cookiejar"."1.3.2"; + by-version."cookiejar"."1.3.2" = self.buildNodePackage { + name = "cookiejar-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - name = "cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz"; + name = "cookiejar-1.3.2.tgz"; + sha1 = "61d3229e2da20c859032233502958a9b7df58249"; }; deps = { }; @@ -833,21 +1185,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."couch-compile"."^1.0.1" = - self.by-version."couch-compile"."1.2.0"; - by-version."couch-compile"."1.2.0" = self.buildNodePackage { - name = "couch-compile-1.2.0"; - version = "1.2.0"; + by-spec."coveralls"."^2.10.0" = + self.by-version."coveralls"."2.11.2"; + by-version."coveralls"."2.11.2" = self.buildNodePackage { + name = "coveralls-2.11.2"; + version = "2.11.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/couch-compile/-/couch-compile-1.2.0.tgz"; - name = "couch-compile-1.2.0.tgz"; - sha1 = "c4f7396f3dea38516b4e51d3edc3196de4f2d69c"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz"; + name = "coveralls-2.11.2.tgz"; + sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d"; }; deps = { - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1"; + "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6"; + "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4"; + "request-2.40.0" = self.by-version."request"."2.40.0"; }; optionalDependencies = { }; @@ -855,7 +1208,7 @@ os = [ ]; cpu = [ ]; }; - "couch-compile" = self.by-version."couch-compile"."1.2.0"; + "coveralls" = self.by-version."coveralls"."2.11.2"; by-spec."crc"."3.2.1" = self.by-version."crc"."3.2.1"; by-version."crc"."3.2.1" = self.buildNodePackage { @@ -875,45 +1228,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."cron-parser"."~0.3.0" = - self.by-version."cron-parser"."0.3.6"; - by-version."cron-parser"."0.3.6" = self.buildNodePackage { - name = "cron-parser-0.3.6"; - version = "0.3.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cron-parser/-/cron-parser-0.3.6.tgz"; - name = "cron-parser-0.3.6.tgz"; - sha1 = "1e4734ebd5fa054f5766693c52468b17df9681c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.1.x" = - self.by-version."cryptiles"."0.1.3"; - by-version."cryptiles"."0.1.3" = self.buildNodePackage { - name = "cryptiles-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; - name = "cryptiles-0.1.3.tgz"; - sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; - }; - deps = { - "boom-0.3.8" = self.by-version."boom"."0.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = self.buildNodePackage { @@ -946,53 +1260,7 @@ sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; }; deps = { - "boom-2.6.1" = self.by-version."boom"."2.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."csrf"."~2.0.6" = - self.by-version."csrf"."2.0.6"; - by-version."csrf"."2.0.6" = self.buildNodePackage { - name = "csrf-2.0.6"; - version = "2.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz"; - name = "csrf-2.0.6.tgz"; - sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e"; - }; - deps = { - "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; - "rndm-1.1.0" = self.by-version."rndm"."1.1.0"; - "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; - "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."csurf"."~1.7.0" = - self.by-version."csurf"."1.7.0"; - by-version."csurf"."1.7.0" = self.buildNodePackage { - name = "csurf-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz"; - name = "csurf-1.7.0.tgz"; - sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "boom-2.7.1" = self.by-version."boom"."2.7.1"; }; optionalDependencies = { }; @@ -1038,6 +1306,26 @@ os = [ ]; cpu = [ ]; }; + by-spec."debug"."2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = self.buildNodePackage { + name = "debug-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + }; + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; by-version."debug"."0.7.4" = self.buildNodePackage { @@ -1057,26 +1345,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."debug"."~1.0.1" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = self.buildNodePackage { - name = "debug-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."debug"."~2.1.3" = self.by-version."debug"."2.1.3"; by-version."debug"."2.1.3" = self.buildNodePackage { @@ -1097,16 +1365,56 @@ os = [ ]; cpu = [ ]; }; - by-spec."deep-diff"."^0.1.4" = - self.by-version."deep-diff"."0.1.7"; - by-version."deep-diff"."0.1.7" = self.buildNodePackage { - name = "deep-diff-0.1.7"; - version = "0.1.7"; + by-spec."debug"."~2.2.0" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/deep-diff/-/deep-diff-0.1.7.tgz"; - name = "deep-diff-0.1.7.tgz"; - sha1 = "d36da978b64429c268116cea941f490e7949cd3d"; + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-eql"."0.1.3" = + self.by-version."deep-eql"."0.1.3"; + by-version."deep-eql"."0.1.3" = self.buildNodePackage { + name = "deep-eql-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; + name = "deep-eql-0.1.3.tgz"; + sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; + }; + deps = { + "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-extend"."~0.2.5" = + self.by-version."deep-extend"."0.2.11"; + by-version."deep-extend"."0.2.11" = self.buildNodePackage { + name = "deep-extend-0.2.11"; + version = "0.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; + name = "deep-extend-0.2.11.tgz"; + sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; }; deps = { }; @@ -1116,7 +1424,6 @@ os = [ ]; cpu = [ ]; }; - "deep-diff" = self.by-version."deep-diff"."0.1.7"; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = self.buildNodePackage { @@ -1136,16 +1443,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.0"; - by-version."depd"."1.0.0" = self.buildNodePackage { - name = "depd-1.0.0"; - version = "1.0.0"; + by-spec."delegates"."^0.1.0" = + self.by-version."delegates"."0.1.0"; + by-version."delegates"."0.1.0" = self.buildNodePackage { + name = "delegates-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; - name = "depd-1.0.0.tgz"; - sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"; + name = "delegates-0.1.0.tgz"; + sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390"; }; deps = { }; @@ -1155,6 +1462,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = self.buildNodePackage { + name = "depd-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = self.buildNodePackage { @@ -1174,6 +1502,65 @@ os = [ ]; cpu = [ ]; }; + by-spec."diff"."1.0.8" = + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = self.buildNodePackage { + name = "diff-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."difflib"."~0.2.1" = + self.by-version."difflib"."0.2.4"; + by-version."difflib"."0.2.4" = self.buildNodePackage { + name = "difflib-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + name = "difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + }; + deps = { + "heap-0.2.6" = self.by-version."heap"."0.2.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dreamopt"."~0.6.0" = + self.by-version."dreamopt"."0.6.0"; + by-version."dreamopt"."0.6.0" = self.buildNodePackage { + name = "dreamopt-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + name = "dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; + }; + deps = { + "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ee-first"."1.1.0" = self.by-version."ee-first"."1.1.0"; by-version."ee-first"."1.1.0" = self.buildNodePackage { @@ -1193,37 +1580,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."errorhandler"."~1.3.5" = - self.by-version."errorhandler"."1.3.5"; - by-version."errorhandler"."1.3.5" = self.buildNodePackage { - name = "errorhandler-1.3.5"; - version = "1.3.5"; + by-spec."es5-ext"."0.8.x" = + self.by-version."es5-ext"."0.8.2"; + by-version."es5-ext"."0.8.2" = self.buildNodePackage { + name = "es5-ext-0.8.2"; + version = "0.8.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz"; - name = "errorhandler-1.3.5.tgz"; - sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a"; - }; - deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."errs"."~0.3.0" = - self.by-version."errs"."0.3.2"; - by-version."errs"."0.3.2" = self.buildNodePackage { - name = "errs-0.3.2"; - version = "0.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz"; - name = "errs-0.3.2.tgz"; - sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499"; + url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + name = "es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; deps = { }; @@ -1252,6 +1618,183 @@ os = [ ]; cpu = [ ]; }; + by-spec."escape-string-regexp"."1.0.2" = + self.by-version."escape-string-regexp"."1.0.2"; + by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage { + name = "escape-string-regexp-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + name = "escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.0" = + self.by-version."escape-string-regexp"."1.0.3"; + by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { + name = "escape-string-regexp-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; + name = "escape-string-regexp-1.0.3.tgz"; + sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.2" = + self.by-version."escape-string-regexp"."1.0.3"; + by-spec."escodegen"."1.3.x" = + self.by-version."escodegen"."1.3.3"; + by-version."escodegen"."1.3.3" = self.buildNodePackage { + name = "escodegen-1.3.3"; + version = "1.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + name = "escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + deps = { + "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; + "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; + }; + optionalDependencies = { + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."1.2.x" = + self.by-version."esprima"."1.2.5"; + by-version."esprima"."1.2.5" = self.buildNodePackage { + name = "esprima-1.2.5"; + version = "1.2.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"; + name = "esprima-1.2.5.tgz"; + sha1 = "0993502feaf668138325756f30f9a51feeec11e9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~ 1.0.2" = + self.by-version."esprima"."1.0.4"; + by-version."esprima"."1.0.4" = self.buildNodePackage { + name = "esprima-1.0.4"; + version = "1.0.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + name = "esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~1.1.1" = + self.by-version."esprima"."1.1.1"; + by-version."esprima"."1.1.1" = self.buildNodePackage { + name = "esprima-1.1.1"; + version = "1.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + name = "esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~2.2.0" = + self.by-version."esprima"."2.2.0"; + by-version."esprima"."2.2.0" = self.buildNodePackage { + name = "esprima-2.2.0"; + version = "2.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"; + name = "esprima-2.2.0.tgz"; + sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."estraverse"."~1.5.0" = + self.by-version."estraverse"."1.5.1"; + by-version."estraverse"."1.5.1" = self.buildNodePackage { + name = "estraverse-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + name = "estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esutils"."~1.0.0" = + self.by-version."esutils"."1.0.0"; + by-version."esutils"."1.0.0" = self.buildNodePackage { + name = "esutils-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + name = "esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."etag"."~1.5.1" = self.by-version."etag"."1.5.1"; by-version."etag"."1.5.1" = self.buildNodePackage { @@ -1272,67 +1815,41 @@ os = [ ]; cpu = [ ]; }; - by-spec."express"."^3.4.8" = - self.by-version."express"."3.20.2"; - by-version."express"."3.20.2" = self.buildNodePackage { - name = "express-3.20.2"; - version = "3.20.2"; - bin = true; + by-spec."express"."^4.8.7" = + self.by-version."express"."4.12.3"; + by-version."express"."4.12.3" = self.buildNodePackage { + name = "express-4.12.3"; + version = "4.12.3"; + bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz"; - name = "express-3.20.2.tgz"; - sha1 = "c604027746e60f3da0a4b43063375d21c3235858"; + url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz"; + name = "express-4.12.3.tgz"; + sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2"; }; deps = { - "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.29.1" = self.by-version."connect"."2.29.1"; + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "commander-2.6.0" = self.by-version."commander"."2.6.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.4.1" = self.by-version."qs"."2.4.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.12.2" = self.by-version."send"."0.12.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."3.20.2"; - by-spec."express-session"."~1.10.4" = - self.by-version."express-session"."1.10.4"; - by-version."express-session"."1.10.4" = self.buildNodePackage { - name = "express-session-1.10.4"; - version = "1.10.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz"; - name = "express-session-1.10.4.tgz"; - sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; optionalDependencies = { @@ -1341,6 +1858,7 @@ os = [ ]; cpu = [ ]; }; + "express" = self.by-version."express"."4.12.3"; by-spec."extend"."~1.2.1" = self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = self.buildNodePackage { @@ -1360,6 +1878,25 @@ os = [ ]; cpu = [ ]; }; + by-spec."extend"."~1.3.0" = + self.by-version."extend"."1.3.0"; + by-version."extend"."1.3.0" = self.buildNodePackage { + name = "extend-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz"; + name = "extend-1.3.0.tgz"; + sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; by-version."eyes"."0.1.8" = self.buildNodePackage { @@ -1379,6 +1916,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."fileset"."0.1.x" = + self.by-version."fileset"."0.1.5"; + by-version."fileset"."0.1.5" = self.buildNodePackage { + name = "fileset-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; + name = "fileset-0.1.5.tgz"; + sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94"; + }; + deps = { + "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."finalhandler"."0.3.4" = self.by-version."finalhandler"."0.3.4"; by-version."finalhandler"."0.3.4" = self.buildNodePackage { @@ -1393,7 +1951,7 @@ deps = { "debug-2.1.3" = self.by-version."debug"."2.1.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; }; optionalDependencies = { }; @@ -1401,38 +1959,37 @@ os = [ ]; cpu = [ ]; }; - by-spec."follow"."~0.11.2" = - self.by-version."follow"."0.11.4"; - by-version."follow"."0.11.4" = self.buildNodePackage { - name = "follow-0.11.4"; - version = "0.11.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/follow/-/follow-0.11.4.tgz"; - name = "follow-0.11.4.tgz"; - sha1 = "87e9a50d443f921d05704ebac412a14ab9d9232f"; - }; - deps = { - "request-2.53.0" = self.by-version."request"."2.53.0"; - "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.2.0" = - self.by-version."forever-agent"."0.2.0"; - by-version."forever-agent"."0.2.0" = self.buildNodePackage { - name = "forever-agent-0.2.0"; - version = "0.2.0"; + by-spec."findup-sync"."~0.1.2" = + self.by-version."findup-sync"."0.1.3"; + by-version."findup-sync"."0.1.3" = self.buildNodePackage { + name = "findup-sync-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; - name = "forever-agent-0.2.0.tgz"; - sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; + name = "findup-sync-0.1.3.tgz"; + sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683"; + }; + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."flagged-respawn"."~0.3.0" = + self.by-version."flagged-respawn"."0.3.1"; + by-version."flagged-respawn"."0.3.1" = self.buildNodePackage { + name = "flagged-respawn-0.3.1"; + version = "0.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; + name = "flagged-respawn-0.3.1.tgz"; + sha1 = "397700925df6e12452202a71e89d89545fbbbe9d"; }; deps = { }; @@ -1461,21 +2018,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."form-data"."0.1.3" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = self.buildNodePackage { - name = "form-data-0.1.3"; - version = "0.1.3"; + by-spec."forever-agent"."~0.6.0" = + self.by-version."forever-agent"."0.6.1"; + by-version."forever-agent"."0.6.1" = self.buildNodePackage { + name = "forever-agent-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + name = "forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; }; optionalDependencies = { }; @@ -1483,16 +2037,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."form-data"."~0.0.3" = - self.by-version."form-data"."0.0.10"; - by-version."form-data"."0.0.10" = self.buildNodePackage { - name = "form-data-0.0.10"; - version = "0.0.10"; + by-spec."form-data"."0.1.2" = + self.by-version."form-data"."0.1.2"; + by-version."form-data"."0.1.2" = self.buildNodePackage { + name = "form-data-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; - name = "form-data-0.0.10.tgz"; - sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; + sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; }; deps = { "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; @@ -1541,7 +2095,47 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formatio"."1.1.1" = + self.by-version."formatio"."1.1.1"; + by-version."formatio"."1.1.1" = self.buildNodePackage { + name = "formatio-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; + name = "formatio-1.1.1.tgz"; + sha1 = "5ed3ccd636551097383465d996199100e86161e9"; + }; + deps = { + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formatio"."~1.0" = + self.by-version."formatio"."1.0.2"; + by-version."formatio"."1.0.2" = self.buildNodePackage { + name = "formatio-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz"; + name = "formatio-1.0.2.tgz"; + sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef"; + }; + deps = { + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; optionalDependencies = { }; @@ -1606,7 +2200,202 @@ os = [ ]; cpu = [ ]; }; - by-spec."glob"."^3.2.11" = + by-spec."fstream"."^1.0.2" = + self.by-version."fstream"."1.0.6"; + by-version."fstream"."1.0.6" = self.buildNodePackage { + name = "fstream-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz"; + name = "fstream-1.0.6.tgz"; + sha1 = "817e50312fb4ed90da865c8eb5ecd1d1d7aed0ec"; + }; + deps = { + "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fstream"."~0.1.17" = + self.by-version."fstream"."0.1.31"; + by-version."fstream"."0.1.31" = self.buildNodePackage { + name = "fstream-0.1.31"; + version = "0.1.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + name = "fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + deps = { + "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fstream"."~0.1.22" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream-ignore"."0.0.7" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = self.buildNodePackage { + name = "fstream-ignore-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gauge"."~1.2.0" = + self.by-version."gauge"."1.2.0"; + by-version."gauge"."1.2.0" = self.buildNodePackage { + name = "gauge-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz"; + name = "gauge-1.2.0.tgz"; + sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5"; + }; + deps = { + "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; + "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0"; + "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0"; + "lodash.padleft-3.1.1" = self.by-version."lodash.padleft"."3.1.1"; + "lodash.padright-3.1.1" = self.by-version."lodash.padright"."3.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-function"."^2.0.0" = + self.by-version."generate-function"."2.0.0"; + by-version."generate-function"."2.0.0" = self.buildNodePackage { + name = "generate-function-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + name = "generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-object-property"."^1.1.0" = + self.by-version."generate-object-property"."1.1.1"; + by-version."generate-object-property"."1.1.1" = self.buildNodePackage { + name = "generate-object-property-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz"; + name = "generate-object-property-1.1.1.tgz"; + sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93"; + }; + deps = { + "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generic-pool-redux"."~0.1.0" = + self.by-version."generic-pool-redux"."0.1.0"; + by-version."generic-pool-redux"."0.1.0" = self.buildNodePackage { + name = "generic-pool-redux-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generic-pool-redux/-/generic-pool-redux-0.1.0.tgz"; + name = "generic-pool-redux-0.1.0.tgz"; + sha1 = "326c2594e17fba4d4f0622cfe09acc3c84cb3a82"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."get-stdin"."^4.0.1" = + self.by-version."get-stdin"."4.0.1"; + by-version."get-stdin"."4.0.1" = self.buildNodePackage { + name = "get-stdin-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + name = "get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."3.2.3" = + self.by-version."glob"."3.2.3"; + by-version."glob"."3.2.3" = self.buildNodePackage { + name = "glob-3.2.3"; + version = "3.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + name = "glob-3.2.3.tgz"; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."3.x" = self.by-version."glob"."3.2.11"; by-version."glob"."3.2.11" = self.buildNodePackage { name = "glob-3.2.11"; @@ -1627,6 +2416,232 @@ os = [ ]; cpu = [ ]; }; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.3"; + by-version."glob"."4.5.3" = self.buildNodePackage { + name = "glob-4.5.3"; + version = "4.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + name = "glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.7" = self.by-version."minimatch"."2.0.7"; + "once-1.3.2" = self.by-version."once"."1.3.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."~3.2.9" = + self.by-version."glob"."3.2.11"; + by-spec."graceful-fs"."1.2" = + self.by-version."graceful-fs"."1.2.3"; + by-version."graceful-fs"."1.2.3" = self.buildNodePackage { + name = "graceful-fs-1.2.3"; + version = "1.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."3" = + self.by-version."graceful-fs"."3.0.6"; + by-version."graceful-fs"."3.0.6" = self.buildNodePackage { + name = "graceful-fs-3.0.6"; + version = "3.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"; + name = "graceful-fs-3.0.6.tgz"; + sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~2.0.0" = + self.by-version."graceful-fs"."2.0.3"; + by-version."graceful-fs"."2.0.3" = self.buildNodePackage { + name = "graceful-fs-2.0.3"; + version = "2.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + name = "graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.6"; + by-spec."graceful-readlink".">= 1.0.0" = + self.by-version."graceful-readlink"."1.0.1"; + by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { + name = "graceful-readlink-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + name = "graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."growl"."1.8.1" = + self.by-version."growl"."1.8.1"; + by-version."growl"."1.8.1" = self.buildNodePackage { + name = "growl-1.8.1"; + version = "1.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; + name = "growl-1.8.1.tgz"; + sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."handlebars"."1.3.x" = + self.by-version."handlebars"."1.3.0"; + by-version."handlebars"."1.3.0" = self.buildNodePackage { + name = "handlebars-1.3.0"; + version = "1.3.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; + name = "handlebars-1.3.0.tgz"; + sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34"; + }; + deps = { + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."har-validator"."^1.4.0" = + self.by-version."har-validator"."1.7.0"; + by-version."har-validator"."1.7.0" = self.buildNodePackage { + name = "har-validator-1.7.0"; + version = "1.7.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz"; + name = "har-validator-1.7.0.tgz"; + sha1 = "563f8c58edca6410e2e408b0e540161da580dc46"; + }; + deps = { + "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; + "chalk-1.0.0" = self.by-version."chalk"."1.0.0"; + "commander-2.8.1" = self.by-version."commander"."2.8.1"; + "is-my-json-valid-2.11.0" = self.by-version."is-my-json-valid"."2.11.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^0.1.0" = + self.by-version."has-ansi"."0.1.0"; + by-version."has-ansi"."0.1.0" = self.buildNodePackage { + name = "has-ansi-0.1.0"; + version = "0.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + name = "has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^1.0.3" = + self.by-version."has-ansi"."1.0.3"; + by-version."has-ansi"."1.0.3" = self.buildNodePackage { + name = "has-ansi-1.0.3"; + version = "1.0.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; + name = "has-ansi-1.0.3.tgz"; + sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; + }; + deps = { + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-unicode"."^1.0.0" = + self.by-version."has-unicode"."1.0.0"; + by-version."has-unicode"."1.0.0" = self.buildNodePackage { + name = "has-unicode-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"; + name = "has-unicode-1.0.0.tgz"; + sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."hawk"."1.1.1" = self.by-version."hawk"."1.1.1"; by-version."hawk"."1.1.1" = self.buildNodePackage { @@ -1650,29 +2665,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."hawk"."~0.10.2" = - self.by-version."hawk"."0.10.2"; - by-version."hawk"."0.10.2" = self.buildNodePackage { - name = "hawk-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; - name = "hawk-0.10.2.tgz"; - sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; - }; - deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; - "boom-0.3.8" = self.by-version."boom"."0.3.8"; - "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3"; - "sntp-0.1.4" = self.by-version."sntp"."0.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."hawk"."~2.3.0" = self.by-version."hawk"."2.3.1"; by-version."hawk"."2.3.1" = self.buildNodePackage { @@ -1685,8 +2677,8 @@ sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; - "boom-2.6.1" = self.by-version."boom"."2.6.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; + "boom-2.7.1" = self.by-version."boom"."2.7.1"; "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; }; @@ -1696,16 +2688,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."hoek"."0.7.x" = - self.by-version."hoek"."0.7.6"; - by-version."hoek"."0.7.6" = self.buildNodePackage { - name = "hoek-0.7.6"; - version = "0.7.6"; + by-spec."heap".">= 0.2.0" = + self.by-version."heap"."0.2.6"; + by-version."heap"."0.2.6" = self.buildNodePackage { + name = "heap-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; - name = "hoek-0.7.6.tgz"; - sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + url = "http://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; + name = "heap-0.2.6.tgz"; + sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; }; deps = { }; @@ -1735,15 +2727,15 @@ cpu = [ ]; }; by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.11.1"; - by-version."hoek"."2.11.1" = self.buildNodePackage { - name = "hoek-2.11.1"; - version = "2.11.1"; + self.by-version."hoek"."2.13.0"; + by-version."hoek"."2.13.0" = self.buildNodePackage { + name = "hoek-2.13.0"; + version = "2.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.11.1.tgz"; - name = "hoek-2.11.1.tgz"; - sha1 = "3839a8b72f86aade3312100afaf80648af155b38"; + url = "http://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"; + name = "hoek-2.13.0.tgz"; + sha1 = "cc86b5c1c344b41a7271be449e232fac8d6f450c"; }; deps = { }; @@ -1753,27 +2745,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."http-errors"."~1.3.1" = - self.by-version."http-errors"."1.3.1"; - by-version."http-errors"."1.3.1" = self.buildNodePackage { - name = "http-errors-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - name = "http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."http-signature"."~0.10.0" = self.by-version."http-signature"."0.10.1"; by-version."http-signature"."0.10.1" = self.buildNodePackage { @@ -1796,16 +2767,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."iconv-lite"."0.4.7" = - self.by-version."iconv-lite"."0.4.7"; - by-version."iconv-lite"."0.4.7" = self.buildNodePackage { - name = "iconv-lite-0.4.7"; - version = "0.4.7"; + by-spec."iconv-lite"."0.4.8" = + self.by-version."iconv-lite"."0.4.8"; + by-version."iconv-lite"."0.4.8" = self.buildNodePackage { + name = "iconv-lite-0.4.8"; + version = "0.4.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"; - name = "iconv-lite-0.4.7.tgz"; - sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + name = "iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; deps = { }; @@ -1815,6 +2786,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = self.buildNodePackage { + name = "inflight-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }; + deps = { + "once-1.3.2" = self.by-version."once"."1.3.2"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = self.buildNodePackage { @@ -1834,18 +2826,104 @@ os = [ ]; cpu = [ ]; }; + by-spec."inherits"."2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.9" = - self.by-version."ipaddr.js"."0.1.9"; - by-version."ipaddr.js"."0.1.9" = self.buildNodePackage { - name = "ipaddr.js-0.1.9"; - version = "0.1.9"; + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.3.3"; + by-version."ini"."1.3.3" = self.buildNodePackage { + name = "ini-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz"; - name = "ipaddr.js-0.1.9.tgz"; - sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa"; + url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"; + name = "ini-1.3.3.tgz"; + sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ini"."~1.3.0" = + self.by-version."ini"."1.3.3"; + by-spec."interpret"."^0.3.2" = + self.by-version."interpret"."0.3.10"; + by-version."interpret"."0.3.10" = self.buildNodePackage { + name = "interpret-0.3.10"; + version = "0.3.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; + name = "interpret-0.3.10.tgz"; + sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-my-json-valid"."^2.10.1" = + self.by-version."is-my-json-valid"."2.11.0"; + by-version."is-my-json-valid"."2.11.0" = self.buildNodePackage { + name = "is-my-json-valid-2.11.0"; + version = "2.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.11.0.tgz"; + name = "is-my-json-valid-2.11.0.tgz"; + sha1 = "11f130d52c6c0b2ee132a72feb8e3e4c61a2c54f"; + }; + deps = { + "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; + "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1"; + "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-property"."^1.0.0" = + self.by-version."is-property"."1.0.2"; + by-version."is-property"."1.0.2" = self.buildNodePackage { + name = "is-property-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + name = "is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; deps = { }; @@ -1874,7 +2952,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."isstream"."~0.1.1" = + by-spec."isstream"."0.1.x" = self.by-version."isstream"."0.1.2"; by-version."isstream"."0.1.2" = self.buildNodePackage { name = "isstream-0.1.2"; @@ -1893,18 +2971,159 @@ os = [ ]; cpu = [ ]; }; - by-spec."json-stringify-safe"."~3.0.0" = - self.by-version."json-stringify-safe"."3.0.0"; - by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage { - name = "json-stringify-safe-3.0.0"; - version = "3.0.0"; - bin = false; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.2"; + by-spec."istanbul"."^0.2.10" = + self.by-version."istanbul"."0.2.16"; + by-version."istanbul"."0.2.16" = self.buildNodePackage { + name = "istanbul-0.2.16"; + version = "0.2.16"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; - name = "json-stringify-safe-3.0.0.tgz"; - sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz"; + name = "istanbul-0.2.16.tgz"; + sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9"; }; deps = { + "esprima-1.2.5" = self.by-version."esprima"."1.2.5"; + "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; + "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; + "which-1.0.9" = self.by-version."which"."1.0.9"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "js-yaml-3.3.1" = self.by-version."js-yaml"."3.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "istanbul" = self.by-version."istanbul"."0.2.16"; + by-spec."jade"."0.26.3" = + self.by-version."jade"."0.26.3"; + by-version."jade"."0.26.3" = self.buildNodePackage { + name = "jade-0.26.3"; + version = "0.26.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + name = "jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + deps = { + "commander-0.6.1" = self.by-version."commander"."0.6.1"; + "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jayschema"."^0.3.1" = + self.by-version."jayschema"."0.3.1"; + by-version."jayschema"."0.3.1" = self.buildNodePackage { + name = "jayschema-0.3.1"; + version = "0.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; + name = "jayschema-0.3.1.tgz"; + sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + }; + deps = { + "when-3.4.6" = self.by-version."when"."3.4.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jayschema" = self.by-version."jayschema"."0.3.1"; + by-spec."jayschema-error-messages"."^1.0.2" = + self.by-version."jayschema-error-messages"."1.0.3"; + by-version."jayschema-error-messages"."1.0.3" = self.buildNodePackage { + name = "jayschema-error-messages-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jayschema-error-messages/-/jayschema-error-messages-1.0.3.tgz"; + name = "jayschema-error-messages-1.0.3.tgz"; + sha1 = "8bac6e52ae89d406fbe1a7db4ae44debfd289066"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jayschema-error-messages" = self.by-version."jayschema-error-messages"."1.0.3"; + by-spec."js-yaml"."3.0.1" = + self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = self.buildNodePackage { + name = "js-yaml-3.0.1"; + version = "3.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + }; + deps = { + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."js-yaml"."3.x" = + self.by-version."js-yaml"."3.3.1"; + by-version."js-yaml"."3.3.1" = self.buildNodePackage { + name = "js-yaml-3.3.1"; + version = "3.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz"; + name = "js-yaml-3.3.1.tgz"; + sha1 = "ca1acd3423ec275d12140a7bab51db015ba0b3c0"; + }; + deps = { + "argparse-1.0.2" = self.by-version."argparse"."1.0.2"; + "esprima-2.2.0" = self.by-version."esprima"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-diff"."0.3.1" = + self.by-version."json-diff"."0.3.1"; + by-version."json-diff"."0.3.1" = self.buildNodePackage { + name = "json-diff-0.3.1"; + version = "0.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/json-diff/-/json-diff-0.3.1.tgz"; + name = "json-diff-0.3.1.tgz"; + sha1 = "6dbc3ae2d25e075a7fd71bcd9874458666fb681b"; + }; + deps = { + "dreamopt-0.6.0" = self.by-version."dreamopt"."0.6.0"; + "difflib-0.2.4" = self.by-version."difflib"."0.2.4"; + "cli-color-0.1.7" = self.by-version."cli-color"."0.1.7"; }; optionalDependencies = { }; @@ -1931,16 +3150,136 @@ os = [ ]; cpu = [ ]; }; + by-spec."jsonpointer"."^1.1.0" = + self.by-version."jsonpointer"."1.1.0"; + by-version."jsonpointer"."1.1.0" = self.buildNodePackage { + name = "jsonpointer-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; + name = "jsonpointer-1.1.0.tgz"; + sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."knex"."^0.7.6" = + self.by-version."knex"."0.7.6"; + by-version."knex"."0.7.6" = self.buildNodePackage { + name = "knex-0.7.6"; + version = "0.7.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/knex/-/knex-0.7.6.tgz"; + name = "knex-0.7.6.tgz"; + sha1 = "325d18174b0625658ff0d35aaf1cd9e631696992"; + }; + deps = { + "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "commander-2.8.1" = self.by-version."commander"."2.8.1"; + "generic-pool-redux-0.1.0" = self.by-version."generic-pool-redux"."0.1.0"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; + "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "knex" = self.by-version."knex"."0.7.6"; + by-spec."lcov-parse"."0.0.6" = + self.by-version."lcov-parse"."0.0.6"; + by-version."lcov-parse"."0.0.6" = self.buildNodePackage { + name = "lcov-parse-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"; + name = "lcov-parse-0.0.6.tgz"; + sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."liftoff"."~0.13.2" = + self.by-version."liftoff"."0.13.6"; + by-version."liftoff"."0.13.6" = self.buildNodePackage { + name = "liftoff-0.13.6"; + version = "0.13.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz"; + name = "liftoff-0.13.6.tgz"; + sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8"; + }; + deps = { + "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; + "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; + "extend-1.3.0" = self.by-version."extend"."1.3.0"; + "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash".">= 3.2.0 < 4.0.0" = + self.by-version."lodash"."3.8.0"; + by-version."lodash"."3.8.0" = self.buildNodePackage { + name = "lodash-3.8.0"; + version = "3.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"; + name = "lodash-3.8.0.tgz"; + sha1 = "376eb98bdcd9382a9365c33c4cb8250de1325b91"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."lodash"."^3.1.0" = - self.by-version."lodash"."3.5.0"; - by-version."lodash"."3.5.0" = self.buildNodePackage { - name = "lodash-3.5.0"; - version = "3.5.0"; + self.by-version."lodash"."3.8.0"; + by-spec."lodash"."^3.6" = + self.by-version."lodash"."3.8.0"; + "lodash" = self.by-version."lodash"."3.8.0"; + by-spec."lodash"."^3.6.0" = + self.by-version."lodash"."3.8.0"; + by-spec."lodash"."~2.4.0" = + self.by-version."lodash"."2.4.2"; + by-version."lodash"."2.4.2" = self.buildNodePackage { + name = "lodash-2.4.2"; + version = "2.4.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"; - name = "lodash-3.5.0.tgz"; - sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + name = "lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; deps = { }; @@ -1950,16 +3289,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."lodash"."~1.3.1" = - self.by-version."lodash"."1.3.1"; - by-version."lodash"."1.3.1" = self.buildNodePackage { - name = "lodash-1.3.1"; - version = "1.3.1"; + by-spec."lodash"."~2.4.1" = + self.by-version."lodash"."2.4.2"; + by-spec."lodash._basetostring"."^3.0.0" = + self.by-version."lodash._basetostring"."3.0.0"; + by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage { + name = "lodash._basetostring-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; - name = "lodash-1.3.1.tgz"; - sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; + url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"; + name = "lodash._basetostring-3.0.0.tgz"; + sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2"; }; deps = { }; @@ -1969,17 +3310,138 @@ os = [ ]; cpu = [ ]; }; - "lodash" = self.by-version."lodash"."1.3.1"; - by-spec."long-timeout"."~0.0.1" = - self.by-version."long-timeout"."0.0.2"; - by-version."long-timeout"."0.0.2" = self.buildNodePackage { - name = "long-timeout-0.0.2"; - version = "0.0.2"; + by-spec."lodash._createpadding"."^3.0.0" = + self.by-version."lodash._createpadding"."3.6.0"; + by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage { + name = "lodash._createpadding-3.6.0"; + version = "3.6.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/long-timeout/-/long-timeout-0.0.2.tgz"; - name = "long-timeout-0.0.2.tgz"; - sha1 = "f36449ba89629d13a7a2b2523a4db9dd66e3ff68"; + url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz"; + name = "lodash._createpadding-3.6.0.tgz"; + sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e"; + }; + deps = { + "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.pad"."^3.0.0" = + self.by-version."lodash.pad"."3.1.0"; + by-version."lodash.pad"."3.1.0" = self.buildNodePackage { + name = "lodash.pad-3.1.0"; + version = "3.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"; + name = "lodash.pad-3.1.0.tgz"; + sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.padleft"."^3.0.0" = + self.by-version."lodash.padleft"."3.1.1"; + by-version."lodash.padleft"."3.1.1" = self.buildNodePackage { + name = "lodash.padleft-3.1.1"; + version = "3.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"; + name = "lodash.padleft-3.1.1.tgz"; + sha1 = "150151f1e0245edba15d50af2d71f1d5cff46530"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.padright"."^3.0.0" = + self.by-version."lodash.padright"."3.1.1"; + by-version."lodash.padright"."3.1.1" = self.buildNodePackage { + name = "lodash.padright-3.1.1"; + version = "3.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"; + name = "lodash.padright-3.1.1.tgz"; + sha1 = "79f7770baaa39738c040aeb5465e8d88f2aacec0"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.repeat"."^3.0.0" = + self.by-version."lodash.repeat"."3.0.0"; + by-version."lodash.repeat"."3.0.0" = self.buildNodePackage { + name = "lodash.repeat-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"; + name = "lodash.repeat-3.0.0.tgz"; + sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."log-driver"."1.2.4" = + self.by-version."log-driver"."1.2.4"; + by-version."log-driver"."1.2.4" = self.buildNodePackage { + name = "log-driver-1.2.4"; + version = "1.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz"; + name = "log-driver-1.2.4.tgz"; + sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lolex"."1.1.0" = + self.by-version."lolex"."1.1.0"; + by-version."lolex"."1.1.0" = self.buildNodePackage { + name = "lolex-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"; + name = "lolex-1.1.0.tgz"; + sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b"; }; deps = { }; @@ -1990,15 +3452,15 @@ cpu = [ ]; }; by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = self.buildNodePackage { - name = "lru-cache-2.5.0"; - version = "2.5.0"; + self.by-version."lru-cache"."2.6.2"; + by-version."lru-cache"."2.6.2" = self.buildNodePackage { + name = "lru-cache-2.6.2"; + version = "2.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"; + name = "lru-cache-2.6.2.tgz"; + sha1 = "77741638c6dc972e503dbe41dcb6bfdfba499a38"; }; deps = { }; @@ -2009,7 +3471,24 @@ cpu = [ ]; }; by-spec."lru-cache"."~2.5.0" = - self.by-version."lru-cache"."2.5.0"; + self.by-version."lru-cache"."2.5.2"; + by-version."lru-cache"."2.5.2" = self.buildNodePackage { + name = "lru-cache-2.5.2"; + version = "2.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; + name = "lru-cache-2.5.2.tgz"; + sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = self.buildNodePackage { @@ -2048,22 +3527,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."method-override"."~2.3.2" = - self.by-version."method-override"."2.3.2"; - by-version."method-override"."2.3.2" = self.buildNodePackage { - name = "method-override-2.3.2"; - version = "2.3.2"; + by-spec."methods"."0.0.1" = + self.by-version."methods"."0.0.1"; + by-version."methods"."0.0.1" = self.buildNodePackage { + name = "methods-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz"; - name = "method-override-2.3.2.tgz"; - sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793"; + url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + name = "methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; }; deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; optionalDependencies = { }; @@ -2071,16 +3546,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = self.buildNodePackage { - name = "methods-1.0.1"; - version = "1.0.1"; + by-spec."methods"."1.0.0" = + self.by-version."methods"."1.0.0"; + by-version."methods"."1.0.0" = self.buildNodePackage { + name = "methods-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; + name = "methods-1.0.0.tgz"; + sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3"; }; deps = { }; @@ -2109,16 +3584,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; + by-spec."mime"."1.2.5" = + self.by-version."mime"."1.2.5"; + by-version."mime"."1.2.5" = self.buildNodePackage { + name = "mime-1.2.5"; + version = "1.2.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; + name = "mime-1.2.5.tgz"; + sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; }; deps = { }; @@ -2147,24 +3622,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."^1.2.11" = - self.by-version."mime"."1.3.4"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; - by-spec."mime"."~1.2.2" = - self.by-version."mime"."1.2.11"; - by-spec."mime"."~1.2.7" = - self.by-version."mime"."1.2.11"; - by-spec."mime-db".">= 1.1.2 < 2" = - self.by-version."mime-db"."1.8.0"; - by-version."mime-db"."1.8.0" = self.buildNodePackage { - name = "mime-db-1.8.0"; - version = "1.8.0"; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + version = "1.2.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"; - name = "mime-db-1.8.0.tgz"; - sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25"; + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; deps = { }; @@ -2174,8 +3641,27 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-db"."~1.8.0" = - self.by-version."mime-db"."1.8.0"; + by-spec."mime-db".">= 1.1.2 < 2" = + self.by-version."mime-db"."1.9.1"; + by-version."mime-db"."1.9.1" = self.buildNodePackage { + name = "mime-db-1.9.1"; + version = "1.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"; + name = "mime-db-1.9.1.tgz"; + sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.9.1" = + self.by-version."mime-db"."1.9.1"; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = self.buildNodePackage { @@ -2196,18 +3682,18 @@ cpu = [ ]; }; by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.10"; - by-version."mime-types"."2.0.10" = self.buildNodePackage { - name = "mime-types-2.0.10"; - version = "2.0.10"; + self.by-version."mime-types"."2.0.11"; + by-version."mime-types"."2.0.11" = self.buildNodePackage { + name = "mime-types-2.0.11"; + version = "2.0.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz"; - name = "mime-types-2.0.10.tgz"; - sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz"; + name = "mime-types-2.0.11.tgz"; + sha1 = "bf3449042799d877c815c29929d1e74760e72007"; }; deps = { - "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; }; optionalDependencies = { }; @@ -2215,10 +3701,10 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-types"."~2.0.10" = - self.by-version."mime-types"."2.0.10"; + by-spec."mime-types"."~2.0.11" = + self.by-version."mime-types"."2.0.11"; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.10"; + self.by-version."mime-types"."2.0.11"; by-spec."minimatch"."0.3" = self.by-version."minimatch"."0.3.0"; by-version."minimatch"."0.3.0" = self.buildNodePackage { @@ -2231,7 +3717,7 @@ sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; optionalDependencies = { @@ -2240,6 +3726,70 @@ os = [ ]; cpu = [ ]; }; + by-spec."minimatch"."0.x" = + self.by-version."minimatch"."0.4.0"; + by-version."minimatch"."0.4.0" = self.buildNodePackage { + name = "minimatch-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; + name = "minimatch-0.4.0.tgz"; + sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b"; + }; + deps = { + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.7"; + by-version."minimatch"."2.0.7" = self.buildNodePackage { + name = "minimatch-2.0.7"; + version = "2.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz"; + name = "minimatch-2.0.7.tgz"; + sha1 = "d23652ab10e663e7d914602e920e21f9f66492be"; + }; + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = self.buildNodePackage { + name = "minimatch-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + deps = { + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.11" = + self.by-version."minimatch"."0.2.14"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = self.buildNodePackage { @@ -2259,6 +3809,85 @@ os = [ ]; cpu = [ ]; }; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = self.buildNodePackage { + name = "minimist-0.0.10"; + version = "0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."~0.0.7" = + self.by-version."minimist"."0.0.10"; + by-spec."minimist"."~1.1.0" = + self.by-version."minimist"."1.1.1"; + by-version."minimist"."1.1.1" = self.buildNodePackage { + name = "minimist-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"; + name = "minimist-1.1.1.tgz"; + sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.0" = + self.by-version."mkdirp"."0.3.0"; + by-version."mkdirp"."0.3.0" = self.buildNodePackage { + name = "mkdirp-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.5" = + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = self.buildNodePackage { + name = "mkdirp-0.5.1"; + version = "0.5.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."mkdirp"."0.5.0" = self.by-version."mkdirp"."0.5.0"; by-version."mkdirp"."0.5.0" = self.buildNodePackage { @@ -2279,18 +3908,35 @@ os = [ ]; cpu = [ ]; }; - by-spec."mkdirp"."~0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = self.buildNodePackage { - name = "mkdirp-0.3.5"; - version = "0.3.5"; - bin = false; + by-spec."mkdirp"."0.5.x" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp".">=0.5 0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp"."^0.5.0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp"."~0.5.0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mocha"."^2.1.0" = + self.by-version."mocha"."2.2.4"; + by-version."mocha"."2.2.4" = self.buildNodePackage { + name = "mocha-2.2.4"; + version = "2.2.4"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz"; + name = "mocha-2.2.4.tgz"; + sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d"; }; deps = { + "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "glob-3.2.3" = self.by-version."glob"."3.2.3"; + "growl-1.8.1" = self.by-version."growl"."1.8.1"; + "jade-0.26.3" = self.by-version."jade"."0.26.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1"; }; optionalDependencies = { }; @@ -2298,18 +3944,23 @@ os = [ ]; cpu = [ ]; }; - by-spec."moment"."~2.1.0" = - self.by-version."moment"."2.1.0"; - by-version."moment"."2.1.0" = self.buildNodePackage { - name = "moment-2.1.0"; - version = "2.1.0"; + "mocha" = self.by-version."mocha"."2.2.4"; + by-spec."morgan"."^1.3.0" = + self.by-version."morgan"."1.5.3"; + by-version."morgan"."1.5.3" = self.buildNodePackage { + name = "morgan-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; - name = "moment-2.1.0.tgz"; - sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.5.3.tgz"; + name = "morgan-1.5.3.tgz"; + sha1 = "8adb4e72f9e5c5436e5d93f42910835f79da9fdf"; }; deps = { + "basic-auth-1.0.1" = self.by-version."basic-auth"."1.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; }; optionalDependencies = { }; @@ -2317,30 +3968,7 @@ os = [ ]; cpu = [ ]; }; - "moment" = self.by-version."moment"."2.1.0"; - by-spec."morgan"."~1.5.2" = - self.by-version."morgan"."1.5.2"; - by-version."morgan"."1.5.2" = self.buildNodePackage { - name = "morgan-1.5.2"; - version = "1.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz"; - name = "morgan-1.5.2.tgz"; - sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff"; - }; - deps = { - "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; + "morgan" = self.by-version."morgan"."1.5.3"; by-spec."ms"."0.6.2" = self.by-version."ms"."0.6.2"; by-version."ms"."0.6.2" = self.buildNodePackage { @@ -2379,20 +4007,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."multiparty"."3.3.2" = - self.by-version."multiparty"."3.3.2"; - by-version."multiparty"."3.3.2" = self.buildNodePackage { - name = "multiparty-3.3.2"; - version = "3.3.2"; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; - name = "multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; deps = { - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0"; }; optionalDependencies = { }; @@ -2419,42 +4045,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."nan"."~1.6.2" = - self.by-version."nan"."1.6.2"; - by-spec."nano"."^5.8.0" = - self.by-version."nano"."5.12.2"; - by-version."nano"."5.12.2" = self.buildNodePackage { - name = "nano-5.12.2"; - version = "5.12.2"; + by-spec."nan"."~1.0.0" = + self.by-version."nan"."1.0.0"; + by-version."nan"."1.0.0" = self.buildNodePackage { + name = "nan-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/nano/-/nano-5.12.2.tgz"; - name = "nano-5.12.2.tgz"; - sha1 = "b51c9c5e4045c4a71fe3bf6a1f46f0ac2426a17c"; - }; - deps = { - "request-2.42.0" = self.by-version."request"."2.42.0"; - "follow-0.11.4" = self.by-version."follow"."0.11.4"; - "errs-0.3.2" = self.by-version."errs"."0.3.2"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "nano" = self.by-version."nano"."5.12.2"; - by-spec."native-or-bluebird"."~1.1.2" = - self.by-version."native-or-bluebird"."1.1.2"; - by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage { - name = "native-or-bluebird-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; - name = "native-or-bluebird-1.1.2.tgz"; - sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + name = "nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; }; deps = { }; @@ -2464,16 +4064,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."negotiator"."0.5.1" = - self.by-version."negotiator"."0.5.1"; - by-version."negotiator"."0.5.1" = self.buildNodePackage { - name = "negotiator-0.5.1"; - version = "0.5.1"; + by-spec."nan"."~1.8.4" = + self.by-version."nan"."1.8.4"; + by-version."nan"."1.8.4" = self.buildNodePackage { + name = "nan-1.8.4"; + version = "1.8.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"; - name = "negotiator-0.5.1.tgz"; - sha1 = "498f661c522470153c6086ac83019cb3eb66f61c"; + url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; + name = "nan-1.8.4.tgz"; + sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; }; deps = { }; @@ -2483,41 +4083,21 @@ os = [ ]; cpu = [ ]; }; - by-spec."node-dogstatsd"."0.0.5" = - self.by-version."node-dogstatsd"."0.0.5"; - by-version."node-dogstatsd"."0.0.5" = self.buildNodePackage { - name = "node-dogstatsd-0.0.5"; - version = "0.0.5"; + by-spec."nconf"."^0.6.9" = + self.by-version."nconf"."0.6.9"; + by-version."nconf"."0.6.9" = self.buildNodePackage { + name = "nconf-0.6.9"; + version = "0.6.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-dogstatsd/-/node-dogstatsd-0.0.5.tgz"; - name = "node-dogstatsd-0.0.5.tgz"; - sha1 = "5b1bc12e7c2f1cab65c6081f43cee27eb359316e"; + url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + name = "nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }; deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ "linux" "darwin" "freebsd" ]; - cpu = [ ]; - }; - "node-dogstatsd" = self.by-version."node-dogstatsd"."0.0.5"; - by-spec."node-persist"."0.0.2" = - self.by-version."node-persist"."0.0.2"; - by-version."node-persist"."0.0.2" = self.buildNodePackage { - name = "node-persist-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-persist/-/node-persist-0.0.2.tgz"; - name = "node-persist-0.0.2.tgz"; - sha1 = "a4999e81d5f3f605df267abf314b7f03b8e6823b"; - }; - deps = { - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "sugar-1.3.9" = self.by-version."sugar"."1.3.9"; + "async-0.2.9" = self.by-version."async"."0.2.9"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; + "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; }; optionalDependencies = { }; @@ -2525,39 +4105,17 @@ os = [ ]; cpu = [ ]; }; - "node-persist" = self.by-version."node-persist"."0.0.2"; - by-spec."node-schedule"."^0.1.13" = - self.by-version."node-schedule"."0.1.16"; - by-version."node-schedule"."0.1.16" = self.buildNodePackage { - name = "node-schedule-0.1.16"; - version = "0.1.16"; + "nconf" = self.by-version."nconf"."0.6.9"; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = self.buildNodePackage { + name = "negotiator-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-schedule/-/node-schedule-0.1.16.tgz"; - name = "node-schedule-0.1.16.tgz"; - sha1 = "1bbc74bd03141b9bb8c1135978d3b63995ddbf94"; - }; - deps = { - "cron-parser-0.3.6" = self.by-version."cron-parser"."0.3.6"; - "long-timeout-0.0.2" = self.by-version."long-timeout"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "node-schedule" = self.by-version."node-schedule"."0.1.16"; - by-spec."node-statsd"."^0.1.0" = - self.by-version."node-statsd"."0.1.1"; - by-version."node-statsd"."0.1.1" = self.buildNodePackage { - name = "node-statsd-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-statsd/-/node-statsd-0.1.1.tgz"; - name = "node-statsd-0.1.1.tgz"; - sha1 = "27a59348763d0af7a037ac2a031fef3f051013d3"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; deps = { }; @@ -2567,8 +4125,35 @@ os = [ ]; cpu = [ ]; }; - "node-statsd" = self.by-version."node-statsd"."0.1.1"; - by-spec."node-uuid"."~1.4.0" = + by-spec."node-pre-gyp"."~0.6.7" = + self.by-version."node-pre-gyp"."0.6.7"; + by-version."node-pre-gyp"."0.6.7" = self.buildNodePackage { + name = "node-pre-gyp-0.6.7"; + version = "0.6.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.7.tgz"; + name = "node-pre-gyp-0.6.7.tgz"; + sha1 = "4c3ee4ac2934b0b27fead6bc76391c0dccf38ea8"; + }; + deps = { + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0"; + "request-2.55.0" = self.by-version."request"."2.55.0"; + "semver-4.3.4" = self.by-version."semver"."4.3.4"; + "tar-2.1.1" = self.by-version."tar"."2.1.1"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rc-1.0.1" = self.by-version."rc"."1.0.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."^1.4.1" = self.by-version."node-uuid"."1.4.3"; by-version."node-uuid"."1.4.3" = self.buildNodePackage { name = "node-uuid-1.4.3"; @@ -2587,18 +4172,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."oauth-sign"."~0.2.0" = - self.by-version."oauth-sign"."0.2.0"; - by-version."oauth-sign"."0.2.0" = self.buildNodePackage { - name = "oauth-sign-0.2.0"; - version = "0.2.0"; - bin = false; + "node-uuid" = self.by-version."node-uuid"."1.4.3"; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.3"; + by-spec."nopt"."3.x" = + self.by-version."nopt"."3.0.1"; + by-version."nopt"."3.0.1" = self.buildNodePackage { + name = "nopt-3.0.1"; + version = "3.0.1"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; - name = "oauth-sign-0.2.0.tgz"; - sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; + name = "nopt-3.0.1.tgz"; + sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; }; deps = { + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; optionalDependencies = { }; @@ -2606,16 +4195,40 @@ os = [ ]; cpu = [ ]; }; - by-spec."oauth-sign"."~0.4.0" = - self.by-version."oauth-sign"."0.4.0"; - by-version."oauth-sign"."0.4.0" = self.buildNodePackage { - name = "oauth-sign-0.4.0"; - version = "0.4.0"; + by-spec."nopt"."~3.0.1" = + self.by-version."nopt"."3.0.1"; + by-spec."npmlog"."~1.2.0" = + self.by-version."npmlog"."1.2.0"; + by-version."npmlog"."1.2.0" = self.buildNodePackage { + name = "npmlog-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - name = "oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz"; + name = "npmlog-1.2.0.tgz"; + sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb"; + }; + deps = { + "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; + "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4"; + "gauge-1.2.0" = self.by-version."gauge"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = self.buildNodePackage { + name = "oauth-sign-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; deps = { }; @@ -2645,15 +4258,15 @@ cpu = [ ]; }; by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.0"; - by-version."on-finished"."2.2.0" = self.buildNodePackage { - name = "on-finished-2.2.0"; - version = "2.2.0"; + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = self.buildNodePackage { + name = "on-finished-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz"; - name = "on-finished-2.2.0.tgz"; - sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }; deps = { "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; @@ -2664,6 +4277,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."on-finished"."~2.2.1" = + self.by-version."on-finished"."2.2.1"; by-spec."on-headers"."~1.0.0" = self.by-version."on-headers"."1.0.0"; by-version."on-headers"."1.0.0" = self.buildNodePackage { @@ -2683,6 +4298,88 @@ os = [ ]; cpu = [ ]; }; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.2"; + by-version."once"."1.3.2" = self.buildNodePackage { + name = "once-1.3.2"; + version = "1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; + name = "once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }; + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."once"."~1.1.1" = + self.by-version."once"."1.1.1"; + by-version."once"."1.1.1" = self.buildNodePackage { + name = "once-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + name = "once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."0.6.0" = + self.by-version."optimist"."0.6.0"; + by-version."optimist"."0.6.0" = self.buildNodePackage { + name = "optimist-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.3" = + self.by-version."optimist"."0.3.7"; + by-version."optimist"."0.3.7" = self.buildNodePackage { + name = "optimist-0.3.7"; + version = "0.3.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.3.5" = + self.by-version."optimist"."0.3.7"; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = self.buildNodePackage { @@ -2721,16 +4418,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."pause"."0.0.1" = - self.by-version."pause"."0.0.1"; - by-version."pause"."0.0.1" = self.buildNodePackage { - name = "pause-0.0.1"; - version = "0.0.1"; + by-spec."path-to-regexp"."0.1.3" = + self.by-version."path-to-regexp"."0.1.3"; + by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { + name = "path-to-regexp-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - name = "pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + name = "path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; }; deps = { }; @@ -2759,41 +4456,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."posix"."^2.0.0" = - self.by-version."posix"."2.0.0"; - by-version."posix"."2.0.0" = self.buildNodePackage { - name = "posix-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz"; - name = "posix-2.0.0.tgz"; - sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d"; - }; - deps = { - "nan-1.6.2" = self.by-version."nan"."1.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "posix" = self.by-version."posix"."2.0.0"; by-spec."proxy-addr"."~1.0.7" = - self.by-version."proxy-addr"."1.0.7"; - by-version."proxy-addr"."1.0.7" = self.buildNodePackage { - name = "proxy-addr-1.0.7"; - version = "1.0.7"; + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = self.buildNodePackage { + name = "proxy-addr-1.0.8"; + version = "1.0.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz"; - name = "proxy-addr-1.0.7.tgz"; - sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; }; deps = { "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; }; optionalDependencies = { }; @@ -2801,45 +4477,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.2"; - by-version."punycode"."1.3.2" = self.buildNodePackage { - name = "punycode-1.3.2"; - version = "1.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - name = "punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."q"."~1.0.0" = - self.by-version."q"."1.0.1"; - by-version."q"."1.0.1" = self.buildNodePackage { - name = "q-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; - name = "q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "q" = self.by-version."q"."1.0.1"; by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = self.buildNodePackage { @@ -2878,16 +4515,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."qs"."~0.5.4" = - self.by-version."qs"."0.5.6"; - by-version."qs"."0.5.6" = self.buildNodePackage { - name = "qs-0.5.6"; - version = "0.5.6"; + by-spec."qs"."2.4.2" = + self.by-version."qs"."2.4.2"; + by-version."qs"."2.4.2" = self.buildNodePackage { + name = "qs-2.4.2"; + version = "2.4.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; - name = "qs-0.5.6.tgz"; - sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + name = "qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; }; deps = { }; @@ -2897,35 +4534,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."qs"."~1.2.0" = - self.by-version."qs"."1.2.2"; - by-version."qs"."1.2.2" = self.buildNodePackage { - name = "qs-1.2.2"; - version = "1.2.2"; + by-spec."qs"."~1.0.0" = + self.by-version."qs"."1.0.2"; + by-version."qs"."1.0.2" = self.buildNodePackage { + name = "qs-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - name = "qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.3.1" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; + name = "qs-1.0.2.tgz"; + sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768"; }; deps = { }; @@ -2935,6 +4553,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."qs"."~2.4.0" = + self.by-version."qs"."2.4.2"; by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = self.buildNodePackage { @@ -2954,20 +4574,43 @@ os = [ ]; cpu = [ ]; }; - by-spec."raw-body"."1.3.3" = - self.by-version."raw-body"."1.3.3"; - by-version."raw-body"."1.3.3" = self.buildNodePackage { - name = "raw-body-1.3.3"; - version = "1.3.3"; + by-spec."raw-body"."~2.0.1" = + self.by-version."raw-body"."2.0.1"; + by-version."raw-body"."2.0.1" = self.buildNodePackage { + name = "raw-body-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"; - name = "raw-body-1.3.3.tgz"; - sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; + name = "raw-body-2.0.1.tgz"; + sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; }; deps = { - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rc"."~1.0.1" = + self.by-version."rc"."1.0.1"; + by-version."rc"."1.0.1" = self.buildNodePackage { + name = "rc-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz"; + name = "rc-1.0.1.tgz"; + sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8"; + }; + deps = { + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; optionalDependencies = { }; @@ -2998,30 +4641,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = self.buildNodePackage { - name = "readable-stream-1.0.33"; - version = "1.0.33"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.1.8" = + by-spec."readable-stream"."^1.1.12" = self.by-version."readable-stream"."1.1.13"; by-version."readable-stream"."1.1.13" = self.buildNodePackage { name = "readable-stream-1.1.13"; @@ -3044,20 +4664,24 @@ os = [ ]; cpu = [ ]; }; - by-spec."readable-stream"."~1.1.9" = + by-spec."readable-stream"."^1.1.13" = self.by-version."readable-stream"."1.1.13"; - by-spec."redis"."^0.10.1" = - self.by-version."redis"."0.10.3"; - by-version."redis"."0.10.3" = self.buildNodePackage { - name = "redis-0.10.3"; - version = "0.10.3"; + by-spec."readable-stream"."~1.0.2" = + self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = self.buildNodePackage { + name = "readable-stream-1.0.33"; + version = "1.0.33"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - name = "redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; }; deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; optionalDependencies = { }; @@ -3065,7 +4689,8 @@ os = [ ]; cpu = [ ]; }; - "redis" = self.by-version."redis"."0.10.3"; + by-spec."readable-stream"."~1.0.26" = + self.by-version."readable-stream"."1.0.33"; by-spec."reduce-component"."1.0.1" = self.by-version."reduce-component"."1.0.1"; by-version."reduce-component"."1.0.1" = self.buildNodePackage { @@ -3085,101 +4710,30 @@ os = [ ]; cpu = [ ]; }; - by-spec."request"."2.16.x" = - self.by-version."request"."2.16.6"; - by-version."request"."2.16.6" = self.buildNodePackage { - name = "request-2.16.6"; - version = "2.16.6"; + by-spec."request"."2.40.0" = + self.by-version."request"."2.40.0"; + by-version."request"."2.40.0" = self.buildNodePackage { + name = "request-2.40.0"; + version = "2.40.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; - name = "request-2.16.6.tgz"; - sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz"; + name = "request-2.40.0.tgz"; + sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67"; }; deps = { - "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; - "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; - "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; - "forever-agent-0.2.0" = self.by-version."forever-agent"."0.2.0"; - "tunnel-agent-0.2.0" = self.by-version."tunnel-agent"."0.2.0"; - "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; - "qs-0.5.6" = self.by-version."qs"."0.5.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.34.0" = - self.by-version."request"."2.53.0"; - by-version."request"."2.53.0" = self.buildNodePackage { - name = "request-2.53.0"; - version = "2.53.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz"; - name = "request-2.53.0.tgz"; - sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "request" = self.by-version."request"."2.53.0"; - by-spec."request"."^2.44.0" = - self.by-version."request"."2.53.0"; - by-spec."request"."~2.42.0" = - self.by-version."request"."2.42.0"; - by-version."request"."2.42.0" = self.buildNodePackage { - name = "request-2.42.0"; - version = "2.42.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz"; - name = "request-2.42.0.tgz"; - sha1 = "572bd0148938564040ac7ab148b96423a063304a"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "qs-1.2.2" = self.by-version."qs"."1.2.2"; + "qs-1.0.2" = self.by-version."qs"."1.0.2"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; }; optionalDependencies = { - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; @@ -3188,20 +4742,36 @@ os = [ ]; cpu = [ ]; }; - by-spec."response-time"."~2.3.0" = - self.by-version."response-time"."2.3.0"; - by-version."response-time"."2.3.0" = self.buildNodePackage { - name = "response-time-2.3.0"; - version = "2.3.0"; + by-spec."request"."2.x" = + self.by-version."request"."2.55.0"; + by-version."request"."2.55.0" = self.buildNodePackage { + name = "request-2.55.0"; + version = "2.55.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz"; - name = "response-time-2.3.0.tgz"; - sha1 = "27cf2194fa373ef02c04781287416a3138060b68"; + url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz"; + name = "request-2.55.0.tgz"; + sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d"; }; deps = { - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "bl-0.9.4" = self.by-version."bl"."0.9.4"; + "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; + "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; + "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + "har-validator-1.7.0" = self.by-version."har-validator"."1.7.0"; }; optionalDependencies = { }; @@ -3209,44 +4779,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."ripple-lib"."0.12.0" = - self.by-version."ripple-lib"."0.12.0"; - by-version."ripple-lib"."0.12.0" = self.buildNodePackage { - name = "ripple-lib-0.12.0"; - version = "0.12.0"; - bin = false; + by-spec."require-directory"."^1.2.0" = + self.by-version."require-directory"."1.2.0"; + by-version."require-directory"."1.2.0" = self.buildNodePackage { + name = "require-directory-1.2.0"; + version = "1.2.0"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.0.tgz"; - name = "ripple-lib-0.12.0.tgz"; - sha1 = "8bbefa8250bf09e148c4997c27bbca70c7030b55"; - }; - deps = { - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bignumber.js-2.0.3" = self.by-version."bignumber.js"."2.0.3"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "lodash-3.5.0" = self.by-version."lodash"."3.5.0"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "ripple-wallet-generator-1.0.1" = self.by-version."ripple-wallet-generator"."1.0.1"; - "ws-0.7.1" = self.by-version."ws"."0.7.1"; - "superagent-0.18.2" = self.by-version."superagent"."0.18.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ripple-lib" = self.by-version."ripple-lib"."0.12.0"; - by-spec."ripple-wallet-generator"."1.0.1" = - self.by-version."ripple-wallet-generator"."1.0.1"; - by-version."ripple-wallet-generator"."1.0.1" = self.buildNodePackage { - name = "ripple-wallet-generator-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz"; - name = "ripple-wallet-generator-1.0.1.tgz"; - sha1 = "fd9311c0c620c1bd51808a76a3f2a946293d459a"; + url = "http://registry.npmjs.org/require-directory/-/require-directory-1.2.0.tgz"; + name = "require-directory-1.2.0.tgz"; + sha1 = "35ff45a82ab73ca6ca35c746c0a17014371e1afd"; }; deps = { }; @@ -3256,16 +4798,17 @@ os = [ ]; cpu = [ ]; }; - by-spec."rndm"."~1.1.0" = - self.by-version."rndm"."1.1.0"; - by-version."rndm"."1.1.0" = self.buildNodePackage { - name = "rndm-1.1.0"; - version = "1.1.0"; + "require-directory" = self.by-version."require-directory"."1.2.0"; + by-spec."resolve"."0.7.x" = + self.by-version."resolve"."0.7.4"; + by-version."resolve"."0.7.4" = self.buildNodePackage { + name = "resolve-0.7.4"; + version = "0.7.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"; - name = "rndm-1.1.0.tgz"; - sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"; + name = "resolve-0.7.4.tgz"; + sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69"; }; deps = { }; @@ -3275,16 +4818,163 @@ os = [ ]; cpu = [ ]; }; - by-spec."scmp"."1.0.0" = - self.by-version."scmp"."1.0.0"; - by-version."scmp"."1.0.0" = self.buildNodePackage { - name = "scmp-1.0.0"; + by-spec."resolve"."~1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = self.buildNodePackage { + name = "resolve-1.0.0"; version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; - name = "scmp-1.0.0.tgz"; - sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.3.3"; + by-version."rimraf"."2.3.3" = self.buildNodePackage { + name = "rimraf-2.3.3"; + version = "2.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz"; + name = "rimraf-2.3.3.tgz"; + sha1 = "d0073d8b3010611e8f3ad377b08e9a3c18b98f06"; + }; + deps = { + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."~2.2.0" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = self.buildNodePackage { + name = "rimraf-2.2.8"; + version = "2.2.8"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."~2.3.2" = + self.by-version."rimraf"."2.3.3"; + by-spec."ripple-lib"."^0.12.3" = + self.by-version."ripple-lib"."0.12.4"; + by-version."ripple-lib"."0.12.4" = self.buildNodePackage { + name = "ripple-lib-0.12.4"; + version = "0.12.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.4.tgz"; + name = "ripple-lib-0.12.4.tgz"; + sha1 = "97675f9ae92bda1397deaaad70a76955d14f91fd"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "bignumber.js-2.0.7" = self.by-version."bignumber.js"."2.0.7"; + "extend-1.2.1" = self.by-version."extend"."1.2.1"; + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2"; + "ripple-wallet-generator-1.0.3" = self.by-version."ripple-wallet-generator"."1.0.3"; + "ws-0.7.1" = self.by-version."ws"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ripple-lib" = self.by-version."ripple-lib"."0.12.4"; + by-spec."ripple-lib-transactionparser"."^0.3.2" = + self.by-version."ripple-lib-transactionparser"."0.3.2"; + by-version."ripple-lib-transactionparser"."0.3.2" = self.buildNodePackage { + name = "ripple-lib-transactionparser-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.3.2.tgz"; + name = "ripple-lib-transactionparser-0.3.2.tgz"; + sha1 = "cf85e44f9f623798b68f664244e026956092f874"; + }; + deps = { + "bignumber.js-1.4.1" = self.by-version."bignumber.js"."1.4.1"; + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ripple-lib-transactionparser" = self.by-version."ripple-lib-transactionparser"."0.3.2"; + by-spec."ripple-wallet-generator"."^1.0.3" = + self.by-version."ripple-wallet-generator"."1.0.3"; + by-version."ripple-wallet-generator"."1.0.3" = self.buildNodePackage { + name = "ripple-wallet-generator-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.3.tgz"; + name = "ripple-wallet-generator-1.0.3.tgz"; + sha1 = "2a1f0f6e2a39998fcf8fa89a55cb5c999cdb86ca"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."samsam"."~1.1" = + self.by-version."samsam"."1.1.2"; + by-version."samsam"."1.1.2" = self.buildNodePackage { + name = "samsam-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + name = "samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."semver"."~4.3.2" = + self.by-version."semver"."4.3.4"; + by-version."semver"."4.3.4" = self.buildNodePackage { + name = "semver-4.3.4"; + version = "4.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.3.4.tgz"; + name = "semver-4.3.4.tgz"; + sha1 = "bf43a1aae304de040e12a13f84200ca7aeab7589"; }; deps = { }; @@ -3307,14 +4997,14 @@ }; deps = { "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "mime-1.3.4" = self.by-version."mime"."1.3.4"; "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; optionalDependencies = { @@ -3323,55 +5013,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."serve-favicon"."~2.2.0" = - self.by-version."serve-favicon"."2.2.0"; - by-version."serve-favicon"."2.2.0" = self.buildNodePackage { - name = "serve-favicon-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; - name = "serve-favicon-2.2.0.tgz"; - sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; - }; - deps = { - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-index"."~1.6.3" = - self.by-version."serve-index"."1.6.3"; - by-version."serve-index"."1.6.3" = self.buildNodePackage { - name = "serve-index-1.6.3"; - version = "1.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz"; - name = "serve-index-1.6.3.tgz"; - sha1 = "639056494ea59470a2c9518c28e7f225a342fd79"; - }; - deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; - "batch-0.5.2" = self.by-version."batch"."0.5.2"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."serve-static"."~1.9.2" = self.by-version."serve-static"."1.9.2"; by-version."serve-static"."1.9.2" = self.buildNodePackage { @@ -3414,19 +5055,21 @@ os = [ ]; cpu = [ ]; }; - by-spec."sntp"."0.1.x" = - self.by-version."sntp"."0.1.4"; - by-version."sntp"."0.1.4" = self.buildNodePackage { - name = "sntp-0.1.4"; - version = "0.1.4"; + by-spec."sinon".">=1.4.0 <2" = + self.by-version."sinon"."1.14.1"; + by-version."sinon"."1.14.1" = self.buildNodePackage { + name = "sinon-1.14.1"; + version = "1.14.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; - name = "sntp-0.1.4.tgz"; - sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz"; + name = "sinon-1.14.1.tgz"; + sha1 = "d82797841918734507c94b7a73e3f560904578ad"; }; deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + "formatio-1.1.1" = self.by-version."formatio"."1.1.1"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "lolex-1.1.0" = self.by-version."lolex"."1.1.0"; }; optionalDependencies = { }; @@ -3434,6 +5077,50 @@ os = [ ]; cpu = [ ]; }; + by-spec."sinon"."~1.10.0" = + self.by-version."sinon"."1.10.3"; + by-version."sinon"."1.10.3" = self.buildNodePackage { + name = "sinon-1.10.3"; + version = "1.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz"; + name = "sinon-1.10.3.tgz"; + sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c"; + }; + deps = { + "formatio-1.0.2" = self.by-version."formatio"."1.0.2"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sinon" = self.by-version."sinon"."1.10.3"; + by-spec."sinon-chai"."^2.5.0" = + self.by-version."sinon-chai"."2.7.0"; + by-version."sinon-chai"."2.7.0" = self.buildNodePackage { + name = "sinon-chai-2.7.0"; + version = "2.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sinon-chai/-/sinon-chai-2.7.0.tgz"; + name = "sinon-chai-2.7.0.tgz"; + sha1 = "493df3a3d758933fdd3678d011a4f738d5e72540"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = [ + self.by-version."chai"."2.3.0" + self.by-version."sinon"."1.14.1"]; + os = [ ]; + cpu = [ ]; + }; + "sinon-chai" = self.by-version."sinon-chai"."2.7.0"; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = self.buildNodePackage { @@ -3466,7 +5153,7 @@ sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; }; optionalDependencies = { }; @@ -3474,6 +5161,69 @@ os = [ ]; cpu = [ ]; }; + by-spec."source-map"."~0.1.33" = + self.by-version."source-map"."0.1.43"; + by-version."source-map"."0.1.43" = self.buildNodePackage { + name = "source-map-0.1.43"; + version = "0.1.43"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + name = "source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + deps = { + "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."source-map"."~0.1.7" = + self.by-version."source-map"."0.1.43"; + by-spec."sprintf-js"."~1.0.2" = + self.by-version."sprintf-js"."1.0.2"; + by-version."sprintf-js"."1.0.2" = self.buildNodePackage { + name = "sprintf-js-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"; + name = "sprintf-js-1.0.2.tgz"; + sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sqlite3"."^3.0.2" = + self.by-version."sqlite3"."3.0.8"; + by-version."sqlite3"."3.0.8" = self.buildNodePackage { + name = "sqlite3-3.0.8"; + version = "3.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sqlite3/-/sqlite3-3.0.8.tgz"; + name = "sqlite3-3.0.8.tgz"; + sha1 = "662d6507426ba2af0cdaf894a1766c8099c0e435"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + "node-pre-gyp-0.6.7" = self.by-version."node-pre-gyp"."0.6.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sqlite3" = self.by-version."sqlite3"."3.0.8"; by-spec."stack-trace"."0.0.x" = self.by-version."stack-trace"."0.0.9"; by-version."stack-trace"."0.0.9" = self.buildNodePackage { @@ -3493,45 +5243,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."statuses"."1" = - self.by-version."statuses"."1.2.1"; - by-version."statuses"."1.2.1" = self.buildNodePackage { - name = "statuses-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - name = "statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stream-counter"."~0.2.0" = - self.by-version."stream-counter"."0.2.0"; - by-version."stream-counter"."0.2.0" = self.buildNodePackage { - name = "stream-counter-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - name = "stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; - }; - deps = { - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.31"; by-version."string_decoder"."0.10.31" = self.buildNodePackage { @@ -3570,16 +5281,56 @@ os = [ ]; cpu = [ ]; }; - by-spec."sugar"."~1.3.8" = - self.by-version."sugar"."1.3.9"; - by-version."sugar"."1.3.9" = self.buildNodePackage { - name = "sugar-1.3.9"; - version = "1.3.9"; - bin = false; + by-spec."strip-ansi"."^0.3.0" = + self.by-version."strip-ansi"."0.3.0"; + by-version."strip-ansi"."0.3.0" = self.buildNodePackage { + name = "strip-ansi-0.3.0"; + version = "0.3.0"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/sugar/-/sugar-1.3.9.tgz"; - name = "sugar-1.3.9.tgz"; - sha1 = "f879c6c87721252b51fd0b6520412d98d83cb179"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + name = "strip-ansi-0.3.0.tgz"; + sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-ansi"."^2.0.1" = + self.by-version."strip-ansi"."2.0.1"; + by-version."strip-ansi"."2.0.1" = self.buildNodePackage { + name = "strip-ansi-2.0.1"; + version = "2.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; + name = "strip-ansi-2.0.1.tgz"; + sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; + }; + deps = { + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-json-comments"."0.1.x" = + self.by-version."strip-json-comments"."0.1.3"; + by-version."strip-json-comments"."0.1.3" = self.buildNodePackage { + name = "strip-json-comments-0.1.3"; + version = "0.1.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; + name = "strip-json-comments-0.1.3.tgz"; + sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; }; deps = { }; @@ -3589,28 +5340,28 @@ os = [ ]; cpu = [ ]; }; - by-spec."superagent"."^0.18.0" = - self.by-version."superagent"."0.18.2"; - by-version."superagent"."0.18.2" = self.buildNodePackage { - name = "superagent-0.18.2"; - version = "0.18.2"; + by-spec."superagent"."0.18.0" = + self.by-version."superagent"."0.18.0"; + by-version."superagent"."0.18.0" = self.buildNodePackage { + name = "superagent-0.18.0"; + version = "0.18.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz"; - name = "superagent-0.18.2.tgz"; - sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz"; + name = "superagent-0.18.0.tgz"; + sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62"; }; deps = { "qs-0.6.6" = self.by-version."qs"."0.6.6"; "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.2.5" = self.by-version."mime"."1.2.5"; "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-1.0.1" = self.by-version."methods"."1.0.1"; - "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "methods-0.0.1" = self.by-version."methods"."0.0.1"; + "cookiejar-1.3.2" = self.by-version."cookiejar"."1.3.2"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; + "form-data-0.1.2" = self.by-version."form-data"."0.1.2"; "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; }; optionalDependencies = { @@ -3619,19 +5370,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = self.buildNodePackage { - name = "tough-cookie-0.12.1"; - version = "0.12.1"; + by-spec."supertest"."^0.13.0" = + self.by-version."supertest"."0.13.0"; + by-version."supertest"."0.13.0" = self.buildNodePackage { + name = "supertest-0.13.0"; + version = "0.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz"; + name = "supertest-0.13.0.tgz"; + sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f"; }; deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + "superagent-0.18.0" = self.by-version."superagent"."0.18.0"; + "methods-1.0.0" = self.by-version."methods"."1.0.0"; }; optionalDependencies = { }; @@ -3639,16 +5391,185 @@ os = [ ]; cpu = [ ]; }; - by-spec."tunnel-agent"."~0.2.0" = - self.by-version."tunnel-agent"."0.2.0"; - by-version."tunnel-agent"."0.2.0" = self.buildNodePackage { - name = "tunnel-agent-0.2.0"; + "supertest" = self.by-version."supertest"."0.13.0"; + by-spec."supports-color"."^0.2.0" = + self.by-version."supports-color"."0.2.0"; + by-version."supports-color"."0.2.0" = self.buildNodePackage { + name = "supports-color-0.2.0"; version = "0.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; + name = "supports-color-0.2.0.tgz"; + sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."^1.3.0" = + self.by-version."supports-color"."1.3.1"; + by-version."supports-color"."1.3.1" = self.buildNodePackage { + name = "supports-color-1.3.1"; + version = "1.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; + name = "supports-color-1.3.1.tgz"; + sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."~1.2.0" = + self.by-version."supports-color"."1.2.1"; + by-version."supports-color"."1.2.1" = self.buildNodePackage { + name = "supports-color-1.2.1"; + version = "1.2.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"; + name = "supports-color-1.2.1.tgz"; + sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar"."~0.1.17" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = self.buildNodePackage { + name = "tar-0.1.20"; + version = "0.1.20"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; - name = "tunnel-agent-0.2.0.tgz"; - sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }; + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar"."~2.1.0" = + self.by-version."tar"."2.1.1"; + by-version."tar"."2.1.1" = self.buildNodePackage { + name = "tar-2.1.1"; + version = "2.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-2.1.1.tgz"; + name = "tar-2.1.1.tgz"; + sha1 = "ac0649e135fa4546e430c7698514e1da2e8a7cc4"; + }; + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-1.0.6" = self.by-version."fstream"."1.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar-pack"."~2.0.0" = + self.by-version."tar-pack"."2.0.0"; + by-version."tar-pack"."2.0.0" = self.buildNodePackage { + name = "tar-pack-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; + name = "tar-pack-2.0.0.tgz"; + sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; + }; + deps = { + "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tildify"."~1.0.0" = + self.by-version."tildify"."1.0.0"; + by-version."tildify"."1.0.0" = self.buildNodePackage { + name = "tildify-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz"; + name = "tildify-1.0.0.tgz"; + sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"; + }; + deps = { + "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tinycolor"."0.x" = + self.by-version."tinycolor"."0.0.1"; + by-version."tinycolor"."0.0.1" = self.buildNodePackage { + name = "tinycolor-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."1.1.0"; + by-version."tough-cookie"."1.1.0" = self.buildNodePackage { + name = "tough-cookie-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; + name = "tough-cookie-1.1.0.tgz"; + sha1 = "126d2490e66ae5286b6863debd4a341076915954"; }; deps = { }; @@ -3677,20 +5598,39 @@ os = [ ]; cpu = [ ]; }; - by-spec."type-is"."~1.6.1" = - self.by-version."type-is"."1.6.1"; - by-version."type-is"."1.6.1" = self.buildNodePackage { - name = "type-is-1.6.1"; - version = "1.6.1"; + by-spec."type-detect"."0.1.1" = + self.by-version."type-detect"."0.1.1"; + by-version."type-detect"."0.1.1" = self.buildNodePackage { + name = "type-detect-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz"; - name = "type-is-1.6.1.tgz"; - sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e"; + url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + name = "type-detect-0.1.1.tgz"; + sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."type-is"."~1.6.1" = + self.by-version."type-is"."1.6.2"; + by-version."type-is"."1.6.2" = self.buildNodePackage { + name = "type-is-1.6.2"; + version = "1.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; + name = "type-is-1.6.2.tgz"; + sha1 = "694e83e5d110417e681cea278227f264ae406e33"; }; deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; }; optionalDependencies = { }; @@ -3698,20 +5638,42 @@ os = [ ]; cpu = [ ]; }; - by-spec."uid-safe"."1.1.0" = - self.by-version."uid-safe"."1.1.0"; - by-version."uid-safe"."1.1.0" = self.buildNodePackage { - name = "uid-safe-1.1.0"; - version = "1.1.0"; - bin = false; + by-spec."type-is"."~1.6.2" = + self.by-version."type-is"."1.6.2"; + by-spec."uglify-js"."~2.3" = + self.by-version."uglify-js"."2.3.6"; + by-version."uglify-js"."2.3.6" = self.buildNodePackage { + name = "uglify-js-2.3.6"; + version = "2.3.6"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; - name = "uid-safe-1.1.0.tgz"; - sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + name = "uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uid-number"."0.0.3" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = self.buildNodePackage { + name = "uid-number-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; }; deps = { - "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; - "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; }; optionalDependencies = { }; @@ -3719,8 +5681,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."uid-safe"."~1.1.0" = - self.by-version."uid-safe"."1.1.0"; by-spec."ultron"."1.0.x" = self.by-version."ultron"."1.0.1"; by-version."ultron"."1.0.1" = self.buildNodePackage { @@ -3740,25 +5700,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."underscore"."~1.4.4" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = self.buildNodePackage { - name = "underscore-1.4.4"; - version = "1.4.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."underscore"."~1.7.0" = self.by-version."underscore"."1.7.0"; by-version."underscore"."1.7.0" = self.buildNodePackage { @@ -3778,6 +5719,44 @@ os = [ ]; cpu = [ ]; }; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = self.buildNodePackage { + name = "underscore.string-2.4.0"; + version = "2.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."user-home"."^1.0.0" = + self.by-version."user-home"."1.1.1"; + by-version."user-home"."1.1.1" = self.buildNodePackage { + name = "user-home-1.1.1"; + version = "1.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; + name = "user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."utf-8-validate"."1.0.x" = self.by-version."utf-8-validate"."1.0.1"; by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { @@ -3799,6 +5778,26 @@ os = [ ]; cpu = [ ]; }; + by-spec."util".">=0.10.3 <1" = + self.by-version."util"."0.10.3"; + by-version."util"."0.10.3" = self.buildNodePackage { + name = "util-0.10.3"; + version = "0.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; + name = "util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."utils-merge"."1.0.0" = self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = self.buildNodePackage { @@ -3837,16 +5836,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."vhost"."~3.0.0" = - self.by-version."vhost"."3.0.0"; - by-version."vhost"."3.0.0" = self.buildNodePackage { - name = "vhost-3.0.0"; - version = "3.0.0"; + by-spec."when"."~3.4.6" = + self.by-version."when"."3.4.6"; + by-version."when"."3.4.6" = self.buildNodePackage { + name = "when-3.4.6"; + version = "3.4.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"; - name = "vhost-3.0.0.tgz"; - sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045"; + url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz"; + name = "when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; }; deps = { }; @@ -3856,24 +5855,43 @@ os = [ ]; cpu = [ ]; }; - by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.3"; - by-version."winston"."0.7.3" = self.buildNodePackage { - name = "winston-0.7.3"; - version = "0.7.3"; - bin = false; + by-spec."which"."1.0.x" = + self.by-version."which"."1.0.9"; + by-version."which"."1.0.9" = self.buildNodePackage { + name = "which-1.0.9"; + version = "1.0.9"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; - name = "winston-0.7.3.tgz"; - sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; + url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz"; + name = "which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."winston"."^1.0.0" = + self.by-version."winston"."1.0.0"; + by-version."winston"."1.0.0" = self.buildNodePackage { + name = "winston-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz"; + name = "winston-1.0.0.tgz"; + sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "colors-1.0.3" = self.by-version."colors"."1.0.3"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; - "request-2.16.6" = self.by-version."request"."2.16.6"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; optionalDependencies = { @@ -3882,7 +5900,90 @@ os = [ ]; cpu = [ ]; }; - "winston" = self.by-version."winston"."0.7.3"; + "winston" = self.by-version."winston"."1.0.0"; + by-spec."wordwrap"."0.0.x" = + self.by-version."wordwrap"."0.0.3"; + by-version."wordwrap"."0.0.3" = self.buildNodePackage { + name = "wordwrap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + name = "wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap".">=0.0.2" = + self.by-version."wordwrap"."1.0.0"; + by-version."wordwrap"."1.0.0" = self.buildNodePackage { + name = "wordwrap-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + name = "wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = self.buildNodePackage { + name = "wrappy-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ws"."^0.4.32" = + self.by-version."ws"."0.4.32"; + by-version."ws"."0.4.32" = self.buildNodePackage { + name = "ws-0.4.32"; + version = "0.4.32"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + name = "ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ws" = self.by-version."ws"."0.4.32"; by-spec."ws"."~0.7.1" = self.by-version."ws"."0.7.1"; by-version."ws"."0.7.1" = self.buildNodePackage { @@ -3906,4 +6007,23 @@ os = [ ]; cpu = [ ]; }; + by-spec."xtend"."^4.0.0" = + self.by-version."xtend"."4.0.0"; + by-version."xtend"."4.0.0" = self.buildNodePackage { + name = "xtend-4.0.0"; + version = "4.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; + name = "xtend-4.0.0.tgz"; + sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; } diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix new file mode 100644 index 00000000000..01fd098c920 --- /dev/null +++ b/pkgs/servers/rippled/ripple-rest.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, nodePackages }: + +with lib; + +let + np = nodePackages.override { generated = ./package.nix; self = np; }; +in nodePackages.buildNodePackage rec { + name = "ripple-rest-${version}"; + version = "1.7.0-rc1"; + + src = fetchFromGitHub { + repo = "ripple-rest"; + owner = "ripple"; + rev = version; + sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues np)); + + meta = { + description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network"; + homepage = https://github.com/ripple/ripple-rest; + maintainers = with maintainers; [ offline ]; + license = [ licenses.mit ]; + }; +} From c46889ea4227418fb31a0562626ffcab20d90890 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 13:55:20 +0200 Subject: [PATCH 145/412] ipsec-tools: apply debians patch to fix CVE-2015-4047 --- .../linux/ipsec-tools/CVE-2015-4047.patch | 16 ++++++++++++++++ pkgs/os-specific/linux/ipsec-tools/default.nix | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch new file mode 100644 index 00000000000..00c23c6cac1 --- /dev/null +++ b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch @@ -0,0 +1,16 @@ +Index: pkg-ipsec-tools/src/racoon/gssapi.c +=================================================================== +--- pkg-ipsec-tools.orig/src/racoon/gssapi.c ++++ pkg-ipsec-tools/src/racoon/gssapi.c +@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) + gss_name_t princ, canon_princ; + OM_uint32 maj_stat, min_stat; + ++ if (iph1->rmconf == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); ++ return -1; ++ } ++ + gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); + if (gps == NULL) { + plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index a6042b1e33b..fc3b0500fed 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline openssl flex kerberos pam ]; - patches = [ ./dont-create-localstatedir-during-install.patch ]; + patches = [ ./dont-create-localstatedir-during-install.patch + ./CVE-2015-4047.patch ]; # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; From 161418537cb09440d83426ad0a0c01aa4b277ebe Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 14:15:07 +0200 Subject: [PATCH 146/412] rippled: Update to 0.28.1 --- nixos/modules/services/misc/rippled.nix | 12 ++++++------ pkgs/servers/rippled/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 03fcc003a40..045330eb551 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -27,7 +27,7 @@ let protocol=${concatStringsSep "," p.protocol} ${optionalString (p.user != "") "user=${p.user}"} ${optionalString (p.password != "") "user=${p.password}"} - admin=${if p.admin then "allow" else "no"} + admin=${concatStringsSep "," p.admin} ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} @@ -118,9 +118,9 @@ let }; admin = mkOption { - description = "Controls whether or not administrative commands are allowed."; - type = types.bool; - default = false; + description = "A comma-separated list of admin IP addresses."; + type = types.listOf types.str; + default = ["127.0.0.1"]; }; ssl = { @@ -156,7 +156,7 @@ let dbOptions = { type = mkOption { description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"]; + type = types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; @@ -217,7 +217,7 @@ in default = { rpc = { port = 5005; - admin = true; + admin = ["127.0.0.1"]; protocol = ["http"]; }; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 6a09d683f8d..99a6879ab92 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.27.4"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3"; + sha256 = "0wh8dwdg0gp7smcx40cpqanl2m2hihmx3irqh692svakbl3df3vz"; }; postPatch = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; - buildPhase = "scons build/rippled"; + buildPhase = "scons"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486c443630c..ef48cc39c37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8988,7 +8988,7 @@ let }; rippled = callPackage ../servers/rippled { - boost = boost155; + boost = boost157; }; ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; From 43c916225553e7003956f29ea38a93328358b036 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 8 Jun 2015 14:32:19 +0200 Subject: [PATCH 147/412] ripple-rest: commit forgotten changes --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d6df939bc3..5fa53334037 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8991,7 +8991,7 @@ let boost = boost155; }; - ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; + ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; s6 = callPackage ../servers/s6 { }; From 87b9cceefd8ad04a6189b41032b55aff8233f31a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Jun 2015 15:00:50 +0200 Subject: [PATCH 148/412] linux-testing: Update to new version 4.1-rc7. Includes fixes for DRM, MIPS, iSCSI, ALSA, USB, bna and wireless and more. Full diff can be found here: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.1-rc7&id2=v4.1-rc6 Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a0d6a926d5..60bc4e51209 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1-rc6"; - modDirVersion = "4.1.0-rc6"; + version = "4.1-rc7"; + modDirVersion = "4.1.0-rc7"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0b8ylsrnvwf0fsq6i0iar7h92z7q3356rh1x3a5wb5p0q5j7lldr"; + sha256 = "09bxkm0nl9vzlfb14500bl6zjzhgacy7y32b3mw1d9hx62yknk2f"; }; features.iwlwifi = true; From 48006ee291dfd9450155b6606ad10c7c92865ca6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 15:53:21 +0200 Subject: [PATCH 149/412] cherrytree: update from 0.35.7 to 0.35.8 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index fa5ae99f4fb..eb73f48559a 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: stdenv.mkDerivation rec { - name = "cherrytree-0.35.7"; + name = "cherrytree-0.35.8"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3"; + sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8"; }; propagatedBuildInputs = [ pythonPackages.sqlite3 ]; From 0ed4ad8c6343f5f6877c67828f5a4d9e26737871 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 16:09:03 +0200 Subject: [PATCH 150/412] pdf2djvu: update from 0.7.17 to 0.7.21, adopt it --- pkgs/tools/typesetting/pdf2djvu/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index b97252e74de..a85aa045b66 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,20 +1,21 @@ -{stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: +{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.7.17"; + version = "0.7.21"; name = "pdf2djvu-${version}"; src = fetchurl { - url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz"; - sha256 = "1nplcabb8526bs5707k9212pi000wnskq3c9hbq9acgmdlnnwvgy"; + url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz"; + sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Creates djvu files from PDF files"; homepage = http://code.google.com/p/pdf2djvu/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; inherit version; }; } From 794feb7879bdf4af140904afe8c6d55ac97ba6e1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 8 Jun 2015 16:17:49 +0200 Subject: [PATCH 151/412] opkg: update from 0.2.4 to 3.0.0 --- pkgs/tools/package-management/opkg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 67c4578ac9a..2a9d167cfcd 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme }: +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl }: stdenv.mkDerivation rec { - version = "0.2.4"; + version = "0.3.0"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "11ih8lay1v7sk5czk3m3cfqil4cp8s7pfz60xnddy7nqazjcfh0g"; + sha256 = "13wqai7lgyfjlqvly0bz786wk9frl16a9yzrn27p3wwfvcf5swvz"; }; - buildInputs = [ pkgconfig curl gpgme ]; + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; From dd6ceb61fa72df71152ae9329b4a1918844b7c54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2015 16:37:27 +0200 Subject: [PATCH 152/412] netsniff-ng -> 0.5.9-10-gb7ece46 --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 44c8bb45b72..a9591a3ecde 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-5-g107456c"; in +let version = "0.5.9-10-gb7ece46"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "107456c646ab38e5ccb6ee788389faced59c16ff"; - sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp"; + rev = "b7ece46f62b1fbece160cc7bd2905a6d0d3970a9"; + sha256 = "1m44ssvkzp4xrkwc61gsmn2vkbmf9r5mp1zjz8cj8w120703cljj"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From b2d300e59bdbcd013d8f65e06fee162f8ae6ec28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2015 16:48:42 +0200 Subject: [PATCH 153/412] boxfs: work around box.com breaking their API See . This should soon be fixed upstream. Until then, any bugs are mine. --- pkgs/tools/filesystems/boxfs/default.nix | 2 ++ .../boxfs/work-around-API-borkage.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index f47107c85fb..69c2d046f1c 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -32,6 +32,8 @@ in stdenv.mkDerivation { cp -a --no-preserve=mode ${libjson} libjson ''; + patches = [ ./work-around-API-borkage.patch ]; + buildInputs = [ curl fuse libxml2 pkgconfig ]; buildFlags = "static"; diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch new file mode 100644 index 00000000000..b74e7f32466 --- /dev/null +++ b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch @@ -0,0 +1,15 @@ +diff --git a/boxapi.c b/boxapi.c +index 4964273..1a32e0d 100644 +--- a/boxapi.c ++++ b/boxapi.c +@@ -38,8 +38,8 @@ + // AUTH + #define API_KEY_VAL "f9ss11y2w0hg5r04jsidxlhk4pil28cf" + #define API_SECRET "r3ZHAIhsOL2FoHjgERI9xf74W5skIM0w" +-#define API_OAUTH_URL "https://app.box.com/api/oauth2/" //"https://www.box.com/api/oauth2/" +-#define API_OAUTH_AUTHORIZE API_OAUTH_URL "authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/ ++#define API_OAUTH_URL "https://api.box.com/oauth2/" //"https://www.box.com/api/oauth2/" ++#define API_OAUTH_AUTHORIZE "https://app.box.com/api/oauth2/authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/ + #define API_OAUTH_TOKEN API_OAUTH_URL "token" + // CALLS + #define API_ENDPOINT "https://api.box.com/2.0/" From d07373c632a7a6346ce15abcb154d7b8534f7616 Mon Sep 17 00:00:00 2001 From: hiberno Date: Mon, 8 Jun 2015 17:45:17 +0200 Subject: [PATCH 154/412] rofi-pass: bump to latest revision --- pkgs/applications/misc/rofi/pass.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index c6b5666921c..8a7382ae737 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "2015-05-29"; + version = "2015-06-08"; src = fetchgit { url = "https://github.com/carnager/rofi-pass"; - rev = "92c26557ec4b0508c563d596291571bbef402899"; - sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng"; + rev = "7e376b5ec64974c4e8478acf3ada8d111896f391"; + sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl"; }; buildInputs = [ rofi wmctrl xprop xdotool ]; From 5647c894c64d69cdc633f4b17fa3242c7f083944 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 8 Jun 2015 18:03:41 +0200 Subject: [PATCH 155/412] Add carddav-util --- .../tools/networking/carddav-util/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/carddav-util/default.nix diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix new file mode 100644 index 00000000000..e6fb4e0130b --- /dev/null +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, python, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "carddav-0.1-2014-02-26"; + + src = fetchgit { + url = git://github.com/ljanyst/carddav-util; + rev = "53b181faff5f154bcd180467dd04c0ce69405564"; + sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; + }; + + buildInputs = [makeWrapper]; + + propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ]; + + doCheck = false; # no test + + installPhase = '' + mkdir -p $out/bin + cp $src/carddav-util.py $out/bin + + pythondir="$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$pythondir" + cp $src/carddav.py "$pythondir" + ''; + + preFixup = '' + wrapProgram "$out/bin/carddav-util.py" \ + --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" \ + --prefix PATH : "$prefix/bin:$PATH" + ''; + + meta = { + homepage = https://github.com/ljanyst/carddav-util; + description = "A CardDAV import/export utility"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c15f9ce0a4..82c9fe6c239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10400,6 +10400,8 @@ let canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; + carddav-util = callPackage ../tools/networking/carddav-util { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python From db10561313613e9f09dc15ffc3fbecaef7f7a1b0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 6 Jun 2015 18:23:23 +0200 Subject: [PATCH 156/412] init AMB-plugins at 0.8.1 --- .../audio/AMB-plugins/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/AMB-plugins/default.nix diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix new file mode 100644 index 00000000000..3ea7b90f84a --- /dev/null +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, ladspaH +}: + +stdenv.mkDerivation rec { + name = "AMB-plugins-${version}"; + version = "0.8.1"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl"; + }; + + buildInputs = [ ladspaH ]; + + patchPhase = '' + sed -i 's@/usr/bin/install@install@g' Makefile + sed -i 's@/bin/rm@rm@g' Makefile + sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + ''; + + preInstall="mkdir -p $out/lib/ladspa"; + + meta = { + description = ''A set of ambisonics ladspa plugins''; + longDescription = '' + Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. + ''; + version = "${version}"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85d8eb924b5..c7a08a42898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10437,6 +10437,8 @@ let tcl = tcl-8_5; }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; From 16165ddc38630d7da0e0bf4a6b3b9347b923b7b4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 8 Jun 2015 19:11:46 +0300 Subject: [PATCH 157/412] install-cd: Include nixos-artwork to fix installer tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should fix at least nixos.tests.installer.simple.x86_64-linux http://hydra.nixos.org/build/23001712: machine# error: cannot download Encode-Locale-1.03.tar.gz from any mirror machine# builder for ‘/nix/store/y8gbx2d2fdcvvjy1z53xksfgq66ydlx0-Encode-Locale-1.03.tar.gz.drv’ failed with exit code 1 machine# cannot build derivation ‘/nix/store/y1knci7rix3asnh2b4kfv8jhl2j99xih-perl-Encode-Locale-1.03.drv’: 1 dependencies couldn't be built machine# cannot build derivation ‘/nix/store/7xspjwh48kg16drv1jjg5cffaqbxbp8p-perl-libwww-perl-6.05.drv’: 1 dependencies couldn't be built machine# cannot build derivation ‘/nix/store/8qsmz3bbk1jwhh50c3i9700bkmn8ns5c-nss-cacert-3.19.1.drv’: 1 dependencies couldn't be built machine# cannot build derivation ‘/nix/store/0rgf2l3mdszs4a989ympwc9gk2k8wq6z-nixos-artwork-e71b684.drv’: 1 dependencies couldn't be built ... --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index a660199cbe0..5bd10823108 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,8 +30,8 @@ with lib; # To speed up installation a little bit, include the complete stdenv # in the Nix store on the CD. Archive::Cpio is needed for the - # initrd builder. - isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + # initrd builder. nixos-artwork is needed for the GRUB background. + isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ]; # EFI booting isoImage.makeEfiBootable = true; From e593a8d3bf8cbc3b3f97b148a2902e970658b3e3 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 8 Jun 2015 19:41:45 +0200 Subject: [PATCH 158/412] zopfli: removed roconnor as a maintainer roconnor was added as a maintainer by accident --- pkgs/tools/compression/zopfli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 93da9b15a9e..354afb8d178 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ roconnor bobvanderlinden ]; + maintainers = with maintainers; [ bobvanderlinden ]; }; } From 240338638e064b786e85a549aa70cb9a5caabc29 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 13:56:14 -0700 Subject: [PATCH 159/412] openjdk7: Fix refernces to the bootstrap --- .../development/compilers/openjdk/default.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 9bdea7bc7ab..be4ca84bd8d 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -203,6 +203,32 @@ let EOF ''; + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR="$(eval echo \$$output)" + BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + meta = { homepage = http://openjdk.java.net/; license = stdenv.lib.licenses.gpl2; From b79a5e812a7f8e15c2af167442fb89da01213041 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 15:36:47 -0700 Subject: [PATCH 160/412] nixos/quassel: Use qt5 instead of qt4 This really speeds up building quassel daemon since qt5 can be built in parallel while qt4 cannot. --- nixos/modules/services/networking/quassel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 579d62884c7..005eb7bd761 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,7 +3,7 @@ with lib; let - quassel = pkgs.kde4.quasselDaemon; + quassel = pkgs.quasselDaemon_qt5; cfg = config.services.quassel; user = if cfg.user != null then cfg.user else "quassel"; in From 6c00f2105ac8cf5fff4661bc803db2b763e74318 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 17:41:10 -0700 Subject: [PATCH 161/412] iw: 3.15 -> 4.1 --- pkgs/os-specific/linux/iw/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 262b673822b..3cd2567d96f 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,18 +1,16 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-3.15"; + name = "iw-4.1"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12jby9nv5nypadgdksbqw0y2kfm3j47zw7a3rwmy56d7rs90lp5x"; + sha256 = "0jx3s5wdvm2qxd3h883fnyjsb1c29qcsz1r19bc029g8v2nalr2i"; }; buildInputs = [ libnl pkgconfig ]; - preBuild = " - makeFlagsArray=(PREFIX=$out) - "; + makeFlags = [ "PREFIX=\${out}" ]; meta = { description = "Tool to use nl80211"; From 8d4c5c956df525e72d4533be1f7d19789b705477 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 17:45:31 -0700 Subject: [PATCH 162/412] ethtool: 3.18 -> 4.0 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index e29c5effbdb..16af347e551 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-3.18"; + name = "ethtool-4.0"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1xj20fr44dk01hghyy5sq962sbiywc88ni3qqliv8bfxzmczwgw1"; + sha256 = "1zzcwn6pk8qfasalqkxg8vrhacksfa50xsq4xifw7yfjqyn8fj4h"; }; meta = with stdenv.lib; { From ddafa487fccea819c8e88c83c7faf7a1f3708f13 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 17:59:09 -0700 Subject: [PATCH 163/412] dnstop: Update to 20140915 --- pkgs/tools/networking/dnstop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index c1a41d98f4b..c19dcae965b 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, ncurses }: -stdenv.mkDerivation { - name = "dnstop-20121017"; +stdenv.mkDerivation rec { + name = "dnstop-20140915"; src = fetchurl { - url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20121017.tar.gz; - sha256 = "1xjrz4dzwshfrlc226s390sbwd10j0pl2al09d62955b6xh2vvba"; + url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz"; + sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l"; }; buildInputs = [ libpcap ncurses ]; From 48381b7621a51512fa0a87f019d5d5915d9f3d20 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Jun 2015 18:32:32 -0700 Subject: [PATCH 164/412] nixos-artwork: Make into a derivation and use fetchfromgithub --- .../services/x11/display-managers/lightdm.nix | 2 +- .../modules/system/boot/loader/grub/grub.nix | 2 +- pkgs/data/misc/nixos-artwork/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +----- 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 pkgs/data/misc/nixos-artwork/default.nix diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f6de8c02b18..d05edabca62 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -104,7 +104,7 @@ in }; background = mkOption { - default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 22af11b484e..0b6333ab573 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -337,7 +337,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix new file mode 100644 index 00000000000..99f3e8b1177 --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "nixos-artwork-2015-02-27"; + # Remember to check the default lightdm wallpaper when updating + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + + installPhase = '' + mkdir -p $out/share/artwork + cp -r * $out/share/artwork + find $out -name \*.xcf -exec rm {} \; + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/NixOS/nixos-artwork"; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7a08a42898..4a20518363e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14422,12 +14422,7 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; - # Remember to check the default lightdm wallpaper - nixos-artwork = fetchgit { - url = "git://github.com/NixOS/nixos-artwork"; - rev = "e71b6846023919136795ede22b16d73b2cf1693d"; - sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; - }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nut = callPackage ../applications/misc/nut { }; From e7c2a58250dfbbfae574ac2d2c04e761174b6fda Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 9 Jun 2015 03:24:18 -0700 Subject: [PATCH 165/412] bump dolphinEmuMaster, now needs gcc5 to compile also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix --- pkgs/misc/emulators/dolphin-emu/master.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index fd293298b45..f742973c08d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,14 +1,14 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb +, openal, libXdmcp, portaudio, SDL, fetchgit, libusb , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150421"; + name = "dolphin-emu-20150609"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5"; - sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d"; + rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; + sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; fetchSubmodules = false; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ]; + git libXdmcp portaudio SDL libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; From 9485bb3fefb802d7ef1ce281ce8fba5279b51291 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 9 Jun 2015 02:36:11 +0200 Subject: [PATCH 166/412] gnome-pomodoro: Fix build for 3.16 --- .../gnome-3/3.16/apps/pomodoro/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix index bce514364ce..ad95b76b2a3 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix @@ -1,34 +1,33 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme + dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, + glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib }: stdenv.mkDerivation rec { - rev = "0.10.3"; - name = "gnome-shell-pomodoro-${rev}-61df3fa"; + rev = "624945d"; + name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; src = fetchFromGitHub { owner = "codito"; - repo = "gnome-shell-pomodoro"; + repo = "gnome-pomodoro"; rev = "${rev}"; - sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; + sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; }; configureScript = ''./autogen.sh''; buildInputs = [ which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer + makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3 + telepathy_glib ]; preBuild = '' - sed -i \ - -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \ - -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \ - vapi/Makefile + sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ + vapi/Makefile ''; preFixup = '' @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { description = "Personal information management application that provides integrated " + "mail, calendaring and address book functionality"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ DamienCassou jgeerds ]; license = licenses.gpl3; platforms = platforms.linux; }; From 71b848b45dc58d7e75eb7f07b214fb8c62e5f58d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 06:34:52 -0500 Subject: [PATCH 167/412] openblas: build with USE_OPENMP=0 on Darwin Darwin's clang does not support OpenMP yet. OpenMP is required on other platforms for e.g. Julia. --- pkgs/development/libraries/science/math/openblas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index ef76c33fb6d..a4bf1efbb73 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' "BINARY=${binary}" - "USE_OPENMP=1" + "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" "INTERFACE64=${if blas64 then "1" else "0"}" ]; From 9b417df916b3069df306b88849f1b53da5e0825b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 9 Jun 2015 14:27:13 +0200 Subject: [PATCH 168/412] tomcat7: update from 7.0.55 to 7.0.62, fixes CVE-2014-7810 --- pkgs/servers/http/tomcat/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix index 87bc57eb2b6..221feb9c30e 100644 --- a/pkgs/servers/http/tomcat/7.0.nix +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "7"; - versionMinor = "0.55"; - sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15"; + versionMinor = "0.62"; + sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7"; } From 023be720821c1631ac6902f61132cdddbabd1594 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 9 Jun 2015 14:28:39 +0200 Subject: [PATCH 169/412] tomcat8: update from 8.0.9 to 8.0.23, fixes CVE-2014-7810 --- pkgs/servers/http/tomcat/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix index 63b8d2bbc94..a6da1198c9a 100644 --- a/pkgs/servers/http/tomcat/8.0.nix +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "8"; - versionMinor = "0.9"; - sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9"; + versionMinor = "0.23"; + sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9"; } From 49d4342f1baf9fb39016a33b78919c5e801f596d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Jun 2015 02:40:00 +0200 Subject: [PATCH 170/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/c8b207efe75afc7f7bbef9d102d392d19f5f6ddd with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1 --- .../haskell-modules/hackage-packages.nix | 527 ++++++++++++------ 1 file changed, 356 insertions(+), 171 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1136364e73e..add826cd139 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1046,6 +1046,7 @@ self: { ]; description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1078,13 +1079,12 @@ self: { }: mkDerivation { pname = "BNFC-meta"; - version = "0.4.0.2"; - sha256 = "0d59kmbcwsdh34hagmhhcq0d0x49wmzl6kycm9p55i7cf0zw0a5l"; + version = "0.4.0.3"; + sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2"; buildDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell ]; - jailbreak = true; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9069,6 +9069,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "KSP" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "KSP"; + version = "0.1"; + sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6"; + buildDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/frosch03/kerbal"; + description = "A library with the kerbal space program universe and demo code"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "Kalman" = callPackage ({ mkDerivation, base, hmatrix }: mkDerivation { @@ -16943,10 +16956,10 @@ self: { ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { pname = "acme-timemachine"; - version = "0.0.0.1"; - sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl"; + version = "0.0.1.0"; + sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb"; buildDepends = [ base ghc-prim mtl transformers ]; - description = "An easy way to perform and unperform IO actions"; + description = "An easy way to perform and unperform IO and other stateful actions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17979,8 +17992,8 @@ self: { ({ mkDerivation, base, stm, time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.2.0.6"; - sha256 = "1jr4pxrgz6gq1dcnkkggbaq3gnj0gr1g14mf174f2b4qzgl63cq1"; + version = "0.2.0.8"; + sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f"; buildDepends = [ base stm time unbounded-delays ]; testDepends = [ base time ]; homepage = "https://bitbucket.org/davecturner/alarmclock"; @@ -18027,13 +18040,12 @@ self: { }: mkDerivation { pname = "alex-meta"; - version = "0.3.0.7"; - sha256 = "05a290b997kxm2rl0w98c3fzq33866pi69pmmahqvw631cp2c6ni"; + version = "0.3.0.8"; + sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f"; buildDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; buildTools = [ alex happy ]; - jailbreak = true; description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19948,6 +19960,7 @@ self: { resource-pool resourcet transformers transformers-base types-compat web-routing ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -22087,10 +22100,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.12"; - revision = "1"; - sha256 = "1vjqrj3hj92vvik2c3qlld9gyh0an4xl2hx01hnpypgawa1j1180"; - editedCabalFile = "c40b53aee98659e34f2383439dacd26bb98228056283a05d25e55b3c8226f4a7"; + version = "0.12.1"; + sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22106,7 +22117,6 @@ self: { mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25405,8 +25415,8 @@ self: { }: mkDerivation { pname = "bitcoin-api"; - version = "0.11.1"; - sha256 = "16slfsqwmpr8c5sl2zpf763d21sqgii7jgmw0ra1nidv6zl01glb"; + version = "0.12.0"; + sha256 = "09sh56wmkkgm0gzsai94q1qa2dlf1s7nfxl0yzim0s10p71bw7wr"; buildDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -27599,30 +27609,28 @@ self: { }: mkDerivation { pname = "bytestring-handle"; - version = "0.1.0.2"; - sha256 = "1nnqqcl9zp14q49jwcxhbm85hxk48higpr63qs675802sz0fs01v"; + version = "0.1.0.3"; + sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; }) {}; "bytestring-lexing" = callPackage - ({ mkDerivation, alex, array, base, bytestring }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "bytestring-lexing"; - version = "0.4.3.3"; - sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0"; - buildDepends = [ array base bytestring ]; - buildTools = [ alex ]; + version = "0.5.0.2"; + sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81"; + buildDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "bytestring-mmap" = callPackage @@ -27847,8 +27855,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "c-storable-deriving"; - version = "0.1.1"; - sha256 = "19scaffyinyblc3vw3ga22j2z81gd7l2l3nnrsy3k9nsal1rbz3z"; + version = "0.1.2"; + sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1"; buildDepends = [ base ghc-prim ]; homepage = "https://github.com/maurer/c-storable-deriving"; description = "Generate C-like storable instances from datatypes"; @@ -28065,8 +28073,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.27.2"; - sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz"; + version = "4.29"; + sha256 = "1kx8mivm2vm0bgnrzvccnd2x3ww913h64bwcawzpbcgjv7cpihlj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28187,20 +28195,20 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , filepath, ghc-prim, mtl, process, template-haskell, temporary - , transformers + , extra, filepath, ghc-prim, mtl, process, template-haskell + , temporary, transformers, unix }: mkDerivation { pname = "cabal-helper"; - version = "0.3.4.0"; - sha256 = "1c96zwiz7jn55ijjjy8ip5axk7g0mv7b10bs25b5y3z7iqbblw6c"; + version = "0.3.5.0"; + sha256 = "02qzji8jzbg19pmhmqg0kylvmm0libq7v99rws67bh015gb829kk"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring Cabal data-default directory filepath ghc-prim mtl process template-haskell temporary transformers ]; - testDepends = [ base ]; + testDepends = [ base extra unix ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -28713,9 +28721,9 @@ self: { mkDerivation { pname = "cabal2nix"; version = "1.73"; - revision = "4"; + revision = "5"; sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv"; - editedCabalFile = "29ac70f26f4996e06945649693d71c217ed9e5f9b3ec72637c13153961d8f2d9"; + editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -32375,8 +32383,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.3.1"; - sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g"; + version = "0.3.4"; + sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -33107,6 +33115,7 @@ self: { homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems"; description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinatorics" = callPackage @@ -36380,8 +36389,8 @@ self: { }: mkDerivation { pname = "cron"; - version = "0.2.5"; - sha256 = "0337dq2fqjikdn2fayad66rq8xyh2y6ywn18fn5q5vvrhmvmyrja"; + version = "0.2.6"; + sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg"; buildDepends = [ attoparsec base mtl old-locale text time ]; testDepends = [ attoparsec base derive hspec hspec-expectations QuickCheck text @@ -43489,6 +43498,7 @@ self: { ]; description = "SQL backend for Database Supported Haskell (DSH)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dsmc" = callPackage @@ -46330,6 +46340,7 @@ self: { persistent persistent-sqlite persistent-template QuickCheck resourcet text transformers ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; @@ -47844,8 +47855,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "1.0.10"; - sha256 = "11h2z8idndhvm1ijp6qylaqyg173qk1rybv9v0d73s2sq7jxbcx7"; + version = "1.0.11"; + sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -47871,6 +47882,7 @@ self: { version = "0.3.4"; sha256 = "07hrifzwvv7fzqh70igfbxzn854yvyx7406s8byn0arhmp21ka3b"; buildDepends = [ base cereal fb persistent text time ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/fb-persistent"; description = "Provides Persistent instances to Facebook types"; license = stdenv.lib.licenses.bsd3; @@ -48802,8 +48814,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.0.2"; - sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6"; + version = "0.1.1.0"; + sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n"; buildDepends = [ base ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -50436,8 +50448,8 @@ self: { }: mkDerivation { pname = "free-game"; - version = "1.1.80"; - sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava"; + version = "1.1.81"; + sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp"; buildDepends = [ array base boundingboxes colors containers control-bool directory filepath free freetype2 GLFW-b hashable JuicyPixels @@ -52956,22 +52968,23 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra - , filepath, process, tasty, tasty-hunit, terminal-size, time + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time }: mkDerivation { pname = "ghcid"; - version = "0.3.6"; - sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; + version = "0.4"; + sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal base cmdargs directory extra filepath process - terminal-size time + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time ]; testDepends = [ - ansi-terminal base cmdargs directory extra filepath process tasty - tasty-hunit terminal-size time + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time ]; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; @@ -55195,12 +55208,15 @@ self: { }) {}; "graph-wrapper" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, deepseq, hspec + , QuickCheck + }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.4.4"; - sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd"; + version = "0.2.5.1"; + sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3"; buildDepends = [ array base containers ]; + testDepends = [ array base containers deepseq hspec QuickCheck ]; homepage = "https://github.com/soenkehahn/graph-wrapper"; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; @@ -59194,13 +59210,12 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.7"; - sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9"; + version = "0.2.0.8"; + sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag"; buildDepends = [ array base containers haskell-src-meta mtl template-haskell ]; buildTools = [ happy ]; - jailbreak = true; description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -61918,6 +61933,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haverer" = callPackage + ({ mkDerivation, base, basic-prelude, containers, errors, lens + , MonadRandom, mtl, random-shuffle, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "haverer"; + version = "0.3.0.0"; + sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base basic-prelude containers errors lens MonadRandom mtl + random-shuffle tasty tasty-quickcheck text + ]; + testDepends = [ + base basic-prelude containers errors mtl random-shuffle tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Implementation of the rules of Love Letter"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hawitter" = callPackage ({ mkDerivation, base, base64-string, bytestring, clock, containers , gconf, glade, gtk, hoauth, HTTP, json, mtl, network, old-locale @@ -62908,8 +62947,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.6.5"; - sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh"; + version = "0.6.7"; + sha256 = "181anz8f2qi08f96ns0kxy09y18q4854brdycwhdij5yn7fl9kdg"; buildDepends = [ attoparsec base BoundedChan bytestring bytestring-lexing mtl network resource-pool time vector @@ -65546,8 +65585,8 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.2.1"; - sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv"; + version = "0.1.3.0"; + sha256 = "10mrvpiwmcaijckrcg45zw2zb17fgx43rm4qfi32glvgkakd2zqf"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; @@ -65911,6 +65950,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hmeap"; description = "Haskell Meapsoft Parser"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap-utils" = callPackage @@ -66510,14 +66550,15 @@ self: { }: mkDerivation { pname = "homplexity"; - version = "0.4.2.0"; - sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay"; + version = "0.4.3.0"; + sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam"; isLibrary = false; isExecutable = true; buildDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts hflags template-haskell uniplate ]; + testDepends = [ base haskell-src-exts uniplate ]; buildTools = [ happy ]; homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; @@ -67603,8 +67644,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.4.1"; - sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19"; + version = "1.4.2"; + sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69880,6 +69921,7 @@ self: { homepage = "http://rd.slavepianos.org/?t=hspear"; description = "Haskell Spear Parser"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec" = callPackage @@ -70258,17 +70300,19 @@ self: { }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec - , hspec-wai, template-haskell + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell }: mkDerivation { pname = "hspec-wai-json"; - version = "0.6.0"; - sha256 = "0r9p8v3cynyx5gnan86cc0l5hrmnm3mx7w2kkc1npv6zq0cj1bgq"; + version = "0.6.1"; + sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih"; buildDepends = [ - aeson aeson-qq base bytestring hspec-wai template-haskell + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell ]; testDepends = [ base hspec hspec-wai ]; + homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; }) {}; @@ -73486,7 +73530,9 @@ self: { mkDerivation { pname = "ide-backend-common"; version = "0.9.1.2"; + revision = "1"; sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7"; + editedCabalFile = "cdbec9d6422b6888b23622286333a5119e9913f82e49f85676bb56d6ca850b38"; buildDepends = [ aeson async attoparsec base binary bytestring bytestring-trie containers crypto-api data-accessor directory filepath fingertree @@ -73772,24 +73818,22 @@ self: { }) {}; "ig" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, conduit, conduit-extra, crypto-api, cryptohash + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, crypto-api, cryptohash , cryptohash-cryptoapi, data-default, http-conduit, http-types , lifted-base, monad-control, resourcet, text, time, transformers , transformers-base, unordered-containers }: mkDerivation { pname = "ig"; - version = "0.2.1"; - sha256 = "0kl44fv3djcrr87gqpcdbsvqiliwxz2iw5fd07h8xrvmls3b1lgj"; + version = "0.2.2"; + sha256 = "0qg9786sih7bcmdvmih5qg8p0j8r7vh78cp5yaw2f9rldica9a4k"; buildDepends = [ - aeson attoparsec base base16-bytestring bytestring conduit - conduit-extra crypto-api cryptohash cryptohash-cryptoapi - data-default http-conduit http-types lifted-base monad-control - resourcet text time transformers transformers-base - unordered-containers + aeson base base16-bytestring bytestring conduit conduit-extra + crypto-api cryptohash cryptohash-cryptoapi data-default + http-conduit http-types lifted-base monad-control resourcet text + time transformers transformers-base unordered-containers ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/ig"; description = "Bindings to Instagram's API"; license = stdenv.lib.licenses.bsd3; @@ -75286,8 +75330,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.4.1"; - sha256 = "1gv2kgm3r5b4nh8d58nwrilyzxr7l4awn1qlwl7wnkfi99h5nlz8"; + version = "0.4.3"; + sha256 = "07ha7vl8qzvfyk776f0pr6wb9fjcwmmqplp91bfpmzslifw2k01r"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -81053,8 +81097,8 @@ self: { }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.2"; - sha256 = "1gsfij0n70wwvcrgr0lq98kwswghv16y1d0gxnyrfgxkpar47fhf"; + version = "0.1.0.3"; + sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk"; buildDepends = [ base lens-family lens-family-core lens-family-th ]; @@ -82178,6 +82222,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lindenmayer" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lindenmayer"; + version = "0.1.0.1"; + sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1"; + buildDepends = [ base ]; + homepage = "https://github.com/reinh/hs-lindenmayer"; + description = "L-systems in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -83520,6 +83576,7 @@ self: { homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch"; description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locators" = callPackage @@ -86976,6 +87033,7 @@ self: { homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi" = callPackage @@ -90647,6 +90705,7 @@ self: { jailbreak = true; description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mvclient" = callPackage @@ -91315,6 +91374,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) { inherit (pkgs) ncurses;}; + "ndjson-conduit" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }: + mkDerivation { + pname = "ndjson-conduit"; + version = "0.1.0.2"; + sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj"; + buildDepends = [ aeson attoparsec base bytestring conduit ]; + homepage = "https://github.com/srijs/haskell-ndjson-conduit"; + description = "Conduit-based parsing and serialization for newline delimited JSON"; + license = stdenv.lib.licenses.mit; + }) {}; + "neat" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -91559,6 +91630,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "nestedmap" = callPackage + ({ mkDerivation, base, base-unicode-symbols, containers + , data-ordlist, hspec, QuickCheck + }: + mkDerivation { + pname = "nestedmap"; + version = "0.1.0.3"; + sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl"; + buildDepends = [ base base-unicode-symbols containers ]; + testDepends = [ + base base-unicode-symbols containers data-ordlist hspec QuickCheck + ]; + jailbreak = true; + description = "A library for nested maps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "net-concurrent" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-binary, hslogger , monad-loops, network @@ -94847,6 +94935,7 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -97452,8 +97541,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.6"; - sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl"; + version = "2.2"; + sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -97561,8 +97650,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.3.1"; - sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1"; + version = "2.2"; + sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -97603,8 +97692,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.6"; - sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6"; + version = "2.2"; + sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -97691,8 +97780,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.4.2"; - sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa"; + version = "2.2"; + sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -101318,8 +101407,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.3.4"; - sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp"; + version = "0.3.3.5"; + sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -102055,8 +102144,8 @@ self: { }: mkDerivation { pname = "proton-haskell"; - version = "0.6"; - sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg"; + version = "0.7"; + sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi"; buildDepends = [ base containers directory filepath ]; testDepends = [ base containers directory filepath HUnit test-framework @@ -104904,20 +104993,18 @@ self: { }) {}; "reducers" = callPackage - ({ mkDerivation, array, base, bytestring, comonad, containers - , fingertree, hashable, keys, pointed, semigroupoids, semigroups - , text, transformers, unordered-containers + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, semigroups, text, transformers + , unordered-containers }: mkDerivation { pname = "reducers"; - version = "3.10.3.1"; - sha256 = "0qmd93jdh0qjyc9if9hr2yjanrqx5nlbz5j0daiywzxcb0hi7ri8"; + version = "3.10.3.2"; + sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42"; buildDepends = [ - array base bytestring comonad containers fingertree hashable keys - pointed semigroupoids semigroups text transformers - unordered-containers + array base bytestring containers fingertree hashable semigroupoids + semigroups text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; @@ -109396,8 +109483,8 @@ self: { }: mkDerivation { pname = "schedule-planner"; - version = "1.0.0.0"; - sha256 = "0cbx6k3spsdsk8bjwyzyjw9iqdpc7z2vkds51iaxxn3wiwjkxwpq"; + version = "1.0.0.1"; + sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -110983,8 +111070,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.1"; - sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls"; + version = "0.4.2"; + sha256 = "0zna0x70jlxa2nis4v6knqlyxxkyvv2lmwyixp31xhdcp1yl2lqh"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -110995,7 +111082,6 @@ self: { filepath hspec parsec QuickCheck quickcheck-instances string-conversions text url ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -111005,8 +111091,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.1"; - sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp"; + version = "0.4.2"; + sha256 = "0jank0v3cp6cbr571q4pqdfxfbfzm5v8r6rq8csz9yfkhg6x97bg"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -111022,8 +111108,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.1"; - sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r"; + version = "0.4.2"; + sha256 = "0rcjqvx76mih4pfhxgrm30czznz68agdhflanqsslv2g33vzls55"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -111046,8 +111132,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.1"; - sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92"; + version = "0.4.2"; + sha256 = "1s70zrs8hiphz94vkcm9gim1xs4dj943a73d2jypyijd4p0k5q5j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111082,6 +111168,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-examples" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, either + , http-types, js-jquery, lucid, random, servant, servant-client + , servant-docs, servant-jquery, servant-lucid, servant-server, text + , time, transformers, wai, wai-extra, warp + }: + mkDerivation { + pname = "servant-examples"; + version = "0.4.2"; + sha256 = "1nmgzkn0nv3p0bzr5ny0yx0g45fzf5qx7s868jp1nq7wbfd3yc0i"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base bytestring directory either http-types js-jquery lucid + random servant servant-client servant-docs servant-jquery + servant-lucid servant-server text time transformers wai wai-extra + warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "Example programs for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -111089,8 +111198,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.1"; - sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n"; + version = "0.4.2"; + sha256 = "14ixqnxwm24gc457y0z7rw6z31w2s29sg913vvax641nazfr6yfm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111109,8 +111218,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.1"; - sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0"; + version = "0.4.2"; + sha256 = "1aapj4fwjijg9k56x5n9andfwfkffcv37rfvsbpdxhkvwzvmmdpq"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -111206,8 +111315,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.1"; - sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga"; + version = "0.4.2"; + sha256 = "054xfkl6pxc39ahhch8i9s1aj2p3sd10ah9cknknbkjcyhynjzk4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111221,7 +111330,6 @@ self: { network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -111257,8 +111365,8 @@ self: { }: mkDerivation { pname = "ses-html"; - version = "0.2.1.2"; - sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f"; + version = "0.3.0.0"; + sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy"; buildDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -114319,17 +114427,18 @@ self: { "snaplet-auth-acid" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, cereal , clientsession, directory, errors, filepath, hashable, lens - , MonadCatchIO-transformers, mtl, safecopy, snap, snap-core, text - , time, unordered-containers, vector + , MonadCatchIO-transformers, mtl, safecopy, scientific, snap + , snap-core, text, time, unordered-containers, vector }: mkDerivation { pname = "snaplet-auth-acid"; - version = "0.0.1"; - sha256 = "1f6p8iqb5cq2yz6c6zdd71p6cfkvnhqkczqiyb7080xira9w5ia3"; + version = "0.1.0"; + sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm"; buildDepends = [ acid-state aeson attoparsec base cereal clientsession directory errors filepath hashable lens MonadCatchIO-transformers mtl - safecopy snap snap-core text time unordered-containers vector + safecopy scientific snap snap-core text time unordered-containers + vector ]; jailbreak = true; description = "Provides an Acid-State backend for the Auth Snaplet"; @@ -114855,18 +114964,17 @@ self: { }) {}; "snaplet-ses-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, configurator - , ses-html, snap, text, transformers + ({ mkDerivation, adjunctions, base, blaze-html, bytestring + , configurator, lens, ses-html, snap, text, transformers }: mkDerivation { pname = "snaplet-ses-html"; - version = "0.1.0.0"; - sha256 = "14q577mnyf9r113v4sbfcpqlfd47wcdnbwvz70w5bqp996627jyl"; + version = "0.1.1.0"; + sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6"; buildDepends = [ - base blaze-html bytestring configurator ses-html snap text - transformers + adjunctions base blaze-html bytestring configurator lens ses-html + snap text transformers ]; - jailbreak = true; description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115275,13 +115383,14 @@ self: { ({ mkDerivation, async, base, bytestring }: mkDerivation { pname = "socket"; - version = "0.2.0.0"; - sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw"; + version = "0.3.0.1"; + sha256 = "01fz3lng41i9q4r2wh6nsyx27yc7jbhglzb10lg06d2ll7gxakx0"; buildDepends = [ base bytestring ]; testDepends = [ async base bytestring ]; homepage = "https://github.com/lpeterse/haskell-socket"; - description = "A binding to the POSIX sockets interface"; + description = "A portable and extensible sockets library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -116860,16 +116969,50 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra + , containers, cpphs, cryptohash, cryptohash-conduit, deepseq + , directory, either, enclosed-exceptions, exceptions, fast-logger + , filepath, hashable, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, resourcet, safe, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unordered-containers + , vector, vector-binary-instances, void, yaml, zlib + }: mkDerivation { pname = "stack"; - version = "0.0.0"; - sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb"; - isLibrary = false; + version = "0.0.1"; + sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3"; + isLibrary = true; isExecutable = true; - buildDepends = [ base ]; + buildDepends = [ + aeson async attoparsec base base64-bytestring bifunctors binary + bytestring Cabal conduit conduit-extra containers cryptohash + cryptohash-conduit deepseq directory either enclosed-exceptions + exceptions fast-logger filepath hashable http-client + http-client-tls http-conduit http-types lifted-base monad-control + monad-logger monad-loops mtl old-locale optparse-applicative + optparse-simple path persistent persistent-sqlite + persistent-template pretty process resourcet safe split stm + streaming-commons tar template-haskell temporary text time + transformers transformers-base unix unordered-containers vector + vector-binary-instances void yaml zlib + ]; + testDepends = [ + base Cabal conduit conduit-extra containers cryptohash directory + exceptions filepath hspec http-conduit monad-logger path resourcet + temporary transformers + ]; + buildTools = [ cpphs ]; + homepage = "https://github.com/commercialhaskell/stack +test/package-dump/ghc-7.8.txt +test/package-dump/ghc-7.10.txt"; description = "The Haskell Tool Stack"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -123106,14 +123249,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-orphans_0_12_0" = callPackage + "th-orphans_0_12_1" = callPackage ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift , th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.12.0"; - sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp"; + version = "0.12.1"; + sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -124206,6 +124349,7 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -125823,14 +125967,13 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.1.0"; - sha256 = "0qpw366hyvprgcmxr83in2ay07f7br7bff2zqw9pnm7lkmkxrlkw"; + version = "1.1.1"; + sha256 = "1dgzzsylbri2p8wyf1xfww8la9vccb7yac0b0g2lf0b1ix4gphym"; buildDepends = [ async base clock directory foldl managed process system-fileio system-filepath temporary text time transformers unix ]; testDepends = [ base doctest ]; - jailbreak = true; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -128413,14 +128556,13 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.2"; - sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf"; + version = "0.1.3"; + sha256 = "19zsjvn977rwmlgc062wwzbmdgxxxcf4ad6g64ih4n3q707r6gka"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base bytestring derive HUnit lens QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -129596,8 +129738,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.5"; - sha256 = "0jinysgn4rzh0b4a97wjac6md74vafb7avzprr6yddksmkylkayl"; + version = "0.2.6"; + sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -130782,6 +130924,7 @@ self: { homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-digestive-functors" = callPackage @@ -131062,8 +131205,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.2.4"; - sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv"; + version = "2.2.4.1"; + sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk"; buildDepends = [ auto-update base blaze-builder byteorder bytestring case-insensitive easy-file fast-logger http-types network unix @@ -131220,6 +131363,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-gunzip" = callPackage + ({ mkDerivation, base, bytestring, http-types, streaming-commons + , wai + }: + mkDerivation { + pname = "wai-middleware-gunzip"; + version = "0.0.2"; + sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx"; + buildDepends = [ + base bytestring http-types streaming-commons wai + ]; + homepage = "https://github.com/twittner/wai-middleware-gunzip"; + description = "WAI middleware to unzip request bodies"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "wai-middleware-headers" = callPackage ({ mkDerivation, base, bytestring, http-types, wai }: mkDerivation { @@ -131784,8 +131943,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.4"; - sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4"; + version = "3.0.4.1"; + sha256 = "0p9472j9sa584gw8i1jg89rhbl0kv6r1d6naiqfmmirxii4pmp4y"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -134393,6 +134552,7 @@ self: { homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -135545,6 +135705,7 @@ self: { testDepends = [ base doctest ]; description = "Lens interface to yaml-light"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-rpc" = callPackage @@ -135916,6 +136077,7 @@ self: { resourcet safe shakespeare template-haskell text time transformers unordered-containers wai yesod-core yesod-form yesod-persistent ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; @@ -135939,6 +136101,7 @@ self: { base bytestring hspec monad-logger mtl persistent-sqlite resourcet text xml-conduit yesod yesod-auth yesod-test ]; + jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -135964,6 +136127,7 @@ self: { base bytestring hspec monad-logger mtl persistent-sqlite resourcet text xml-conduit yesod yesod-auth yesod-auth-account yesod-test ]; + jailbreak = true; homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -136052,8 +136216,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.2.1"; - sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl"; + version = "1.4.2.2"; + sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -136283,8 +136447,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.10"; - sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w"; + version = "1.4.11"; + sha256 = "1lfbpfv43vjxx8r1yf8py64sai14abwwq7395gs45vk059zi5hfs"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -136326,6 +136490,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-crud-persist" = callPackage + ({ mkDerivation, base, lens, persistent, text, transformers, wai + , yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-crud-persist"; + version = "0.1.0.0"; + sha256 = "0kzigyggzxv4ps8a15bhk8ngxn15inp630x0v3kn0j1xdmj7inpw"; + buildDepends = [ + base lens persistent text transformers wai yesod-core yesod-form + yesod-persistent + ]; + homepage = "google.com"; + description = "Flexible CRUD subsite usable with Yesod and Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-datatables" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default , HUnit, monad-control, persistent, persistent-sqlite @@ -136719,6 +136901,7 @@ self: { base blaze-builder conduit hspec persistent persistent-sqlite text wai-extra yesod-core ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; @@ -137085,6 +137268,7 @@ self: { homepage = "https://github.com/andrewthad/yesod-table"; description = "HTML tables for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-tableview" = callPackage @@ -138118,10 +138302,11 @@ self: { mkDerivation { pname = "zippers"; version = "0.2"; + revision = "1"; sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; + editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960"; buildDepends = [ base lens profunctors semigroupoids ]; testDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; From 62f2b24c8379d8f3c25a7e44b178de9f28903f4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jun 2015 15:13:00 +0200 Subject: [PATCH 171/412] haskell-fft: disable failing test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e33e0fe2590..8ee927f6fb8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -844,4 +844,7 @@ self: super: { # https://github.com/jaspervdj/websockets/issues/104 websockets = dontCheck super.websockets; + # Avoid spurious test suite failures. + fft = dontCheck super.fft; + } From 6455404f1b6cb59f1f0b5af22be374d3a7b965a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 9 Jun 2015 11:48:43 +0200 Subject: [PATCH 172/412] mlt-qt4: update from 0.9.2 to 0.9.6 --- pkgs/development/libraries/mlt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 389e2385f98..7cfbc8dfb87 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.2"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766"; + sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; }; buildInputs = [ From fdc8e6beff9564b00b89871e0f432b9ee61f5c36 Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Tue, 9 Jun 2015 17:45:00 +0200 Subject: [PATCH 173/412] httpie: bump version to fix ImportError Fixes https://github.com/jakubroztocil/httpie/issues/314 --- pkgs/tools/networking/httpie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a31511beeab..cc1531961b3 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "httpie-0.8.0"; + name = "httpie-0.9.2"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz"; - sha256 = "16f3scm794plxbyw7a5b4541hb2psa85kfi98g83785i2qwz98ag"; + sha256 = "0s0dsj1iimn17h0xyziwk4kz4ga9s0vy9rhzixh8dna32za84fdg"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; + propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ]; doCheck = false; From b120a737fd3f2871af7d57c88c010884041ce6d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 11:43:00 -0500 Subject: [PATCH 174/412] rPackages.BayesLogit: build with openblas --- pkgs/development/r-modules/default.nix | 1 + pkgs/development/r-modules/patches/BayesLogit_cblas.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 11d7193edee..4bad1224cc1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1087,6 +1087,7 @@ let BayesLogit = old.BayesLogit.overrideDerivation (attrs: { patches = [ ./patches/BayesLogit.patch ]; + buildInputs = (attrs.buildInputs or []) ++ [ pkgs.openblasCompat ]; }); BayesBridge = old.BayesBridge.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch index 4c8778c4697..ef776f3531d 100644 --- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch +++ b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch @@ -6,7 +6,7 @@ diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o -PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -llapack -lf77blas -lcblas -latlas -lgfortran ++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW From 77aa1c990ec673446c38b4c733f8ad7db9e66af1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 11:47:12 -0500 Subject: [PATCH 175/412] rPackages.Mposterior: build with openblas --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4bad1224cc1..2f387599d6d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -997,7 +997,7 @@ let }); Mposterior = old.Mposterior.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); qtbase = old.qtbase.overrideDerivation (attrs: { From 58754130cc3f34169de05f7ef14a9102221f5f13 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 11:47:26 -0500 Subject: [PATCH 176/412] rPackages.slfm: build with openblas --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2f387599d6d..2d211ed9a5b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1037,7 +1037,7 @@ let }); slfm = old.slfm.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { From 8245caedf158ca91997412f8797f1802e2c8a925 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 11:47:40 -0500 Subject: [PATCH 177/412] rPackages.SamplerCompare: build with openblas --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2d211ed9a5b..2f8c22fe865 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1041,7 +1041,7 @@ let }); SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); gputools = old.gputools.overrideDerivation (attrs: { From 746df7b034458c0ae27ebc99c0236f0d88807304 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 9 Jun 2015 10:26:05 -0700 Subject: [PATCH 178/412] remove now-applied process-extras patch --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index dabdeec3a23..37cb69160b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -53,10 +53,6 @@ self: super: { # https://github.com/haskell-suite/haskell-src-exts/issues/224 haskell-src-exts = dontCheck super.haskell-src-exts; - process-extras = appendPatch super.process-extras (pkgs.fetchpatch { - url = "https://github.com/seereason/process-extras/pull/4.patch"; - sha256 = "0wfd8dmr0a4dvgp6nhmkznxq1nq8ciprsacn1canmkzjkdidn6kj"; - }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/77.patch"; sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1"; From 0b68b920624bb2ea1d09db2a45e598c0bec7e552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 9 Jun 2015 20:11:41 +0200 Subject: [PATCH 179/412] nixos i18n.consoleFont: choose a different default Distros often choose Terminus as the default, and it supports some non-ASCII characters that we use in config. Fixes #8107. --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index f2aacf9b292..3622b21626b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -43,7 +43,7 @@ in consoleFont = mkOption { type = types.str; - default = "lat9w-16"; + default = "Lat2-Terminus16"; example = "LatArCyrHeb-16"; description = '' The font used for the virtual consoles. Leave empty to use diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ec3137ede4f..a929e1eb826 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -495,7 +495,7 @@ $bootLoaderConfig # Select internationalisation properties. # i18n = { - # consoleFont = "lat9w-16"; + # consoleFont = "Lat2-Terminus16"; # consoleKeyMap = "us"; # defaultLocale = "en_US.UTF-8"; # }; From 21f8130dda30f74cdd399b445b687f43f86cf1a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2015 14:58:34 +0200 Subject: [PATCH 180/412] cassandra 2.1.5 -> 2.1.6 --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index bbac243c7a0..5d99af41cb2 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -10,8 +10,8 @@ let - version = "2.1.5"; - sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid"; + version = "2.1.6"; + sha256 = "1xq96h33f4xmld114mrd57z396f9ykcj0xy50fnnhy5mhafkn4n2"; in From b229cfc89489ab6ed9c1897ce6fc134748b086fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2015 20:20:52 +0200 Subject: [PATCH 181/412] mcelog -> 119 - Fix clobbered status variable in server_ping - Avoid prefilling memory database when DMI is disabled --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 0a4d3797ce2..1706b8b87fa 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "118"; in +let version = "119"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "04hzadxyqlnhjn328bv711lpkipfn5k3gszswydmvvjpis2vhbrr"; + sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From e1af50c4c4c0332136283e9231f0a32ac11f2b90 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 9 Jun 2015 20:37:03 +0200 Subject: [PATCH 182/412] byzanz: add -Wno-error for deprecated declarations to fix the build --- pkgs/applications/video/byzanz/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 79b9ab92ad9..abacdf7a2d5 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { From 406428d6a4641f0a1a05e58a3b09f7d183059cfd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 13:48:36 -0500 Subject: [PATCH 183/412] haskellPackages.bindings-levmar: build with openblas --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dbb7aadb4a2..7f55abc4dda 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -124,6 +124,14 @@ self: super: { extraLibraries = [ pkgs.openblasCompat ]; }); + bindings-levmar = overrideCabal super.bindings-levmar (drv: { + preConfigure = '' + sed -i bindings-levmar.cabal \ + -e 's,extra-libraries: lapack blas,extra-libraries: openblas,' + ''; + extraLibraries = [ pkgs.openblas ]; + }); + # The Haddock phase fails for one reason or another. attoparsec-conduit = dontHaddock super.attoparsec-conduit; base-noprelude = dontHaddock super.base-noprelude; From 7a87a1e73f951cc84181a6d5a0e39c6523d2576c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 9 Jun 2015 20:49:24 +0200 Subject: [PATCH 184/412] Fix pythonPackages.networkx --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c324ae1c00c..4e99e61114c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15564,7 +15564,7 @@ let sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59"; }; - buildInputs = with self; [ nose decorator ]; + propagatedBuildInputs = with self; [ nose decorator ]; meta = { homepage = "https://networkx.github.io/"; From 661ce66483b8f8850f50452531e34e5b7d553389 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 Jun 2015 14:31:19 -0500 Subject: [PATCH 185/412] haskellPackages.hmatrix: remove impure openblas path --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7f55abc4dda..03359133a5f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -122,6 +122,9 @@ self: super: { hmatrix = overrideCabal super.hmatrix (drv: { configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ]; extraLibraries = [ pkgs.openblasCompat ]; + preConfigure = '' + sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@' + ''; }); bindings-levmar = overrideCabal super.bindings-levmar (drv: { From ef9454709313cbebdf1263a63de220b39c0f670a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2015 00:50:35 +0200 Subject: [PATCH 186/412] neovim -> 2015-06-09 --- pkgs/applications/editors/neovim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f19c1b65e13..814b05ced36 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -3,18 +3,18 @@ , luabitop, ncurses, perl, pkgconfig, unibilium , withJemalloc ? true, jemalloc }: -let version = "2015-05-26"; in +let version = "2015-06-09"; in stdenv.mkDerivation rec { name = "neovim-${version}"; src = fetchFromGitHub { - sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc"; - rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7"; + sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; + rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; repo = "neovim"; owner = "neovim"; }; - # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness: + # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { name = "neovim-libvterm-${version}"; From d5b8dda0436a20c186728890dd0edf43c8911669 Mon Sep 17 00:00:00 2001 From: Anders Lundstedt Date: Wed, 10 Jun 2015 02:32:33 +0200 Subject: [PATCH 187/412] mediatomb: fix hardcoded paths --- nixos/modules/services/misc/mediatomb.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 23227548039..3f70bceb23b 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -49,10 +49,10 @@ let - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/common.js - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/playlists.js + ${pkgs.mediatomb}/share/mediatomb/js/common.js + ${pkgs.mediatomb}/share/mediatomb/js/playlists.js - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/import.js + ${pkgs.mediatomb}/share/mediatomb/js/import.js From 556562173cef5f499c46d664ebf26d99d90a66ad Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 08:53:33 +0200 Subject: [PATCH 188/412] t1utils: update from 1.38 to 1.39, fixes CVE-2015-3905 --- pkgs/tools/misc/t1utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 5e473a5cd09..c00db07ed1f 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.38"; + name = "t1utils-1.39"; src = fetchurl { url = "http://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "1pnxpjabjyzfjrp319wsq4acxw99c8nnsaalbz7nwamj8kkim7zw"; + sha256 = "1i6ln194ns2g4j5zjlj4bfzxpkfpnxvy37n9baq3hywjqkjz7bhg"; }; meta = with stdenv.lib; { From 7829a2c92e0aac11391af121504097be50d991c6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 09:00:47 +0200 Subject: [PATCH 189/412] chocolate-doom: update from 2.1.0 to 2.2.0 --- pkgs/games/chocolate-doom/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 75cee19c680..8bb55702c59 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,15 +1,14 @@ -{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.1.0"; + name = "chocolate-doom-2.2.0"; src = fetchurl { url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1"; + sha256 = "0har8zcg3j41byxc3dx6a00aly8vpysf1q7h2qbw39nlrcghag7b"; }; - buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; + buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am - ./autogen.sh --prefix=$out ''; enableParallelBuilding = true; From 957d9f6d574ac62d698424befb466e9b1376f82c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jun 2015 10:07:46 +0200 Subject: [PATCH 190/412] zeromq: update to version 4.1.1 Version 4.0.6 is "retired" and also failed to compile because its sha256 hash changed on the upstream site for some reason. --- pkgs/development/libraries/zeromq/4.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 744703adb24..87417d1b77a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libuuid }: +{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }: stdenv.mkDerivation rec { - name = "zeromq-4.0.6"; + name = "zeromq-4.1.1"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj91"; + sha256 = "1nxqvb1n8yy6953nv095riirrpmw4w340qd6sjm4cfdl0rbixmj3"; }; - buildInputs = [ libuuid ]; + buildInputs = [ libuuid pkgconfig libsodium ]; meta = with stdenv.lib; { branch = "4"; From 24a218b1cc114fea2a68c3215ed03f4af073ff9c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 09:19:16 +0200 Subject: [PATCH 191/412] mcabber: enable tests --- .../networking/instant-messengers/mcabber/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 6c7e4797841..17ad6c25da7 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; + + doCheck = true; meta = with stdenv.lib; { homepage = http://mcabber.com/; From bc4be1909918b1d962f488788091eb5dbc3fadb3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 10:16:01 +0200 Subject: [PATCH 192/412] sonic-visualiser: fix build --- pkgs/applications/audio/sonic-visualiser/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 9cd1a3d0345..70162b9d185 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, qt5, redland -, rubberband, serd, sord, vampSDK +, rubberband, serd, sord, vampSDK, fftwFloat }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt5.base fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf9fed11ae..edde05d0ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12405,7 +12405,6 @@ let sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; - fftw = pkgs.fftwSinglePrec; }; sox = callPackage ../applications/misc/audio/sox { }; From 6d859229e143f76a5cd5769be4d8acc97f0afa1b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 10 Jun 2015 08:36:55 +0000 Subject: [PATCH 193/412] Remove unnecessary option. My mistake... --- nixos/modules/services/databases/mysql.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index fec238b8645..1cdecedfc77 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -77,14 +77,6 @@ in description = "Location of the file which stores the PID of the MySQL server"; }; - enableSocketAccess = mkOption { - type = types.bool; - default = true; - description = '' - Whether to grant local processes access to the mysqld socket. - ''; - }; - extraOptions = mkOption { default = ""; example = '' From 43a7006495a364d122b23b2f2b140a0db2442aaf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jun 2015 16:38:53 +0200 Subject: [PATCH 194/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/31af6a881c6bbed08ca3abedc96c5bd9fe95878d with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1 --- .../haskell-modules/hackage-packages.nix | 127 ++++++++++++------ 1 file changed, 88 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index add826cd139..936ec025a60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7628,8 +7628,8 @@ self: { }: mkDerivation { pname = "HandsomeSoup"; - version = "0.4"; - sha256 = "0h760vfqgg40h50ybqpgpzh0skgbggx4xj1zaag3ca6l22950w36"; + version = "0.4.2"; + sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25415,8 +25415,8 @@ self: { }: mkDerivation { pname = "bitcoin-api"; - version = "0.12.0"; - sha256 = "09sh56wmkkgm0gzsai94q1qa2dlf1s7nfxl0yzim0s10p71bw7wr"; + version = "0.12.1"; + sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69"; buildDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -36402,6 +36402,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cron-compat" = callPackage + ({ mkDerivation, attoparsec, base, cron, derive, hspec + , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text + , time, transformers, transformers-compat + }: + mkDerivation { + pname = "cron-compat"; + version = "0.2.6"; + sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx"; + buildDepends = [ + attoparsec base mtl mtl-compat old-locale text time + transformers-compat + ]; + testDepends = [ + attoparsec base cron derive hspec hspec-expectations QuickCheck + text time transformers + ]; + jailbreak = true; + homepage = "http://github.com/michaelxavier/cron"; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + }) {}; + "cruncher-types" = callPackage ({ mkDerivation, aeson, base, containers, hlint, lens, text }: mkDerivation { @@ -46647,13 +46670,12 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.7.2.1"; - sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2"; + version = "0.8.0.0"; + sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww"; buildDepends = [ aeson async attoparsec base bytestring cereal containers network protobuf random sodium stm text time unordered-containers uuid ]; - jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; @@ -64845,17 +64867,18 @@ self: { , either, exceptions, http-client, http-client-tls, http-types, jwt , lens, mtl, network-uri, postgresql-simple, resource-pool, safe , stm, text, time, transformers, unordered-containers, utf8-string - , wai, wai-lens, webcrank-wai, wreq + , wai, wai-lens, webcrank, webcrank-wai, wreq }: mkDerivation { pname = "hipbot"; - version = "0.3.0.2"; - sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3"; + version = "0.5"; + sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri postgresql-simple resource-pool safe stm text time transformers - unordered-containers utf8-string wai wai-lens webcrank-wai wreq + unordered-containers utf8-string wai wai-lens webcrank webcrank-wai + wreq ]; jailbreak = true; homepage = "https://github.com/purefn/hipbot"; @@ -75489,8 +75512,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.0.0"; - sha256 = "029qp0jfap6jczxdi2my1g4vcp8pr4zkxp64xfl7cyiigbapkimw"; + version = "1.3.1.0"; + sha256 = "1fic83lgvyji75gyx8c9ik9lj6jf65wbqmzp30siqmkhdp9y1rxf"; buildDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -81169,6 +81192,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lentil" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , regex-tdfa + }: + mkDerivation { + pname = "lentil"; + version = "0.1.0.2"; + revision = "2"; + sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v"; + editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec regex-tdfa + ]; + testDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec regex-tdfa + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "level-monad" = callPackage ({ mkDerivation, base, fmlist }: mkDerivation { @@ -95853,7 +95902,9 @@ self: { mkDerivation { pname = "pandoc-csv2table"; version = "1.0.1"; + revision = "1"; sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb"; + editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299"; isLibrary = true; isExecutable = true; buildDepends = [ base csv pandoc pandoc-types text ]; @@ -101921,8 +101972,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.4.0"; - sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw"; + version = "2.5.0"; + sha256 = "120pamm3rg2iahbl23y90wbcwdhgjvvsfzlkhi61c97xfybvb08c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -107099,8 +107150,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "1.16.0.0"; - sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy"; + version = "2.0.0.0"; + sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -107109,9 +107160,8 @@ self: { unordered-containers utf8-string vector ]; testDepends = [ base doctest ]; - jailbreak = true; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 1.16"; + description = "A driver for RethinkDB 2.0"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -128556,12 +128606,12 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.3"; - sha256 = "19zsjvn977rwmlgc062wwzbmdgxxxcf4ad6g64ih4n3q707r6gka"; + version = "0.1.4"; + sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ - attoparsec base bytestring derive HUnit lens QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck + attoparsec base blaze-builder bytestring derive HUnit lens + QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; @@ -131632,8 +131682,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "wai-routes"; - version = "0.6.2"; - sha256 = "04h0npgg6jfpzgg7g6kwbpkg3k148aq9jb3561r8j7fm6jmmynab"; + version = "0.7.0"; + sha256 = "1adiijvnwgm7j3qdr5ngxcc59amzcphgww3drj308hq278fpac08"; buildDepends = [ aeson base blaze-builder bytestring containers http-types mtl path-pieces random template-haskell text wai @@ -132401,8 +132451,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "webcrank"; - version = "0.2.1"; - sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7"; + version = "0.2.2"; + sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -132442,8 +132492,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "webcrank-wai"; - version = "0.2"; - sha256 = "02d6hsgx70mcghz1xrszf1jnl62alki3ch7wacp35s8jz79xrccw"; + version = "0.2.1"; + sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv"; buildDepends = [ base bytestring exceptions lens mtl unix-compat unordered-containers wai wai-lens webcrank webcrank-dispatch @@ -134539,8 +134589,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "xml-conduit-parse"; - version = "0.2.0.0"; - sha256 = "08dvaqfwi9gaa6xihyh2mksplid3xlfa3qb22glnmrcn37vxpphx"; + version = "0.2.0.1"; + sha256 = "04cs7bfdyia56vp9khdszxap1ri2riymmhsdb8shkcypf4ndhyyw"; buildDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -136769,15 +136819,15 @@ test/package-dump/ghc-7.10.txt"; , containers, country-codes, data-default, directory, fast-logger , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay , monad-control, monad-logger, persistent, persistent-postgresql - , persistent-template, resourcet, shakespeare, shakespeare-css - , shakespeare-js, shakespeare-text, template-haskell, text, time - , wai, wai-extra, wai-logger, warp, yaml, yesod, yesod-auth - , yesod-core, yesod-form, yesod-persistent, yesod-static + , persistent-template, resourcet, shakespeare, template-haskell + , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod + , yesod-auth, yesod-core, yesod-form, yesod-persistent + , yesod-static }: mkDerivation { pname = "yesod-mangopay"; - version = "1.11"; - sha256 = "1j6dibg7l0g3hykwvhxm9n898gg06mrgyg89yjbv31pm4mfvycsn"; + version = "1.11.1"; + sha256 = "0haz7zd9s9c12fcz11wkhw50hni08g2an1f65bd6cj871zzz3mnl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -136785,8 +136835,7 @@ test/package-dump/ghc-7.10.txt"; country-codes data-default directory fast-logger hamlet hjsmin http-conduit http-types lifted-base mangopay monad-control monad-logger persistent persistent-postgresql persistent-template - resourcet shakespeare shakespeare-css shakespeare-js - shakespeare-text template-haskell text time wai wai-extra + resourcet shakespeare template-haskell text time wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; From 07579409cc6919ff0dc09955844349c3bd461246 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jun 2015 02:38:23 +0200 Subject: [PATCH 195/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/cf0a9dd31e738583eaf35ecfa6064360efa55673 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1 --- .../haskell-modules/hackage-packages.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 936ec025a60..d29bddf0c39 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30191,8 +30191,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.3"; - sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07"; + version = "0.4"; + sha256 = "172nm38gvjriznnyks958bfzwd2zy59662i6zjzvj3nr0kdkiiap"; buildDepends = [ base ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -52320,8 +52320,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.7"; - sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc"; + version = "0.7.1"; + sha256 = "0jrnasd9lw7ffim0ski5b1mdislvs27n0i37lcbv51rgsl5wm458"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -67398,8 +67398,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.2.0"; - sha256 = "1a1kjawmf61znikdg9kw34rqhlqhijb00b1dk1w9s8nx52rcrlaa"; + version = "0.3.0"; + sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -71863,8 +71863,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.3.1"; - sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0"; + version = "0.8.3.2"; + sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -78329,8 +78329,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-fs"; - version = "0.0.3.3"; - sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08"; + version = "0.0.3.4"; + sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy"; buildDepends = [ base directory fsnotify keera-hails-reactivevalues system-filepath ]; @@ -133204,13 +133204,12 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "wl-pprint-extras"; - version = "3.5.0.4"; - sha256 = "0mvg5vff574xvrdbdwnyy71kxv0cp0q5vv8fb12fbgydnvsy3mbl"; + version = "3.5.0.5"; + sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9"; buildDepends = [ base containers nats semigroupoids semigroups text utf8-string ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; From deb0ed081072215f09b827ddf4668c886ddadf9f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 12:02:13 +0200 Subject: [PATCH 196/412] opencascade: fix build --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edde05d0ea4..6616c76f9a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7526,7 +7526,9 @@ let openbr = callPackage ../development/libraries/openbr { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + tcl = tcl-8_5; + }; opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { automake = automake111x; From 1c22734cd2e67842090f5d59a6c7b2fb39c1cf66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Jun 2015 12:16:25 +0200 Subject: [PATCH 197/412] Forcing the load of atkbd in initrd. In some computers, having the module available does not really load it, therefore, it results in not having the keyboard avaiable in initrd. --- nixos/modules/system/boot/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 0cae9cb844c..63a095be631 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -159,7 +159,7 @@ in boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel; - boot.kernelModules = [ "loop" "configs" ]; + boot.kernelModules = [ "loop" "configs" "atkbd" ]; boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) From b62f02f751f6b67916fff7ab8922d0cba14a4cb1 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Wed, 10 Jun 2015 18:40:25 +0800 Subject: [PATCH 198/412] wavegain: Use fetchFromGitHub instead of fetchgit. --- pkgs/applications/audio/wavegain/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index caf579d8765..5f56fb7297f 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "wavegain-1.3.1"; - src = fetchgit { - url = "https://github.com/MestreLion/wavegain.git"; - sha256 = "1h886xijc9d7h4p6qx12c6kgwmp6s1bdycnyylkayfncczzlbi24"; + src = fetchFromGitHub { + owner = "MestreLion"; + repo = "wavegain"; + rev = "c928eaf97aeec5732625491b64c882e08e314fee"; + sha256 = "0wghqnsbypmr4xcrhb568bfjdnxzzp8qgnws3jslzmzf34dpk5ls"; }; installPhase = '' From 62d62b658835d675f483d1ff78517216f75bcc5d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 13:00:11 +0200 Subject: [PATCH 199/412] Fixed some licenses --- pkgs/development/compilers/go/1.1-darwin.nix | 8 ++++---- pkgs/development/compilers/go/1.1.nix | 8 ++++---- pkgs/development/compilers/go/1.2.nix | 8 ++++---- pkgs/development/compilers/go/1.3.nix | 8 ++++---- pkgs/development/compilers/go/1.4.nix | 8 ++++---- pkgs/servers/felix/default.nix | 6 +++--- pkgs/servers/http/jboss/default.nix | 10 +++++----- pkgs/servers/memcached/default.nix | 8 ++++---- pkgs/servers/monitoring/zabbix/2.0.nix | 8 ++++---- pkgs/servers/monitoring/zabbix/2.2.nix | 8 ++++---- pkgs/servers/monitoring/zabbix/default.nix | 8 ++++---- pkgs/servers/sql/postgresql/jdbc/default.nix | 4 ++-- pkgs/servers/sql/postgresql/psqlodbc/default.nix | 4 ++-- pkgs/tools/compression/lzop/default.nix | 4 ++-- pkgs/tools/graphics/optipng/default.nix | 4 ++-- pkgs/tools/graphics/pdfread/default.nix | 4 ++-- pkgs/tools/security/muscleframework/default.nix | 6 +++--- pkgs/tools/security/muscletool/default.nix | 6 +++--- 18 files changed, 60 insertions(+), 60 deletions(-) diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix index 5b17f56ac37..776c1e04f08 100644 --- a/pkgs/development/compilers/go/1.1-darwin.nix +++ b/pkgs/development/compilers/go/1.1-darwin.nix @@ -69,11 +69,11 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ zef ]; - platforms = stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ zef ]; + platforms = platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 11640f2393d..de34e3e3cda 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -90,12 +90,12 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { branch = "1.1"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pierron viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 113e2118efb..bbedea812b8 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -81,12 +81,12 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { branch = "1.2"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pierron viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 6d88049cfbe..52a388aff1f 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -102,12 +102,12 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { branch = "1.3"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 1feaf68930a..12642eeace5 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -88,12 +88,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { branch = "1.4"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan wkennington ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index c1114232ea8..17a50506fa9 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation { mkdir -p $out cp -av * $out ''; - meta = { + meta = with stdenv.lib; { description = "An OSGi gateway"; homepage = http://felix.apache.org; - license = "ASF"; - maintainers = [ stdenv.lib.maintainers.sander ]; + license = licenses.asl20; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 86d37189887..d0d336ad08e 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, lib }: +{ stdenv, fetchurl, unzip, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -16,10 +16,10 @@ stdenv.mkDerivation { find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; - meta = { - homepage = "http://www.jboss.org/"; + meta = with stdenv.lib; { + homepage = http://www.jboss.org/; description = "Open Source J2EE application server"; - license = "GPL/LGPL"; - maintainers = [ lib.maintainers.sander ]; + license = licenses.lgpl21; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 74033be8cf8..294cb003ab4 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [cyrus_sasl libevent]; - meta = { + meta = with stdenv.lib; { description = "A distributed memory object caching system"; repositories.git = https://github.com/memcached/memcached.git; homepage = http://memcached.org/; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.coconnor ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.coconnor ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 9ce027409fd..0aa32a66f0a 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -78,13 +78,13 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 1e8d03ec2b6..139786ba59d 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -90,13 +90,13 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 5d8541ab870..0aa74599c3a 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -57,12 +57,12 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 61b12164f24..ba5a9ead698 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { cp jars/*.jar $out/share/java ''; - meta = { + meta = with stdenv.lib; { homepage = http://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = "bsd"; + license = licenses.bsd3; }; } diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index ce57c214183..72221c0eec0 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-iodbc=${libiodbc}"; - meta = { + meta = with stdenv.lib; { homepage = http://psqlodbc.projects.postgresql.org/; description = "ODBC driver for PostgreSQL"; - license = "LGPL"; + license = licenses.lgpl2; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 383b7a0e079..7d49bde68c1 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { buildInputs = [ lzo ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.lzop.org; description = "Fast file compressor"; - license = "GPL"; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index bc1f86e3661..08f99469d25 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with stdenv.lib; { homepage = http://optipng.sourceforge.net/; description = "A PNG optimizer"; - license = "bsd"; + license = licenses.zlib; }; } diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index fd26174f197..f35553ea168 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation { --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin ''; - meta = { + meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; homepage = http://www.mobileread.com/forums/showthread.php?t=21906; - license = "bsd"; + license = licenses.mit; }; } diff --git a/pkgs/tools/security/muscleframework/default.nix b/pkgs/tools/security/muscleframework/default.nix index 97b0617d396..c1b9dad91ff 100644 --- a/pkgs/tools/security/muscleframework/default.nix +++ b/pkgs/tools/security/muscleframework/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation { buildInputs = [ libmusclecard pkgconfig pcsclite]; - meta = { + meta = with stdenv.lib; { description = "MUSCLE smart card framework - mcard plugin"; homepage = http://muscleplugins.alioth.debian.org/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.bsd3; + maintainers = with maintainers; [viric]; # XXX: don't build before libmusclecard is fixed # platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index cc369835f25..34f75609e4f 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation { buildInputs = [ libmusclecard pcsclite pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.bsd3; + maintainers = with maintainers; [viric]; # XXX: don't build before libmusclecard is fixed # platforms = with stdenv.lib.platforms; linux; }; From e3b3dff1d5af035e27a560d2736414f94d134085 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 11:18:55 +0000 Subject: [PATCH 200/412] dfc: 3.0.4 -> 3.0.5 --- pkgs/tools/system/dfc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 84150b46837..63a6e7e1fa3 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { - name = "dfc-3.0.4"; + name = "dfc-3.0.5"; src = fetchurl { - url = "http://projects.gw-computing.net/attachments/download/79/dfc-3.0.4.tar.gz"; - sha256 = "0bdc2edb92c7f740a0b7d3fa75eb134adf197ba711bfa589ab51c691fabd617e"; + url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; + sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w"; }; buildInputs = [ cmake gettext ]; From 8fc618503795a161ab6a261c8b4cac799b3f23b4 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Wed, 10 Jun 2015 13:33:59 +0200 Subject: [PATCH 201/412] Update syncthing to 0.11.8 (Also should fix failing test on i686 as per its Changelog) --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1e26e61161c..30fda1e0fac 100644 --- 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.11.7"; + version = "0.11.8"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d"; + sha256 = "fed98ac47fd84aecee7770dd59e5e68c5bc429d50b361f13b9ea2e28c3be62cf"; }; subPackages = [ "cmd/syncthing" ]; @@ -26,7 +26,7 @@ buildGoPackage rec { homepage = http://syncthing.net/; description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matejc ]; + maintainers = with lib.maintainers; [ matejc theuni ]; platforms = with lib.platforms; unix; }; } From 38b58bab62d60c3cd8a1cb0d3ccf3ade5d9cb2ee Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 10 Jun 2015 15:00:20 +0200 Subject: [PATCH 202/412] gcr: propagate p11_kit required in the pc file --- pkgs/desktops/gnome-3/3.16/core/gcr/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix index b3acdee072d..f9d87298fff 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt + pkgconfig intltool gnupg glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala ]; + propagatedBuildInputs = [ p11_kit ]; + #doCheck = true; preFixup = '' From 0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Jun 2015 12:02:48 +0200 Subject: [PATCH 203/412] Drop obsolete boot=on parameter --- nixos/lib/test-driver/Machine.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index db2c1a68692..6df8ddb9e95 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -21,7 +21,7 @@ sub new { my ($class, $args) = @_; my $startCommand = $args->{startCommand}; - + my $name = $args->{name}; if (!$name) { $startCommand =~ /run-(.*)-vm$/ if defined $startCommand; @@ -34,7 +34,7 @@ sub new { "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; my $iface = $args->{hdaInterface} || "virtio"; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report " + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report " if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; @@ -171,7 +171,7 @@ sub start { eval { local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; }; - + # Wait until QEMU connects to the monitor. accept($self->{monitor}, $monitorS) or die; @@ -182,11 +182,11 @@ sub start { $self->{socket}->autoflush(1); }; die "$@" if $@; - + $self->waitForMonitorPrompt; $self->log("QEMU running (pid $pid)"); - + $self->{pid} = $pid; $self->{booted} = 1; } @@ -241,7 +241,7 @@ sub connect { alarm 300; readline $self->{socket} or die "the VM quit before connecting\n"; alarm 0; - + $self->log("connected to guest root shell"); $self->{connected} = 1; @@ -270,7 +270,7 @@ sub isUp { sub execute_ { my ($self, $command) = @_; - + $self->connect; print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n"); @@ -453,7 +453,7 @@ sub shutdown { sub crash { my ($self) = @_; return unless $self->{booted}; - + $self->log("forced crash"); $self->sendMonitorCommand("quit"); From e5db79a8597873472c49d18061f6fd9e6f3e7437 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Jun 2015 12:04:26 +0200 Subject: [PATCH 204/412] Move stuff to modules/profiles/installation-device.nix --- .../installer/cd-dvd/installation-cd-base.nix | 15 +----------- .../cd-dvd/installation-cd-minimal.nix | 5 +--- .../modules/profiles/installation-device.nix | 23 +++++++++++++++++-- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 5bd10823108..bc3bd872d2a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -7,8 +7,7 @@ with lib; { imports = - [ ./channel.nix - ./iso-image.nix + [ ./iso-image.nix # Profiles of this basic installation CD. ../../profiles/all-hardware.nix @@ -21,18 +20,6 @@ with lib; isoImage.volumeID = substring 0 11 "NIXOS_ISO"; - # Make the installer more likely to succeed in low memory - # environments. The kernel's overcommit heustistics bite us - # fairly often, preventing processes such as nix-worker or - # download-using-manifests.pl from forking even if there is - # plenty of free memory. - boot.kernel.sysctl."vm.overcommit_memory" = "1"; - - # To speed up installation a little bit, include the complete stdenv - # in the Nix store on the CD. Archive::Cpio is needed for the - # initrd builder. nixos-artwork is needed for the GRUB background. - isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ]; - # EFI booting isoImage.makeEfiBootable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index f34e789e28c..4641b8fcf9d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,14 +1,11 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, pkgs, lib, ... }: +{ config, lib, ... }: { imports = [ ./installation-cd-base.nix ../../profiles/minimal.nix ]; - - # Enable in installer, even if minimal profile disables it - services.nixosManual.enable = lib.mkOverride 999 true; } diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a41d17e5182..946032781f4 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -1,5 +1,5 @@ # Provide a basic configuration for installation devices like CDs. -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,10 +13,17 @@ with lib; # Allow "nixos-rebuild" to work properly by providing # /etc/nixos/configuration.nix. ./clone-config.nix + + # Include a copy of Nixpkgs so that nixos-install works out of + # the box. + ../installer/cd-dvd/channel.nix ]; config = { + # Enable in installer, even if the minimal profile disables it. + services.nixosManual.enable = mkForce true; + # Show the manual. services.nixosManual.showManual = true; @@ -43,7 +50,7 @@ with lib; systemd.services.sshd.wantedBy = mkOverride 50 []; # Enable wpa_supplicant, but don't start it by default. - networking.wireless.enable = true; + networking.wireless.enable = mkDefault true; jobs.wpa_supplicant.startOn = mkOverride 50 ""; # Tell the Nix evaluator to garbage collect more aggressively. @@ -51,5 +58,17 @@ with lib; # (yet) have swap set up. environment.variables.GC_INITIAL_HEAP_SIZE = "100000"; + # Make the installer more likely to succeed in low memory + # environments. The kernel's overcommit heustistics bite us + # fairly often, preventing processes such as nix-worker or + # download-using-manifests.pl from forking even if there is + # plenty of free memory. + boot.kernel.sysctl."vm.overcommit_memory" = "1"; + + # To speed up installation a little bit, include the complete + # stdenv in the Nix store on the CD. Archive::Cpio is needed for + # the initrd builder. + system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + }; } From d906939e74b79318b4493c2085bcfe3f7dd92bb7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Jun 2015 13:14:40 +0200 Subject: [PATCH 205/412] Installer tests: Don't use the ISO We already have separate tests for checking whether the ISO boots correctly, so it's not necessary to do that here. So now tests/installer.nix just tests nixos-install, from a regular NixOS VM that uses the host's Nix store. This makes running the tests more convenient because we don't have to build a new ISO after every change. --- nixos/modules/virtualisation/qemu-vm.nix | 34 ++-- nixos/release.nix | 1 - nixos/tests/installer.nix | 208 +++++++---------------- 3 files changed, 85 insertions(+), 158 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 8c7e840910d..dcb498493fa 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -61,8 +61,8 @@ let idx=2 extraDisks="" ${flip concatMapStrings cfg.emptyDiskImages (size: '' - ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M" - extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report" + ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" + extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=virtio,werror=report" idx=$((idx + 1)) '')} @@ -83,7 +83,7 @@ let '' else '' ''} '' else '' - -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ @@ -165,7 +165,7 @@ let ${config.system.build.toplevel}/bin/switch-to-configuration boot umount /boot - '' + '' # */ ); in @@ -204,17 +204,25 @@ in ''; }; + virtualisation.bootDevice = + mkOption { + type = types.str; + default = "/dev/vda"; + description = + '' + The disk to be used for the root filesystem. + ''; + }; + virtualisation.emptyDiskImages = mkOption { default = []; type = types.listOf types.int; description = '' - Additional disk images to provide to the VM, the value is a list of - sizes in megabytes the empty disk should be. - - These disks are writeable by the VM and will be thrown away - afterwards. + Additional disk images to provide to the VM. The value is + a list of size in megabytes of each disk. These disks are + writeable by the VM. ''; }; @@ -341,7 +349,7 @@ in config = { - boot.loader.grub.device = mkVMOverride "/dev/vda"; + boot.loader.grub.device = mkVMOverride cfg.bootDevice; boot.initrd.extraUtilsCommands = '' @@ -353,9 +361,9 @@ in '' # If the disk image appears to be empty, run mke2fs to # initialise. - FSTYPE=$(blkid -o value -s TYPE /dev/vda || true) + FSTYPE=$(blkid -o value -s TYPE ${cfg.bootDevice} || true) if test -z "$FSTYPE"; then - mke2fs -t ext4 /dev/vda + mke2fs -t ext4 ${cfg.bootDevice} fi ''; @@ -396,7 +404,7 @@ in # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). fileSystems = mkVMOverride ( - { "/".device = "/dev/vda"; + { "/".device = cfg.bootDevice; ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; diff --git a/nixos/release.nix b/nixos/release.nix index 3559926eefa..51a58da4454 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -256,7 +256,6 @@ in rec { tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); - tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index fc65f392a1f..187543ab8e3 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -6,45 +6,8 @@ with pkgs.lib; let - # Build the ISO. This is the regular minimal installation CD but - # with test instrumentation. - iso = - (import ../lib/eval-config.nix { - inherit system; - modules = - [ ../modules/installer/cd-dvd/installation-cd-minimal.nix - ../modules/testing/test-instrumentation.nix - { key = "serial"; - boot.loader.grub.timeout = mkOverride 0 0; - - # The test cannot access the network, so any sources we - # need must be included in the ISO. - isoImage.storeContents = - [ pkgs.glibcLocales - pkgs.sudo - pkgs.docbook5 - pkgs.docbook5_xsl - pkgs.unionfs-fuse - - # Bootloader support - pkgs.grub - pkgs.grub2 - pkgs.grub2_efi - pkgs.gummiboot - pkgs.perlPackages.XMLLibXML - pkgs.perlPackages.ListCompare - ]; - - # Don't use https://cache.nixos.org since the fake - # cache.nixos.org doesn't do https. - nix.binaryCaches = [ http://cache.nixos.org/ ]; - } - ]; - }).config.system.build.isoImage; - - # The configuration to install. - makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier + makeConfig = { grubVersion, grubDevice, grubIdentifier , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' @@ -53,7 +16,6 @@ let { imports = [ ./hardware-configuration.nix - ]; boot.loader.grub.version = ${toString grubVersion}; @@ -68,94 +30,39 @@ let ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; + hardware.enableAllFirmware = lib.mkForce false; - nix.binaryCaches = [ http://cache.nixos.org/ ]; ${replaceChars ["\n"] ["\n "] extraConfig} } ''; - # Configuration of a web server that simulates the Nixpkgs channel - # distribution server. - webserver = - { config, lib, pkgs, ... }: - - { services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - services.httpd.servedDirs = singleton - { urlPath = "/"; - dir = "/tmp/channel"; - }; - - virtualisation.writableStore = true; - virtualisation.pathsInNixDB = channelContents ++ [ pkgs.hello.src ]; - virtualisation.memorySize = 768; - - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - channelContents = [ pkgs.rlwrap ]; - # The test script boots the CD, installs NixOS on an empty hard + # The test script boots a NixOS VM, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice + testScriptFun = { createPartitions, grubVersion, grubDevice , grubIdentifier, preBootCommands, extraConfig }: let - # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if grubVersion == 1 then "scsi" else "virtio"; qemuFlags = - (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 "); - hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; + (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); + hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''; in '' - createDisk("harddisk", 8 * 1024); - - my $machine = createMachine({ ${hdFlags} - cdrom => glob("${iso}/iso/*.iso"), - qemuFlags => "${qemuFlags} " . '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}' }); $machine->start; - ${optionalString testChannel '' - # Create a channel on the web server containing a few packages - # to simulate the Nixpkgs channel. - $webserver->start; - $webserver->waitForUnit("httpd"); - $webserver->succeed( - "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " . - "${toString channelContents} >&2"); - $webserver->succeed("mkdir /tmp/channel/sha256"); - $webserver->succeed("cp ${pkgs.hello.src} /tmp/channel/sha256/${pkgs.hello.src.outputHash}"); - ''} - # Make sure that we get a login prompt etc. $machine->succeed("echo hello"); #$machine->waitForUnit('getty@tty2'); $machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); - ${optionalString testChannel '' - $machine->waitForUnit("dhcpcd"); - - # Allow the machine to talk to the fake nixos.org. - $machine->succeed( - "rm /etc/hosts", - "echo 192.168.1.1 nixos.org cache.nixos.org tarballs.nixos.org > /etc/hosts", - "ifconfig eth1 up 192.168.1.2", - ); - - # Test nix-env. - $machine->fail("hello"); - $machine->succeed("nix-env -i hello"); - $machine->succeed("hello") =~ /Hello, world/ - or die "bad `hello' output"; - ''} - # Wait for hard disks to appear in /dev $machine->succeed("udevadm settle"); @@ -163,14 +70,12 @@ let ${createPartitions} # Create the NixOS configuration. - $machine->succeed( - "nixos-generate-config --root /mnt", - ); + $machine->succeed("nixos-generate-config --root /mnt"); $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -188,7 +93,7 @@ let # Now see if we can boot the installation. $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); - # For example to enter LUKS passphrase + # For example to enter LUKS passphrase. ${preBootCommands} # Did /boot get mounted? @@ -209,9 +114,9 @@ let $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/ or die "nix-env failed"; - # We need to a writable nix-store on next boot + # We need to a writable nix-store on next boot. $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -220,7 +125,7 @@ let # Test nixos-option. $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console"); $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'"); - $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix"); + $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix"); $machine->shutdown; @@ -229,7 +134,7 @@ let ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -245,16 +150,60 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" - , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" + , grubVersion ? 2, grubDevice ? "/dev/vda" , grubIdentifier ? "uuid", enableOCR ? false }: makeTest { - inherit iso; - name = "installer-" + name; - nodes = if testChannel then { inherit webserver; } else { }; inherit enableOCR; + name = "installer-" + name; + + nodes = { + + # The configuration of the machine used to run "nixos-install". It + # also has a web server that simulates cache.nixos.org. + machine = + { config, lib, pkgs, ... }: + + { imports = + [ ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + virtualisation.diskSize = 8 * 1024; + virtualisation.memorySize = 768; + virtualisation.writableStore = true; + + # Use a small /dev/vdb as the root disk for the + # installer. This ensures the target disk (/dev/vda) is + # the same during and after installation. + virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.bootDevice = "/dev/vdb"; + + hardware.enableAllFirmware = mkForce false; + + # The test cannot access the network, so any packages we + # need must be included in the VM. + system.extraDependencies = + [ pkgs.sudo + pkgs.docbook5 + pkgs.docbook5_xsl + pkgs.unionfs-fuse + pkgs.ntp + pkgs.nixos-artwork + pkgs.gummiboot + pkgs.perlPackages.XMLLibXML + pkgs.perlPackages.ListCompare + ] + ++ optional (grubVersion == 1) pkgs.grub + ++ optionals (grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; + + nix.binaryCaches = mkForce [ ]; + }; + + }; + testScript = testScriptFun { - inherit createPartitions preBootCommands testChannel grubVersion + inherit createPartitions preBootCommands grubVersion grubDevice grubIdentifier extraConfig; }; }; @@ -281,7 +230,6 @@ in { "mount LABEL=nixos /mnt", ); ''; - testChannel = true; }; # Same as the previous, but now with a separate /boot partition. @@ -413,40 +361,11 @@ in { "mkfs.ext3 -L nixos /dev/sda2", "mount LABEL=nixos /mnt", ); - ''; grubVersion = 1; grubDevice = "/dev/sda"; }; - # Rebuild the CD configuration with a little modification. - rebuildCD = makeTest - { inherit iso; - name = "rebuild-cd"; - nodes = { }; - testScript = - '' - my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 768' }); - $machine->start; - - # Enable sshd service. - $machine->succeed( - "sed -i 's,^}\$,systemd.services.sshd.wantedBy = pkgs.lib.mkOverride 0 [\"multi-user.target\"]; },' /etc/nixos/configuration.nix" - ); - - $machine->succeed("cat /etc/nixos/configuration.nix >&2"); - - # Apply the new CD configuration. - $machine->succeed("nixos-rebuild test"); - - # Connect to it-self. - $machine->waitForUnit("sshd"); - $machine->waitForOpenPort(22); - - $machine->shutdown; - ''; - }; - # Test using labels to identify volumes in grub simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' @@ -545,4 +464,5 @@ in { ); ''; }; + } From 8e88710693910f8bac1a6db388113d8a894adac4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Jun 2015 15:18:54 +0200 Subject: [PATCH 206/412] Installer test: Remove apparently useless setting of nix.readOnlyStore --- nixos/tests/installer.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 187543ab8e3..4feed56cd67 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -8,7 +8,7 @@ let # The configuration to install. makeConfig = { grubVersion, grubDevice, grubIdentifier - , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + , extraConfig, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -28,8 +28,6 @@ let boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; - ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - hardware.enableAllFirmware = lib.mkForce false; ${replaceChars ["\n"] ["\n "] extraConfig} @@ -116,7 +114,7 @@ let # We need to a writable nix-store on next boot. $machine->copyFileFromHost( - "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -134,7 +132,7 @@ let ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; From 8cf5d48d0333c791143362b7286aa82aed7ea5d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Jun 2015 15:27:50 +0200 Subject: [PATCH 207/412] Make the boot test release-critical --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d501c2e7c53..ddedcd9fe97 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -62,6 +62,7 @@ in rec { (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) + (all nixos.tests.bootBiosCdrom) (all nixos.tests.ipv6) (all nixos.tests.kde4) (all nixos.tests.lightdm) From 6fa0db5a31bd2eb19d574af8dd57f252c4223dd3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 10 Jun 2015 16:13:34 +0200 Subject: [PATCH 208/412] coqPackages.fiat: disable parallel build to fix build --- pkgs/development/coq-modules/fiat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix index 92b69319e0b..df4ea133cd9 100644 --- a/pkgs/development/coq-modules/fiat/default.nix +++ b/pkgs/development/coq-modules/fiat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; - enableParallelBuilding = true; + enableParallelBuilding = false; doCheck = true; unpackPhase = '' From 330758e7886a7e1520056637dc4fa2a5bed4755a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 10 Jun 2015 17:21:48 +0100 Subject: [PATCH 209/412] cran: remove bad mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gives ‘welcome to nginix’ pages --- pkgs/build-support/fetchurl/mirrors.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 7f61ddc77db..1453af3a62a 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -339,7 +339,6 @@ rec { http://cran.hafro.is/ http://ftp.iitm.ac.in/cran/ http://cran.repo.bppt.go.id/ - http://cran.unej.ac.id/ http://cran.um.ac.ir/ http://ftp.heanet.ie/mirrors/cran.r-project.org/ http://cran.mirror.garr.it/mirrors/CRAN/ From 5a64cc1dc8e6fc3f832cc3f88cbb37b23b0137f5 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 16:22:23 +0000 Subject: [PATCH 210/412] git: 2.4.1 -> 2.4.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 60bfaa86199..29ec3b50786 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.4.1"; + version = "2.4.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj"; + sha256 = "1rf942v2yk49xgy0asgk4vi4mmshpz823iyvrxc5n5y2v0ffq0a8"; }; patches = [ From e26bfbe26f21da0c54ee584955400ea491bb6268 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 10 Jun 2015 18:08:43 +0200 Subject: [PATCH 211/412] grsecurity: Update stable and test patches stable: 3.1-3.14.43-201506021902 -> 3.1-3.14.44-201506082249 test: 3.1-4.0.4-201506021902 -> 3.1-4.0.5-201506082251 --- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f622bf9c782..4815cae259b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.43"; - revision = "201506021902"; + { kversion = "3.14.44"; + revision = "201506082249"; branch = "stable"; - sha256 = "1b8kp9q9kslxz4adv1h0qahd96wnidpaa3k1mqmcaf8ia1b63dsk"; + sha256 = "11lclmiyg37bq3sgf6d6lky5yngr15hgmgkilrhy3081ifnsf7ax"; }; grsecurity_unstable = grsecPatch - { kversion = "4.0.4"; - revision = "201506021902"; + { kversion = "4.0.5"; + revision = "201506082251"; branch = "test"; - sha256 = "03fbx2vmlvh0bng3l4nxkfdxkgl9sgjkmwd0irq2bvb3gwk2bp03"; + sha256 = "03im0gq8b2n6fdxvrdd5iyi1viwl83zfjwqbamqyvkhmi2vbvhwk"; }; grsec_fix_path = From 0ac1de60e93568524873d1bb1c69f06a1bcb6033 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 16:34:45 +0000 Subject: [PATCH 212/412] lsof: 4.87 -> 4.88 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 1ef292407a4..6370e7447f2 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lsof-4.87"; + name = "lsof-4.88"; src = fetchurl { - url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.87.tar.bz2; - sha256 = "0b6si72sml7gr9784ak491cxxbm9mx5bh174yg6rrirbv04kgpfz"; + url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2; + sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; From ffdb7ab9a2b4fb4cb454c260919fe5244c2f0a00 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 17:03:10 +0000 Subject: [PATCH 213/412] mpc: 0.26 -> 0.27 --- pkgs/applications/audio/mpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 9224e21185b..2f798fff7b9 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, mpd_clientlib }: stdenv.mkDerivation rec { - version = "0.26"; + version = "0.27"; name = "mpc-${version}"; src = fetchurl { url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz"; - sha256 = "0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0"; + sha256 = "0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5"; }; buildInputs = [ mpd_clientlib ]; From 4387cd58417ced3eb24abe8ce9d3da576e81d034 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 17:16:31 +0000 Subject: [PATCH 214/412] glances: 2.3 -> 2.4.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac800873860..84c5d181c17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5708,14 +5708,14 @@ let glances = buildPythonPackage rec { name = "glances-${version}"; - version = "2.3"; + version = "2.4.2"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "09x9g4wzfxfhpby3aa1fbhw3iqv1vyd6h526nrm9612ba5d0myh9"; + sha256 = "1ghx62z63yyf8wv4bcvfxwxs5mc7b4nrcss6lc1i5s0yjvzvyi6h"; }; doCheck = false; From aece1407d5a568e90d0c680fbc58266759cf6db4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 10 Jun 2015 11:48:52 -0700 Subject: [PATCH 215/412] pulseaudio: Add a flag for supporting 32-bit --- nixos/modules/config/pulseaudio.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 566130feb6d..bd010738500 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); ids = config.ids; @@ -78,6 +78,12 @@ in { ''; }; + support32Bit = mkOption { + type = types.bool; + default = false; + description = "no"; + }; + configFile = mkOption { type = types.path; description = '' From c891134b77c05b98d1fc89f2bac394dbe4382fe8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 10 Jun 2015 11:50:21 -0700 Subject: [PATCH 216/412] nixos/grub: Prevent module errors and make gfxmode configurable --- .../modules/system/boot/loader/grub/grub.nix | 22 +++++++++++++++++-- .../system/boot/loader/grub/install-grub.pl | 20 ++++++++++++----- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0b6333ab573..cb01774f9ab 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -28,7 +28,7 @@ let f = x: if x == null then "" else "" + x; grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML - { splashImage = f config.boot.loader.grub.splashImage; + { splashImage = f cfg.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); shell = "${pkgs.stdenv.shell}"; @@ -42,7 +42,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default fsIdentifier efiSupport; + default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; path = (makeSearchPath "bin" ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -242,6 +242,24 @@ in ''; }; + gfxmodeEfi = mkOption { + default = "auto"; + example = "1024x768"; + type = types.str; + description = '' + The gfxmode to pass to grub when loading a graphical boot interface under efi. + ''; + }; + + gfxmodeBios = mkOption { + default = "1024x768"; + example = "auto"; + type = types.str; + description = '' + The gfxmode to pass to grub when loading a graphical boot interface under bios. + ''; + }; + configurationLimit = mkOption { default = 100; example = 120; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index fcf5871203d..016b5a23ed4 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -57,6 +57,8 @@ my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); +my $gfxmodeEfi = get("gfxmodeEfi"); +my $gfxmodeBios = get("gfxmodeBios"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -255,14 +257,22 @@ else { fi # Setup the graphics stack for bios and efi systems - insmod vbe - insmod efi_gop - insmod efi_uga + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi insmod font if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then insmod gfxterm - set gfxmode=auto - set gfxpayload=keep + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=keep + else + set gfxmode=$gfxmodeBios + set gfxpayload=text + fi terminal_output gfxterm fi "; From 93ddc18a59bec4107a00c2c26ac144fdf68ebd15 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 10 Jun 2015 14:24:23 -0700 Subject: [PATCH 217/412] Make jdk / jre derivations installable --- pkgs/top-level/all-packages.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6616c76f9a5..70d38f76e60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3945,23 +3945,28 @@ let openjdk7 = callPackage ../development/compilers/openjdk { bootjdk = openjdk7-bootstrap; }; - openjdk7_jre = openjdk7.jre; + openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; + openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; }; openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { bootjdk = openjdk8-bootstrap; }; - openjdk8_jre = openjdk8.jre; + openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; + openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; }; openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; - jdk7 = openjdk7; - jre7 = jdk7.jre; + java7 = openjdk7; + jdk7 = java7 // { outputs = [ "out" ]; }; + jre7 = java7 // { outputs = [ "jre" ]; }; - jdk8 = openjdk8; - jre8 = jdk8.jre; + java8 = openjdk8; + jdk8 = java8 // { outputs = [ "out" ]; }; + jre8 = java8 // { outputs = [ "jre" ]; }; - jdk = if stdenv.isDarwin then openjdk-darwin else jdk8; - jre = jdk.jre; + java = if stdenv.isDarwin then openjdk-darwin else jdk8; + jdk = java // { outputs = [ "out" ]; }; + jre = java // { outputs = [ "jre" ]; }; oraclejdk = pkgs.jdkdistro true false; From adbed3fb6af990d480e1b83eaf0a636260ee6a91 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 18:18:04 +0200 Subject: [PATCH 218/412] pythonPackages.neovim: new package added --- pkgs/top-level/python-packages.nix | 56 +++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c324ae1c00c..94e26068252 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5509,18 +5509,18 @@ let }; futures = buildPythonPackage rec { - name = "futures-2.1.6"; - + name = "futures-3.0.2"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz"; - md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453"; + url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz"; + md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a"; }; meta = with pkgs.stdenv.lib; { description = "Backport of the concurrent.futures package from Python 3.2"; - homepage = http://code.google.com/p/pythonfutures; + homepage = "https://github.com/agronholm/pythonfutures"; license = licenses.bsd2; + maintainers = with maintainers; [ garbas ]; }; }; @@ -15718,4 +15718,50 @@ let }; }; + trollius = buildPythonPackage rec { + version = "1.0.4"; + name = "trollius-${version}"; + disabled = ! isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz"; + md5 = "3631a464d49d0cbfd30ab2918ef2b783"; + }; + + buildInputs = [ self.mock ]; + + propagatedBuildInputs = [ self.futures ]; + + meta = { + description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; + homepage = "https://bitbucket.org/enovance/trollius"; + license = licenses.asl20; + maintainers = with maintainers; [ garbas ]; + }; + }; + + neovim = buildPythonPackage rec { + version = "0.0.36"; + name = "neovim-${version}"; + disabled = ! isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz"; + md5 = "8cdad23402e29c7c5a1e85770e976edf"; + }; + + propagatedBuildInputs = with self; [ + msgpack + trollius + greenlet + ]; + + meta = { + description = "Python client for Neovim"; + homepage = "https://github.com/neovim/python-client"; + license = licenses.asl20; + maintainers = with maintainers; [ garbas ]; + }; + }; + }; in pythonPackages From 4970aa6f46d50516c27da6645a8b10072521bba8 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 23:23:52 +0200 Subject: [PATCH 219/412] pythonPackages: fix apscheduler --- pkgs/top-level/python-packages.nix | 44 +++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94e26068252..f974529930c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -522,17 +522,54 @@ let }; }; + funcsigs = buildPythonPackage rec { + name = "funcsigs-0.4"; + disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/funcsigs/${name}.tar.gz"; + md5 = "fb1d031f284233e09701f6db1281c2a5"; + }; + + buildInputs = with self; [ + unittest2 + ]; + + meta = with pkgs.stdenv.lib; { + description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; + homepage = "https://github.com/aliles/funcsigs"; + maintainers = with maintainers; [ garbas ]; + license = licenses.asl20; + }; + }; apscheduler = buildPythonPackage rec { name = "APScheduler-3.0.1"; - - propagatedBuildInputs = with self; [ futures tzlocal six pytest mock sqlalchemy9 ]; + disabled = !isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz"; - sha256 = "1dcyk58svhhd7flpq0fbyzcp0z3a1as4ddmdv1rxqvqng0sxhwaf"; + md5 = "7c3687b3dcd645fe9df48e34eb7a7592"; }; + buildInputs = with self; [ + pytest + sqlalchemy9 + tornado + twisted + mock + trollius + funcsigs + gevent + ]; + + propagatedBuildInputs = with self; [ + six + pytz + tzlocal + futures + ]; + meta = with pkgs.stdenv.lib; { description = "A Python library that lets you schedule your Python code to be executed"; homepage = http://pypi.python.org/pypi/APScheduler/; @@ -540,7 +577,6 @@ let }; }; - area53 = buildPythonPackage (rec { name = "Area53-0.94"; From 1c3585e411fa4f2f47c38454da2cb825ebd7b3e7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 23:50:01 +0200 Subject: [PATCH 220/412] pythonPackages.livestreamer: fix builds for py33 and py34 --- pkgs/top-level/python-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f974529930c..a6515c7b13a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7943,8 +7943,13 @@ let sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; - buildInputs = with self; [ pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ]; + buildInputs = [ pkgs.makeWrapper ]; + + propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests2 ] + ++ optionals isPy26 [ singledispatch futures argparse ] + ++ optionals isPy27 [ singledispatch futures ] + ++ optionals isPy33 [ singledispatch ]; + postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; From 50bf92623df5ec88de6fb63d8a83ba6e39049f03 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 10 Jun 2015 23:57:13 +0200 Subject: [PATCH 221/412] Update package 'fira' to version 4.103. --- pkgs/data/fonts/fira/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 151c945ee9e..6646fcb86b1 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.1"; + name = "fira-4.103"; src = fetchurl { - url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip"; - sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk"; + url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4103.zip; + sha256 = "1nw5icg3134qq2qfspvj2kclsv3965szby2lfcr65imf7lj4k52z"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4100"; + sourceRoot = "FiraFonts4103"; installPhase = '' mkdir -p $out/share/fonts/opentype From 3b95f897359cb63270a0c34df300a5f447dd15d0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 11 Jun 2015 00:06:44 +0200 Subject: [PATCH 222/412] Update package 'fira-mono' to version 3.203. --- pkgs/data/fonts/fira-mono/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 92d6b1e25b5..a01f2a62424 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-mono-3.2"; + name = "fira-mono-3.203"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip; - sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p"; + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3203.zip; + sha256 = "0qaplpmsqys42a49x8d15ca2gqw1v6a6k2d56ja1j38dmr2qmpv4"; }; buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraMonoFonts3200"; + sourceRoot = "FiraMonoFonts3203"; installPhase = '' mkdir -p $out/share/fonts/opentype From bb23251c90068e849c447830f6b6bd52565239f1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 10 Jun 2015 15:33:22 -0700 Subject: [PATCH 223/412] java: Fix jre derivations --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70d38f76e60..fc66f38a755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3946,27 +3946,27 @@ let bootjdk = openjdk7-bootstrap; }; openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; - openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; }; + openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; }; openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { bootjdk = openjdk8-bootstrap; }; openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; - openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; }; + openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; }; openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; java7 = openjdk7; jdk7 = java7 // { outputs = [ "out" ]; }; - jre7 = java7 // { outputs = [ "jre" ]; }; + jre7 = java7.jre // { outputs = [ "jre" ]; }; java8 = openjdk8; jdk8 = java8 // { outputs = [ "out" ]; }; - jre8 = java8 // { outputs = [ "jre" ]; }; + jre8 = java8.jre // { outputs = [ "jre" ]; }; java = if stdenv.isDarwin then openjdk-darwin else jdk8; jdk = java // { outputs = [ "out" ]; }; - jre = java // { outputs = [ "jre" ]; }; + jre = java.jre // { outputs = [ "jre" ]; }; oraclejdk = pkgs.jdkdistro true false; From 502a19b2b47418393ff00c38622285207884d460 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 10 Jun 2015 15:47:08 -0700 Subject: [PATCH 224/412] nixos/grub: Support labeling efi bootloaders with independent id's --- .../modules/system/boot/loader/grub/grub.nix | 21 +++++++++++++++++-- .../system/boot/loader/grub/install-grub.pl | 3 ++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index cb01774f9ab..449f58ae4dd 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -27,7 +27,12 @@ let f = x: if x == null then "" else "" + x; - grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML + grubConfig = args: + let + efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; + efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint; + in + pkgs.writeText "grub-config.xml" (builtins.toXML { splashImage = f cfg.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); @@ -36,7 +41,8 @@ let grubEfi = f grubEfi; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; bootPath = args.path; - efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; + bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; + inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) @@ -141,6 +147,17 @@ in ''; }; + efiBootloaderId = mkOption { + default = null; + example = "NixOS-fsid"; + type = types.nullOr types.str; + description = '' + The id of the bootloader to store in efi nvram. + The default is to name it NixOS and append the path or efiSysMountPoint. + This is only used if boot.loader.efi.canTouchEfiVariables is true. + ''; + }; + devices = mkOption { default = [ ]; example = [ "/dev/sda" "/dev/sdb" ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 016b5a23ed4..66d82e091d1 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -59,6 +59,7 @@ my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); +my $bootloaderId = get("bootloaderId"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -521,7 +522,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; if ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0 + system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } else { system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 From 51ce29718750fb34c0d849942a9462e520081577 Mon Sep 17 00:00:00 2001 From: William Giokas <1007380@gmail.com> Date: Sun, 7 Jun 2015 11:34:29 -0700 Subject: [PATCH 225/412] youtube-dl: make a python package This allows youtube-dl to support all versions of python, and be built correctly even when the python version is overridden by the user. An alias to youtube-dl has been added which points to the default python version's youtube-dl. Also, ffmpeg has been made into an optional dependency. If ffmpeg is set to 'null' then it will not be built and there will be no wrapper for it either. An extra package, youtube-dl-light, is the same as youtube-dl but without the ffmpeg dependency. --- pkgs/tools/misc/youtube-dl/default.nix | 18 ++++++------------ pkgs/top-level/all-packages.nix | 7 +------ pkgs/top-level/python-packages.nix | 13 +++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3985f8a0c83..eb337573018 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }: +{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg +, pandoc ? null }: # Pandoc is required to build the package's man page. Release tarballs # contain a formatted man page already, though, so it's fine to pass @@ -7,7 +8,7 @@ # case someone wants to use this derivation to build a Git version of # the tool that doesn't have the formatted man page included. -stdenv.mkDerivation rec { +buildPythonPackage rec { name = "youtube-dl-${version}"; version = "2015.05.29"; @@ -16,18 +17,11 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - buildInputs = [ python makeWrapper zip pandoc ]; - - patchPhase = "rm youtube-dl"; - - configurePhase = '' - makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) - ''; + buildInputs = [ makeWrapper zip pandoc ]; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. - postInstall = '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" - ''; + postInstall = stdenv.lib.optionalString (ffmpeg != null) + ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; meta = with stdenv.lib; { homepage = "http://rg3.github.com/youtube-dl/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b49c2e3b59d..3eb1ef1fddd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3391,12 +3391,6 @@ let # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; - youtube-dl = callPackage ../tools/misc/youtube-dl { - # Release versions don't need pandoc because the formatted man page - # is included in the tarball. - pandoc = null; - }; - zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { gtk = gtk2; @@ -14774,6 +14768,7 @@ let lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 youtubeDL = youtube-dl; # added 2014-10-26 + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 rdiff_backup = rdiff-backup; # added 2014-11-23 htmlTidy = html-tidy; # added 2014-12-06 libtidy = html-tidy; # added 2014-12-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3ddc879a17..c602200e81f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13466,6 +13466,19 @@ let }; }); + youtube-dl = callPackage ../tools/misc/youtube-dl { + # Release versions don't need pandoc because the formatted man page + # is included in the tarball. + pandoc = null; + }; + + youtube-dl-light = callPackage ../tools/misc/youtube-dl { + # Release versions don't need pandoc because the formatted man page + # is included in the tarball. + ffmpeg = null; + pandoc = null; + }; + zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2"; From 117dfac3d1f07e3958cd20843177d95fdc174c58 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 11 Jun 2015 00:58:23 +0200 Subject: [PATCH 226/412] gnome-pomodoro: Fix meta description --- pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix index ad95b76b2a3..650d978277b 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix @@ -38,9 +38,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/codito/gnome-shell-pomodoro; - description = - "Personal information management application that provides integrated " + - "mail, calendaring and address book functionality"; + description = "A time management utility for GNOME based on the pomodoro technique"; + longDescription = '' + This GNOME utility helps to manage time according to Pomodoro Technique. + It intends to improve productivity and focus by taking short breaks. + ''; maintainers = with maintainers; [ DamienCassou jgeerds ]; license = licenses.gpl3; platforms = platforms.linux; From f2d7f573af9063a3a484c80e426490e5093afe32 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jun 2015 02:42:20 +0200 Subject: [PATCH 227/412] neovim: adding python2 and python3 support neovim: - possibility to extend neovim (via .override) and passing extraPythonPackages or extraPython3Packages - neovim's python interpreter can be found as nvim-python / nvim-python3 - wrapping nvim binary and setting `g:python_host_prog` and `g:python3_host_prog` via --cmd flag python-packages.nix fixes: - ordereddict builds for py26 and uses disabled argument to tell this - trollius builds on all python platforms except 3.4 (where is included in standard librarary) - neovim builds on all python platforms --- pkgs/applications/editors/neovim/default.nix | 61 +++++++++++++++----- pkgs/top-level/python-packages.nix | 37 +++++++----- 2 files changed, 71 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 814b05ced36..e2dbc4abc56 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack , libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack -, luabitop, ncurses, perl, pkgconfig, unibilium -, withJemalloc ? true, jemalloc }: +, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper +, withPython ? true, pythonPackages, extraPythonPackages ? [] +, withPython3 ? true, python3Packages, extraPython3Packages ? [] +, withJemalloc ? true, jemalloc +}: -let version = "2015-06-09"; in -stdenv.mkDerivation rec { - name = "neovim-${version}"; +with stdenv.lib; - src = fetchFromGitHub { - sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; - rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; - repo = "neovim"; - owner = "neovim"; - }; +let + + version = "2015-06-09"; # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { @@ -31,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = http://www.leonerd.org.uk/code/libvterm/; license = licenses.mit; @@ -40,9 +38,30 @@ stdenv.mkDerivation rec { }; }; + pythonEnv = pythonPackages.python.buildEnv.override { + extraLibs = [ pythonPackages.neovim ] ++ extraPythonPackages; + ignoreCollisions = true; + }; + + python3Env = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages; + ignoreCollisions = true; + }; + +in stdenv.mkDerivation rec { + name = "neovim-${version}"; + + src = fetchFromGitHub { + sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; + rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; + repo = "neovim"; + owner = "neovim"; + }; + enableParallelBuilding = true; buildInputs = [ + makeWrapper cmake glib libtermkey @@ -57,7 +76,8 @@ stdenv.mkDerivation rec { neovimLibvterm pkgconfig unibilium - ] ++ stdenv.lib.optional withJemalloc jemalloc; + ] ++ optional withJemalloc jemalloc; + nativeBuildInputs = [ gettext ]; @@ -65,7 +85,20 @@ stdenv.mkDerivation rec { LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - meta = with stdenv.lib; { + postInstall = optionalString withPython '' + ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPython3 '' + ln -s ${python3Env}/bin/python $out/bin/nvim-python3 + '' + optionalString (withPython || withPython3) '' + wrapProgram $out/bin/nvim --add-flags "${ + (optionalString withPython + ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') + + (optionalString withPython3 + ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'') + }" + ''; + + meta = { description = "Vim text editor fork focused on extensibility and agility"; longDescription = '' Neovim is a project that seeks to aggressively refactor Vim in order to: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b47aa36f2c7..4da6cdbcf78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8100,14 +8100,21 @@ let # }; # }); - ordereddict = if isPy26 then (buildPythonPackage { + ordereddict = buildPythonPackage rec { name = "ordereddict-1.1"; + disabled = !isPy26; + src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"; + url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz"; md5 = "a0ed854ee442051b249bfad0f638bbec"; }; - doCheck = false; - }) else null; + + meta = { + description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6."; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; + }; ply = buildPythonPackage (rec { name = "ply-3.4"; @@ -15775,16 +15782,23 @@ let trollius = buildPythonPackage rec { version = "1.0.4"; name = "trollius-${version}"; - disabled = ! isPy27; + disabled = isPy34; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz"; md5 = "3631a464d49d0cbfd30ab2918ef2b783"; }; - buildInputs = [ self.mock ]; + buildInputs = with self; [ mock ] + ++ optional isPy26 unittest2; - propagatedBuildInputs = [ self.futures ]; + propagatedBuildInputs = with self; [] + ++ optional isPy26 ordereddict + ++ optional (isPy26 || isPy27 || isPyPy) futures; + + patchPhase = optionalString isPy26 '' + sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py + ''; meta = { description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; @@ -15797,18 +15811,15 @@ let neovim = buildPythonPackage rec { version = "0.0.36"; name = "neovim-${version}"; - disabled = ! isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz"; md5 = "8cdad23402e29c7c5a1e85770e976edf"; }; - propagatedBuildInputs = with self; [ - msgpack - trollius - greenlet - ]; + propagatedBuildInputs = with self; [ msgpack ] + ++ optional (!isPyPy) greenlet + ++ optional (!isPy34) trollius; meta = { description = "Python client for Neovim"; From 11f0f3cba9bfade848a89a292797cdc0363d6c39 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 10 Jun 2015 21:36:51 -0400 Subject: [PATCH 228/412] photoqt: 1.1.0.1 -> 1.2 remove no longer necessary patch --- .../applications/graphics/photoqt/default.nix | 6 +-- .../photoqt/graphicsmagick-path.patch | 46 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/graphics/photoqt/graphicsmagick-path.patch diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 9e2c3a18a63..2d41cfe5189 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }: let - version = "1.1.0.1"; + version = "1.2"; in stdenv.mkDerivation rec { name = "photoqt-${version}"; src = fetchurl { url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp"; + sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa"; }; buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ]; - patches = [ ./graphicsmagick-path.patch ]; - preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; diff --git a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch deleted file mode 100644 index da9b70e31ed..00000000000 --- a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/CMake/FindMagick.cmake 2014-10-13 19:24:30.000000000 +0200 -+++ b/CMake/FindMagick.cmake 2014-12-27 18:54:19.611759021 +0100 -@@ -19,28 +19,11 @@ - SET(MAGICK++_FOUND "NO" ) - - FIND_PATH( MAGICK_INCLUDE_DIR magick/magick.h -- "$ENV{MAGICK_LOCATION}/magick" -- "$ENV{MAGICK_LOCATION}/include/magick" -- "$ENV{MAGICK_HOME}/include/magick" -- /usr/include/magick -- /usr/include/ -- /usr/include/GraphicsMagick -- /opt/local/include/GraphicsMagick/magick -- /opt/local/include/GraphicsMagick -+ "$ENV{MAGICK_LOCATION}" - ) - - FIND_PATH( MAGICK++_INCLUDE_DIR Magick++.h -- "$ENV{MAGICK++_LOCATION}/Magick++" -- "$ENV{MAGICK++_LOCATION}/include/" -- "$ENV{MAGICK_LOCATION}/Magick++" -- "$ENV{MAGICK_LOCATION}/include/Magick++" -- "$ENV{MAGICK_LOCATION}/include/" -- "$ENV{MAGICK_HOME}/include/" -- /usr/include/Magick++ -- /usr/include/GraphicsMagick -- /usr/include/ -- /opt/local/include/GraphicsMagick/Magick++ -- /opt/local/include/GraphicsMagick -+ "$ENV{MAGICK_LOCATION}" - ) - - FIND_LIBRARY( Magick GraphicsMagick -@@ -55,12 +38,7 @@ - - FIND_LIBRARY( Magick++ GraphicsMagick++ - PATHS -- "$ENV{MAGICK++_LOCATION}/.libs" -- "$ENV{MAGICK_LOCATION}/.libs" -- "$ENV{MAGICK++_LOCATION}/lib" - "$ENV{MAGICK_LOCATION}/lib" -- "$ENV{MAGICK_HOME}/lib" -- /opt/local/lib - DOC "GraphicsMagick Magick++ library" - ) - From 4227b13af6d37225cbbca8fb91a64cc6da1f3d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 1 Jun 2015 18:48:24 +0200 Subject: [PATCH 229/412] pypy: 2.5.1 -> 2.6.0 --- pkgs/development/interpreters/pypy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index c5abefc6a78..a453fd3e1a9 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.5"; - version = "${majorVersion}.1"; + majorVersion = "2.6"; + version = "${majorVersion}.0"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "0gzhgc0rh5ywpkvzishpvkninl41r5k207y8afa8vxwpfx03vcrj"; + sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] From fdc83edd08bf72a68efa52697e4b9e1ed586468c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 11 Jun 2015 10:39:39 +0200 Subject: [PATCH 230/412] Removing python-packages-generated.nix It was an experiment by @garbas in 2014 that has been forgotten because of other, newer experiments. Packages also weren't updated so we shouldn't let them rot in nixpkgs. --- pkgs/top-level/python-packages-generated.nix | 5317 ------------------ pkgs/top-level/python-packages.json | 150 - pkgs/top-level/python-packages.nix | 7 +- 3 files changed, 1 insertion(+), 5473 deletions(-) delete mode 100644 pkgs/top-level/python-packages-generated.nix delete mode 100644 pkgs/top-level/python-packages.json diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix deleted file mode 100644 index 3876476623b..00000000000 --- a/pkgs/top-level/python-packages-generated.nix +++ /dev/null @@ -1,5317 +0,0 @@ -{ pkgs, stdenv, fetchurl, python, self }: - -let -in -{ - -} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { - - - "plone.uuid-1.0.3" = self.buildPythonPackage { - name = "plone.uuid-1.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip"; - md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UUIDs for content items - ''; - homepage = "http://plone.org"; - license = "BSD"; - }; - }; - - - "six-1.2.0" = self.buildPythonPackage { - name = "six-1.2.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz"; - md5 = "2a5d1afc79912832ac78fd38e3d75d7e"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Python 2 and 3 compatibility utilities - ''; - homepage = "http://pypi.python.org/pypi/six/"; - license = "UNKNOWN"; - }; - }; - - - "Products.ZopeVersionControl-1.1.3" = self.buildPythonPackage { - name = "Products.ZopeVersionControl-1.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip"; - md5 = "238239102f3ac798ee4f4c53343a561f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Version Control - ''; - homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "Products.Archetypes-1.9.7" = self.buildPythonPackage { - name = "Products.Archetypes-1.9.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.7.zip"; - md5 = "35060c0ed8faf76c3c488fa642bb9715"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.folder-1.0.5" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone. - ''; - homepage = "http://pypi.python.org/pypi/Products.Archetypes"; - license = "GPL"; - }; - }; - - - "cssselect-0.9.1" = self.buildPythonPackage { - name = "cssselect-0.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz"; - md5 = "c74f45966277dc7a0f768b9b0f3522ac"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - cssselect parses CSS3 Selectors and translates them to XPath 1.0 - ''; - homepage = "http://packages.python.org/cssselect/"; - license = "BSD"; - }; - }; - - - "Products.Marshall-2.1.2" = self.buildPythonPackage { - name = "Products.Marshall-2.1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip"; - md5 = "bde4d7f75195c1ded8371554b04d2541"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Configurable Marshallers for Archetypes - ''; - homepage = "http://pypi.python.org/pypi/Products.Marshall"; - license = "GPL"; - }; - }; - - - "plone.folder-1.0.5" = self.buildPythonPackage { - name = "plone.folder-1.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.5.zip"; - md5 = "2722124a411e2d267b08d6f4d81e262c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - BTree-based folder implementation with order support - ''; - homepage = "http://pypi.python.org/pypi/plone.folder"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.CMFPlone-4.3.3" = self.buildPythonPackage { - name = "Products.CMFPlone-4.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.3.zip"; - md5 = "e6638766d7bf59d27517174e9d67ea6b"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.10" self."archetypes.referencebrowserwidget-2.4.20" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-2.3.0" self."plone.app.blob-1.5.9" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.4" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.10" self."plone.app.contentrules-3.0.6" self."plone.app.controlpanel-2.3.8" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.12" self."plone.app.folder-1.0.6" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.7" self."plone.app.layout-2.3.11" self."plone.app.linkintegrity-1.5.4" self."plone.app.locales-4.3.3" self."plone.app.portlets-2.4.8" self."plone.app.redirector-1.2" self."plone.app.search-1.1.7" self."plone.app.upgrade-1.3.6" self."plone.app.users-1.2" self."plone.app.uuid-1.1" self."plone.app.viewletmanager-2.0.5" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.batching-1.0.1" self."plone.browserlayer-2.1.3" self."plone.contentrules-2.0.4" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1.1" self."plonetheme.classic-1.3.3" self."plonetheme.sunburst-1.4.6" self."Products.Archetypes-1.9.7" self."Products.ATContentTypes-2.1.14" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.16" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.6" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.5" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The Plone Content Management System (core) - ''; - homepage = "http://plone.org/"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "waitress-0.8.9" = self.buildPythonPackage { - name = "waitress-0.8.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz"; - md5 = "da3f2e62b3676be5dd630703a68e2a04"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Waitress WSGI server - ''; - homepage = "https://github.com/Pylons/waitress"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.deferredimport-3.5.3" = self.buildPythonPackage { - name = "zope.deferredimport-3.5.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz"; - md5 = "68fce3bf4f011d4a840902fd763884ee"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. - ''; - homepage = "http://pypi.python.org/pypi/zope.deferredimport"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "six-1.6.1" = self.buildPythonPackage { - name = "six-1.6.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz"; - md5 = "07d606ac08595d795bf926cc9985674f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Python 2 and 3 compatibility utilities - ''; - homepage = "http://pypi.python.org/pypi/six/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "zope.deprecation-4.1.1" = self.buildPythonPackage { - name = "zope.deprecation-4.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.1.1.tar.gz"; - md5 = "ce261b9384066f7e13b63525778430cb"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Deprecation Infrastructure - ''; - homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFUid-2.2.1" = self.buildPythonPackage { - name = "Products.CMFUid-2.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz"; - md5 = "e20727959351dffbf0bac80613eee110"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Uid product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFUid"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.autoform-1.6" = self.buildPythonPackage { - name = "plone.autoform-1.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.6.zip"; - md5 = "27412ab43f728064a60e2aeb564726b5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Tools to construct z3c.form forms - ''; - homepage = "http://code.google.com/p/dexterity"; - license = "LGPL"; - }; - }; - - - "roman-1.4.0" = self.buildPythonPackage { - name = "roman-1.4.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; - md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integer to Roman numerals converter - ''; - homepage = "http://pypi.python.org/pypi/roman"; - license = "Python 2.1.1"; - }; - }; - - - "archetypes.referencebrowserwidget-2.4.20" = self.buildPythonPackage { - name = "archetypes.referencebrowserwidget-2.4.20"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.20.zip"; - md5 = "352ea75e5dbdcdca8897f88fd77ecd3e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.jquerytools-1.5.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A referencebrowser implementation for Archetypes - ''; - homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.fieldsets-2.0.2" = self.buildPythonPackage { - name = "plone.fieldsets-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip"; - md5 = "4158c8a1f784fcb5cecbd63deda7222f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - An extension to zope.formlib, which allows to group fields into different fieldsets. - ''; - homepage = "http://pypi.python.org/pypi/plone.fieldsets"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.redirector-1.2" = self.buildPythonPackage { - name = "plone.app.redirector-1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip"; - md5 = "bc0508844f276ac7a7b9556d37281cc8"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - redirection tool - ''; - homepage = "http://pypi.python.org/pypi/plone.app.redirector"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "nose-1.3.3" = self.buildPythonPackage { - name = "nose-1.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.3.tar.gz"; - md5 = "42776061bf5206670cb819176dc78654"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - nose extends unittest to make testing easier - ''; - homepage = "http://readthedocs.org/docs/nose/"; - license = "GNU LGPL"; - }; - }; - - - "plone.app.blob-1.5.9" = self.buildPythonPackage { - name = "plone.app.blob-1.5.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.9.zip"; - md5 = "3ac753daa2758e3e8290e1e3a1887183"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.3" self."plone.app.imaging-1.0.10" self."plone.scale__storage-1.3.3" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - ZODB blob support for Plone - ''; - homepage = "http://plone.org/products/plone.app.blob"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "suds" = self."suds-0.4"; - - "suds-0.4" = self.buildPythonPackage { - name = "suds-0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz"; - md5 = "b7502de662341ed7275b673e6bd73191"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Lightweight SOAP client - ''; - homepage = "https://fedorahosted.org/suds"; - license = "UNKNOWN"; - }; - }; - - - "zope.testbrowser-3.11.1" = self.buildPythonPackage { - name = "zope.testbrowser-3.11.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz"; - md5 = "64abbee892121e7f1a91aed12cfc155a"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Programmable browser for functional black-box tests - ''; - homepage = "http://pypi.python.org/pypi/zope.testbrowser"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.ZCTextIndex-2.13.5" = self.buildPythonPackage { - name = "Products.ZCTextIndex-2.13.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.5.zip"; - md5 = "9a3717674b33d1d7c11b2c3728663d5b"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Full text indexing for ZCatalog / Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.outputfilters-1.12" = self.buildPythonPackage { - name = "plone.outputfilters-1.12"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.12.zip"; - md5 = "ed76b9cf028cf7e04f3aa408e22b61ca"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Transformations applied to HTML in Plone text fields as they are rendered - ''; - homepage = "http://github.com/plone/plone.outputfilters"; - license = "GPL"; - }; - }; - - - "zope.site-3.9.2" = self.buildPythonPackage { - name = "zope.site-3.9.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz"; - md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Local registries for zope component architecture - ''; - homepage = "http://pypi.python.org/pypi/zope.site"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.contentmenu-2.0.10" = self.buildPythonPackage { - name = "plone.app.contentmenu-2.0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.10.zip"; - md5 = "d28bc995bbe5a6f4aeabad07438ffb85"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.4" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone's content menu implementation - ''; - homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "mechanize-0.2.5" = self.buildPythonPackage { - name = "mechanize-0.2.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; - md5 = "32657f139fc2fb75bcf193b63b8c60b2"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Stateful programmatic web browsing. - ''; - homepage = "http://wwwsearch.sourceforge.net/mechanize/"; - license = "BSD"; - }; - }; - - - "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage { - name = "Products.PlacelessTranslationService-2.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.4.zip"; - md5 = "4b5a1ddc66eeaa02d32ee4a685905c10"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService"; - license = "GPL"; - }; - }; - - - "ZConfig-2.9.1" = self.buildPythonPackage { - name = "ZConfig-2.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz"; - md5 = "4738de641d90b992de5b89ff1bc2fe49"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Structured Configuration Library - ''; - homepage = "http://www.zope.org/Members/fdrake/zconfig/"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.deprecation-3.4.1" = self.buildPythonPackage { - name = "zope.deprecation-3.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz"; - md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Deprecation Infrastructure - ''; - homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFFormController-3.0.3" = self.buildPythonPackage { - name = "Products.CMFFormController-3.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip"; - md5 = "6573df7dcb39e3b63ba22abe2acd639e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - CMFFormController provides a form validation mechanism for CMF. - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFFormController"; - license = "BSD"; - }; - }; - - - "Products.validation-2.0" = self.buildPythonPackage { - name = "Products.validation-2.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip"; - md5 = "afa217e2306637d1dccbebf337caa8bf"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Data validation package for Archetypes - ''; - homepage = "UNKNOWN"; - license = "UNKNOWN"; - }; - }; - - - "zope.event-4.0.3" = self.buildPythonPackage { - name = "zope.event-4.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.3.tar.gz"; - md5 = "9a3780916332b18b8b85f522bcc3e249"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Very basic event publishing system - ''; - homepage = "http://pypi.python.org/pypi/zope.event"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.caching-1.0" = self.buildPythonPackage { - name = "plone.caching-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip"; - md5 = "2c2e3b27d13b9101c92dfed222fde36c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope 2 integration for z3c.caching - ''; - homepage = "http://pypi.python.org/pypi/plone.caching"; - license = "GPL"; - }; - }; - - - "zope.proxy-3.6.1" = self.buildPythonPackage { - name = "zope.proxy-3.6.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip"; - md5 = "a400b0a26624b17fa889dbcaa989d440"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Generic Transparent Proxies - ''; - homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.componentvocabulary-1.0.1" = self.buildPythonPackage { - name = "zope.componentvocabulary-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz"; - md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Component vocabularies - ''; - homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFCore-2.2.7" = self.buildPythonPackage { - name = "Products.CMFCore-2.2.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; - md5 = "9320a4023b8575097feacfd4a400e930"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Content Management Framework core components - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.PlonePAS-4.1.3" = self.buildPythonPackage { - name = "Products.PlonePAS-4.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.3.zip"; - md5 = "785c10242b77bfb0612c76b0262e361e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - PlonePAS adapts the PluggableAuthService for use by Plone. - ''; - homepage = "http://pypi.python.org/pypi/Products.PlonePAS"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "mock-1.0.1" = self.buildPythonPackage { - name = "mock-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz"; - md5 = "c3971991738caa55ec7c356bbc154ee2"; - }; - doCheck = true; - buildInputs = [ self."unittest2-0.5.1" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A Python Mocking and Patching Library for Testing - ''; - homepage = "http://www.voidspace.org.uk/python/mock/"; - license = "UNKNOWN"; - }; - }; - - - "Products.ATReferenceBrowserWidget-3.0" = self.buildPythonPackage { - name = "Products.ATReferenceBrowserWidget-3.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip"; - md5 = "157bdd32155c8353450c17c649aad042"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.20" self.setuptools self."zope.deprecation-3.4.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - ATReferenceBrowserWidget is reference widget for Archetypes. - ''; - homepage = "http://pypi.python.org/pypi/Products.ATReferenceBrowserWidget"; - license = "GPL"; - }; - }; - - - "MultiMapping-2.13.0" = self.buildPythonPackage { - name = "MultiMapping-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip"; - md5 = "d69c5904c105b9f2f085d4103e0f0586"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Special MultiMapping objects used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/MultiMapping"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.ZSQLMethods-2.13.4" = self.buildPythonPackage { - name = "Products.ZSQLMethods-2.13.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip"; - md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - SQL method support for Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.transformchain-1.0.3" = self.buildPythonPackage { - name = "plone.transformchain-1.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip"; - md5 = "f5fb7ca894249e3e666501c4fae52a6c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser - ''; - homepage = "http://pypi.python.org/pypi/plone.transformchain"; - license = "BSD"; - }; - }; - - - "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage { - name = "Products.CMFQuickInstallerTool-3.0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz"; - md5 = "af34adb87ddf2b6da48eff8b70ca2989"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products. - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFQuickInstallerTool"; - license = "GPL"; - }; - }; - - - "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.14"; - - "plone.recipe.zope2instance-4.2.14" = self.buildPythonPackage { - name = "plone.recipe.zope2instance-4.2.14"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.14.zip"; - md5 = "e5e76023d357592ee7b0236bb9764b9d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Buildout recipe for creating a Zope 2 instance - ''; - homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.event-3.5.2" = self.buildPythonPackage { - name = "zope.event-3.5.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; - md5 = "6e8af2a16157a74885d4f0d88137cefb"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Very basic event publishing system - ''; - homepage = "http://pypi.python.org/pypi/zope.event"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFEditions-2.2.9" = self.buildPythonPackage { - name = "Products.CMFEditions-2.2.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.9.zip"; - md5 = "4cd9db460f4056b14d425ff2fdc34952"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Versioning for Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; - license = "GPL"; - }; - }; - - - "zope.processlifetime-1.0" = self.buildPythonPackage { - name = "zope.processlifetime-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz"; - md5 = "69604bfd668a01ebebdd616a8f26ccfe"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope process lifetime events - ''; - homepage = "http://pypi.python.org/pypi/zope.processlifetime"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFDefault-2.2.4" = self.buildPythonPackage { - name = "Products.CMFDefault-2.2.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.4.tar.gz"; - md5 = "3d4444a8c4b486a2d769060e35a3ee01"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Default product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.form-2.2.4" = self.buildPythonPackage { - name = "plone.app.form-2.2.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.4.zip"; - md5 = "1784f608dcb3a1701d91d4985ca31e63"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.14" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - zope.formlib integration for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.PasswordResetTool-2.0.16" = self.buildPythonPackage { - name = "Products.PasswordResetTool-2.0.16"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.16.zip"; - md5 = "c9069dff718878a32b1ef91875acf240"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Password reset tool for Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; - license = "GPL"; - }; - }; - - - "plone.synchronize-1.0.1" = self.buildPythonPackage { - name = "plone.synchronize-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip"; - md5 = "d25e86ace8daa0816861296c3288c4fb"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Simple decorators to support synchronized methods - ''; - homepage = "http://pypi.python.org/pypi/plone.synchronize"; - license = "BSD"; - }; - }; - - - "collective.monkeypatcher-1.0.1" = self.buildPythonPackage { - name = "collective.monkeypatcher-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip"; - md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Support for applying monkey patches late in the startup cycle by using ZCML configuration actions - ''; - homepage = "http://pypi.python.org/pypi/collective.monkeypatcher"; - license = "BSD"; - }; - }; - - - "lxml-3.3.5" = self.buildPythonPackage { - name = "lxml-3.3.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.3.5.tar.gz"; - md5 = "88c75f4c73fc8f59c9ebb17495044f2f"; - }; - doCheck = false; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. - ''; - homepage = "http://lxml.de/"; - license = "UNKNOWN"; - }; - }; - - - "PasteDeploy-1.5.2" = self.buildPythonPackage { - name = "PasteDeploy-1.5.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz"; - md5 = "352b7205c78c8de4987578d19431af3b"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Load, configure, and compose WSGI applications and servers - ''; - homepage = "http://pythonpaste.org/deploy/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "plonetheme.sunburst-1.4.6" = self.buildPythonPackage { - name = "plonetheme.sunburst-1.4.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.6.zip"; - md5 = "6e236f7d2ab944b708fb26de6f343ceb"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The default theme for Plone 4. - ''; - homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.openid-2.0.2" = self.buildPythonPackage { - name = "plone.openid-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.2.zip"; - md5 = "046133795cf232ab6d19db940f02197a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - OpenID authentication support for PAS - ''; - homepage = "http://svn.plone.org/svn/plone/plone.openid"; - license = "BSD"; - }; - }; - - - "zope.sequencesort-3.4.0" = self.buildPythonPackage { - name = "zope.sequencesort-3.4.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz"; - md5 = "cfc35fc426a47f5c0ee43c416224b864"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Sequence Sorting - ''; - homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.PortalTransforms-2.1.3" = self.buildPythonPackage { - name = "Products.PortalTransforms-2.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.3.zip"; - md5 = "a2f1f9e0388ed081028bb4c93fd24317"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - MIME based content transformations - ''; - homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; - license = "UNKNOWN"; - }; - }; - - - "zope.interface-4.1.1" = self.buildPythonPackage { - name = "zope.interface-4.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz"; - md5 = "edcd5f719c5eb2e18894c4d06e29b6c6"; - }; - doCheck = true; - buildInputs = [ self."zope.event-4.0.3" ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Interfaces for Python - ''; - homepage = "http://pypi.python.org/pypi/zope.interface"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.app.publication-3.12.0" = self.buildPythonPackage { - name = "zope.app.publication-3.12.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip"; - md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope publication - ''; - homepage = "http://pypi.python.org/pypi/zope.app.publication"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.component-4.2.1" = self.buildPythonPackage { - name = "zope.component-4.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz"; - md5 = "cf55d496428d976f9329a4a2330a8b54"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Component Architecture - ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.content-2.1.4" = self.buildPythonPackage { - name = "plone.app.content-2.1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.4.zip"; - md5 = "6930a2376e2d856e4f24e17f789568e5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0.1" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Content Views for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.content"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.alterego-1.0" = self.buildPythonPackage { - name = "plone.alterego-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip"; - md5 = "b7b6dbcbba00505d98d5aba83e016408"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Low level support for dynamic modules - ''; - homepage = "http://code.google.com/p/dexterity"; - license = "LGPL"; - }; - }; - - - "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { - name = "Products.ExternalEditor-1.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope External Editor - ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFDiffTool-2.1" = self.buildPythonPackage { - name = "Products.CMFDiffTool-2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip"; - md5 = "7513d954294e9f318182f9d61660abdb"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Diff tool for Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFDiffTool"; - license = "GPL"; - }; - }; - - - "repoze.lru-0.6" = self.buildPythonPackage { - name = "repoze.lru-0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/r/repoze.lru/repoze.lru-0.6.tar.gz"; - md5 = "2c3b64b17a8e18b405f55d46173e14dd"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A tiny LRU cache implementation and decorator - ''; - homepage = "http://www.repoze.org"; - license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; - }; - }; - - - "Markdown-2.0.3" = self.buildPythonPackage { - name = "Markdown-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz"; - md5 = "751e8055be2433dfd1a82e0fb1b12f13"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Python implementation of Markdown. - ''; - homepage = "http://www.freewisdom.org/projects/python-markdown"; - license = "BSD License"; - }; - }; - - - "z3c.formwidget.query-0.10" = self.buildPythonPackage { - name = "z3c.formwidget.query-0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.10.zip"; - md5 = "912773ecfa4409bc8911e9e8dd981e58"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A source query widget for z3c.form. - ''; - homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.DCWorkflow-2.2.4" = self.buildPythonPackage { - name = "Products.DCWorkflow-2.2.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; - md5 = "c90a16c4f3611015592ba8173a5f1863"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - DCWorkflow product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.behavior-1.0.2" = self.buildPythonPackage { - name = "plone.behavior-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip"; - md5 = "4459b91287ebc2f2cf4fa38728b2a739"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Infrastructure for maintaining a registry of available behaviors - ''; - homepage = "http://code.google.com/p/dexterity"; - license = "BSD"; - }; - }; - - - "diazo-1.0.5" = self.buildPythonPackage { - name = "diazo-1.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.5.zip"; - md5 = "9b304d079eab7c9dd6d10487f2fc94a4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Diazo implements a Deliverance like language using a pure - XSLT engine. With Diazo, you "compile" your theme and ruleset in one - step, then use a superfast/simple transform on each request thereafter. - Alternatively, compile your theme during development, check it into - version control, and not touch Diazo during deployment. - ''; - homepage = "http://diazo.org"; - license = "New BSD"; - }; - }; - - - "zope.tales-3.5.3" = self.buildPythonPackage { - name = "zope.tales-3.5.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz"; - md5 = "a2dbc6e41140c29de81b66a4d703fc3f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Template Application Language Expression Syntax (TALES) - ''; - homepage = "http://pypi.python.org/pypi/zope.tales"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "feedparser-5.0.1" = self.buildPythonPackage { - name = "feedparser-5.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2"; - md5 = "702835de74bd4a578524f311e62c2877"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - - ''; - homepage = "https://code.google.com/p/feedparser/"; - license = ""; - }; - }; - - - "DateTime-3.0.3" = self.buildPythonPackage { - name = "DateTime-3.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip"; - md5 = "5ebf0a8e3775b744c5de2e6685b37ae9"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. - ''; - homepage = "http://pypi.python.org/pypi/DateTime"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Missing-2.13.1" = self.buildPythonPackage { - name = "Missing-2.13.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Special Missing objects used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/Missing"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "z3c.autoinclude-0.3.5" = self.buildPythonPackage { - name = "z3c.autoinclude-0.3.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.5.zip"; - md5 = "44f113a1c280dd238ab9b8490ae88857"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Automatically include ZCML - ''; - homepage = "http://pypi.python.org/pypi/z3c.autoinclude"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "pytz-2013b" = self.buildPythonPackage { - name = "pytz-2013b"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2"; - md5 = "34f47470eedd5cd1faf6c3da2741967b"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - World timezone definitions, modern and historical - ''; - homepage = "http://pytz.sourceforge.net"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "zope.configuration-3.7.4" = self.buildPythonPackage { - name = "zope.configuration-3.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Configuration Markup Language (ZCML) - ''; - homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.iterate-2.1.12" = self.buildPythonPackage { - name = "plone.app.iterate-2.1.12"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.12.zip"; - md5 = "1d05316d4e9a68ed738e890aafa3c9e2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.9" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - check-out/check-in staging for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.iterate"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.theming-1.1.1" = self.buildPythonPackage { - name = "plone.app.theming-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; - md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."diazo-1.0.5" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.8" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.3" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integrates the Diazo theming engine with Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.theming"; - license = "GPL"; - }; - }; - - - "python-openid-2.2.5" = self.buildPythonPackage { - name = "python-openid-2.2.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz"; - md5 = "393f48b162ec29c3de9e2973548ea50d"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - OpenID support for servers and consumers. - ''; - homepage = "http://github.com/openid/python-openid"; - license = "UNKNOWN"; - }; - }; - - - "Products.MailHost-2.13.1" = self.buildPythonPackage { - name = "Products.MailHost-2.13.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip"; - md5 = "1102e523435d8bf78a15b9ddb57478e1"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - zope.sendmail integration for Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.MailHost"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.broken-3.6.0" = self.buildPythonPackage { - name = "zope.broken-3.6.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip"; - md5 = "eff24d7918099a3e899ee63a9c31bee6"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Broken Object Interfaces - ''; - homepage = "http://pypi.python.org/pypi/zope.broken"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "DocumentTemplate-2.13.2" = self.buildPythonPackage { - name = "DocumentTemplate-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Document Templating Markup Language (DTML) - ''; - homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.PythonScripts-2.13.2" = self.buildPythonPackage { - name = "Products.PythonScripts-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; - md5 = "04c86f2c45a29a162297a80dac61d14f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Provides support for restricted execution of Python scripts in Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.ptresource-3.9.0" = self.buildPythonPackage { - name = "zope.ptresource-3.9.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz"; - md5 = "f4645e51c15289d3fdfb4139039e18e9"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Page template resource plugin for zope.browserresource - ''; - homepage = "http://pypi.python.org/pypi/zope.ptresource/"; - license = "UNKNOWN"; - }; - }; - - - "plone.namedfile__scales-2.0.5" = self.buildPythonPackage { - name = "plone.namedfile__scales-2.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.5.zip"; - md5 = "54f73c5961cbdf5020cf59ae780601ea"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - File types and fields for images, files and blob files with filenames - ''; - homepage = "http://pypi.python.org/pypi/plone.namedfile"; - license = "BSD"; - }; - }; - - - "docutils-0.9.1" = self.buildPythonPackage { - name = "docutils-0.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz"; - md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Docutils -- Python Documentation Utilities - ''; - homepage = "http://docutils.sourceforge.net/"; - license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; - }; - }; - - - "plone.app.controlpanel-2.3.8" = self.buildPythonPackage { - name = "plone.app.controlpanel-2.3.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.8.zip"; - md5 = "230fa6df467f5bcc0b987d1cd66ccd9f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.PlonePAS-4.1.3" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Formlib-based controlpanels for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "beautifulsoup4-4.3.2" = self.buildPythonPackage { - name = "beautifulsoup4-4.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz"; - md5 = "b8d157a204d56512a4cc196e53e7d8ee"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Screen-scraping library - ''; - homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "WebOb-1.4" = self.buildPythonPackage { - name = "WebOb-1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.4.tar.gz"; - md5 = "8437607c0cc00c35f658f972516ffb55"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - WSGI request and response object - ''; - homepage = "http://webob.org/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "zope.error-3.7.4" = self.buildPythonPackage { - name = "zope.error-3.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz"; - md5 = "281445a906458ff5f18f56923699a127"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - An error reporting utility for Zope3 - ''; - homepage = "http://pypi.python.org/pypi/zope.error"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.openid-2.0.2" = self.buildPythonPackage { - name = "plone.app.openid-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz"; - md5 = "ae0748f91cab0612a498926d405d8edd"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."plone.app.portlets-2.4.8" self."plone.openid-2.0.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone OpenID authentication support - ''; - homepage = "http://pypi.python.org/pypi/plone.app.openid"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.indexer-1.0.2" = self.buildPythonPackage { - name = "plone.indexer-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Hooks to facilitate managing custom index values in Zope 2/CMF applications - ''; - homepage = "http://pypi.python.org/pypi/plone.indexer"; - license = "BSD"; - }; - }; - - - "plone.app.portlets-2.4.8" = self.buildPythonPackage { - name = "plone.app.portlets-2.4.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.8.zip"; - md5 = "7d25027d89d871a50aba91c95b798bb2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.14" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone integration for the basic plone.portlets package - ''; - homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.keyring-2.0.1" = self.buildPythonPackage { - name = "plone.keyring-2.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip"; - md5 = "f3970e9bddb2cc65e461a2c62879233f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Manage secrets - ''; - homepage = "http://pypi.python.org/pypi/plone.keyring"; - license = "BSD"; - }; - }; - - - "plone.formwidget.namedfile-1.0.9" = self.buildPythonPackage { - name = "plone.formwidget.namedfile-1.0.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.9.zip"; - md5 = "96f2634a8c4c1d98c2f39646a77c87fc"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Image widget for z3c.form and Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; - license = "GPL"; - }; - }; - - - "Persistence-2.13.2" = self.buildPythonPackage { - name = "Persistence-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; - md5 = "92693648ccdc59c8fc71f7f06b1d228c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Persistent ExtensionClass - ''; - homepage = "http://pypi.python.org/pypi/Persistence"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFPlacefulWorkflow-1.5.10" = self.buildPythonPackage { - name = "Products.CMFPlacefulWorkflow-1.5.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.10.zip"; - md5 = "997648c5bed6d5a54ac922c6ba9351a9"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Workflow policies for CMF and Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; - license = "GPL"; - }; - }; - - - "plone.dexterity-2.2.1" = self.buildPythonPackage { - name = "plone.dexterity-2.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.2.1.zip"; - md5 = "c62d427e3f6c24da1cca58d7cb152e1f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.folder-1.0.5" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.4" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Flexible CMF content - ''; - homepage = "http://code.google.com/p/dexterity"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zc.recipe.egg-1.3.2" = self.buildPythonPackage { - name = "zc.recipe.egg-1.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz"; - md5 = "1cb6af73f527490dde461d3614a36475"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Recipe for installing Python package distributions as eggs - ''; - homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.dexterity-2.0.11" = self.buildPythonPackage { - name = "plone.app.dexterity-2.0.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.11.zip"; - md5 = "649f08fd008908121f5f70dfd33e513a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."lxml-2.3.6" self."plone.app.content-2.1.4" self."plone.app.layout-2.3.11" self."plone.app.textfield-1.2.3" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.4" self."plone.dexterity-2.2.1" self."plone.formwidget.namedfile-1.0.9" self."plone.namedfile__scales-2.0.5" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.7" self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. - ''; - homepage = "http://plone.org/products/dexterity"; - license = "GPL"; - }; - }; - - - "mailinglogger-3.7.0" = self.buildPythonPackage { - name = "mailinglogger-3.7.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz"; - md5 = "f865f0df6059ce23062b7457d01dbac5"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Enhanced emailing handlers for the python logging package. - ''; - homepage = "http://www.simplistix.co.uk/software/python/mailinglogger"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage { - name = "Products.BTreeFolder2-2.13.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz"; - md5 = "f57c85673036af7ccd34c3fa251f6bb2"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A BTree based implementation for Zope 2's OFS. - ''; - homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.locking-2.0.4" = self.buildPythonPackage { - name = "plone.locking-2.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; - md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - webdav locking support - ''; - homepage = "http://pypi.python.org/pypi/plone.locking"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.viewletmanager-2.0.5" = self.buildPythonPackage { - name = "plone.app.viewletmanager-2.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.5.zip"; - md5 = "e923d0a9a087ef79a6f0303f64a0f853"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.14" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - configurable viewlet manager - ''; - homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.testing-3.9.7" = self.buildPythonPackage { - name = "zope.testing-3.9.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz"; - md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope testing framework, including the testrunner script. - ''; - homepage = "http://pypi.python.org/pypi/zope.testing"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.lifecycleevent-3.6.2" = self.buildPythonPackage { - name = "zope.lifecycleevent-3.6.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz"; - md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Object life-cycle events - ''; - homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.imaging-1.0.10" = self.buildPythonPackage { - name = "plone.app.imaging-1.0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.10.zip"; - md5 = "511ed465cef112bac3d074f09810ca80"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.scale__storage-1.3.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - User-configurable, blob-aware image scaling for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.imaging"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.contentrules-3.0.6" = self.buildPythonPackage { - name = "plone.app.contentrules-3.0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.6.zip"; - md5 = "95eeb55a9489c85c93eb11a87467d867"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.contentrules-2.0.4" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.11" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone integration for plone.contentrules - ''; - homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "translationstring-1.1" = self.buildPythonPackage { - name = "translationstring-1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/t/translationstring/translationstring-1.1.tar.gz"; - md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Utility library for i18n relied on by various Repoze and Pyramid packages - ''; - homepage = "http://pylonsproject.org"; - license = "BSD-like (http://repoze.org/license.html)"; - }; - }; - - - "zope.pagetemplate-3.6.3" = self.buildPythonPackage { - name = "zope.pagetemplate-3.6.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip"; - md5 = "834a4bf702c05fba1e669677b4dc871f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Page Templates - ''; - homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.users-1.2" = self.buildPythonPackage { - name = "plone.app.users-1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2.zip"; - md5 = "c94682960a960da6d75c8bfba587a836"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.8" self."plone.app.layout-2.3.11" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A package for all things users and groups related (specific to plone) - ''; - homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zc.buildout-1.7.1" = self.buildPythonPackage { - name = "zc.buildout-1.7.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.1.tar.gz"; - md5 = "8834a21586bf2be53dc412002241a996"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - System for managing development buildouts - ''; - homepage = "http://pypi.python.org/pypi/zc.buildout"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "archetypes.schemaextender-2.1.3" = self.buildPythonPackage { - name = "archetypes.schemaextender-2.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.3.zip"; - md5 = "105f2f8e9c18f34bd09d1a90a10c91d2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Dynamically extend Archetypes schemas with named adapters. - ''; - homepage = "http://pypi.python.org/pypi/archetypes.schemaextender"; - license = "GPL"; - }; - }; - - - "ZopeUndo-2.12.0" = self.buildPythonPackage { - name = "ZopeUndo-2.12.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; - md5 = "2b8da09d1b98d5558f62e12f6e52c401"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - ZODB undo support for Zope2. - ''; - homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.tal-3.5.2" = self.buildPythonPackage { - name = "zope.tal-3.5.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip"; - md5 = "13869f292ba36b294736b7330b1396fd"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope 3 Template Application Languate (TAL) - ''; - homepage = "http://pypi.python.org/pypi/zope.tal"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.OFSP-2.13.2" = self.buildPythonPackage { - name = "Products.OFSP-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip"; - md5 = "c76d40928753c2ee56db873304e65bd5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Persistence-2.13.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - General Zope 2 help screens. - ''; - homepage = "http://pypi.python.org/pypi/Products.OFSP"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "pyramid" = self."pyramid-1.5"; - - "pyramid-1.5" = self.buildPythonPackage { - name = "pyramid-1.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.5.tar.gz"; - md5 = "8747658dcbab709a9c491e43d3b0d58b"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" self."WebTest-2.0.15" self."zope.component-4.2.1" self."zope.interface-4.1.1" ]; - propagatedBuildInputs = [ self."PasteDeploy-1.5.2" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.4" self."zope.deprecation-4.1.1" self."zope.interface-4.1.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - The Pyramid Web Framework, a Pylons project - ''; - homepage = "http://pylonsproject.org"; - license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; - }; - }; - - - "plone.app.search-1.1.7" = self.buildPythonPackage { - name = "plone.app.search-1.1.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.7.zip"; - md5 = "fc3c8d3f64300f6a02770027d7d14136"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.5" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Search user interface for Plone CMS. - ''; - homepage = "http://github.com/plone/plone.app.search"; - license = "GPL"; - }; - }; - - - "zope.container-3.11.2" = self.buildPythonPackage { - name = "zope.container-3.11.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz"; - md5 = "fc66d85a17b8ffb701091c9328983dcc"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Container - ''; - homepage = "http://pypi.python.org/pypi/zope.container"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "unittest2-0.5.1" = self.buildPythonPackage { - name = "unittest2-0.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz"; - md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The new features in unittest for Python 2.7 backported to Python 2.3+. - ''; - homepage = "http://pypi.python.org/pypi/unittest2"; - license = "UNKNOWN"; - }; - }; - - - "zope.schema-4.2.2" = self.buildPythonPackage { - name = "zope.schema-4.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; - md5 = "e7e581af8193551831560a736a53cf58"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - zope.interface extension for defining data schemas - ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.schema-4.4.1" = self.buildPythonPackage { - name = "zope.schema-4.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.4.1.tar.gz"; - md5 = "afb9281217b79840e1679abeb302467a"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - zope.interface extension for defining data schemas - ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zExceptions-2.13.0" = self.buildPythonPackage { - name = "zExceptions-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip"; - md5 = "4c679696c959040d8e656ef85ae40136"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - zExceptions contains common exceptions used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/zExceptions"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage { - name = "Products.CMFDynamicViewFTI-4.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip"; - md5 = "2d31b1700ed8b1441adc737b454af693"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - CMFDynamicViewFTI is a product for dynamic views in CMF. - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "zope.publisher-3.12.6" = self.buildPythonPackage { - name = "zope.publisher-3.12.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz"; - md5 = "495131970cc7cb14de8e517fb3857ade"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - The Zope publisher publishes Python objects on the web. - ''; - homepage = "http://pypi.python.org/pypi/zope.publisher"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.browserpage-3.12.2" = self.buildPythonPackage { - name = "zope.browserpage-3.12.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - ZCML directives for configuring browser views for Zope. - ''; - homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.i18n-2.0.2" = self.buildPythonPackage { - name = "plone.app.i18n-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip"; - md5 = "a10026573463dfc1899bf4062cebdbf2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone specific i18n extensions. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.i18n"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.security__untrustedpython-3.7.4" = self.buildPythonPackage { - name = "zope.security__untrustedpython-3.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; - md5 = "072ab8d11adc083eace11262da08630c"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Security Framework - ''; - homepage = "http://pypi.python.org/pypi/zope.security"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.cachepurging-1.0.5" = self.buildPythonPackage { - name = "plone.cachepurging-1.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.5.zip"; - md5 = "ae893d47c424cb8a4cd688f6d9b46dc0"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Cache purging support for Zope 2 applications - ''; - homepage = "http://pypi.python.org/pypi/plone.cachepurging"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "psycopg2" = self."psycopg2-2.5.3"; - - "psycopg2-2.5.3" = self.buildPythonPackage { - name = "psycopg2-2.5.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz"; - md5 = "09dcec70f623a9ef774f1aef75690995"; - }; - doCheck = false; - buildInputs = [ pkgs.postgresql ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Python-PostgreSQL Database Adapter - ''; - homepage = "http://initd.org/psycopg/"; - license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ]; - }; - }; - - - "zope.component__zcml-3.9.5" = self.buildPythonPackage { - name = "zope.component__zcml-3.9.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz"; - md5 = "22780b445b1b479701c05978055d1c82"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Component Architecture - ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Acquisition-2.13.8" = self.buildPythonPackage { - name = "Acquisition-2.13.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. - ''; - homepage = "http://pypi.python.org/pypi/Acquisition"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Unidecode-0.04.1" = self.buildPythonPackage { - name = "Unidecode-0.04.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; - md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - US-ASCII transliterations of Unicode text - ''; - homepage = "http://code.zemanta.com/tsolc/unidecode/"; - license = "UNKNOWN"; - }; - }; - - - "plone.rfc822-1.1" = self.buildPythonPackage { - name = "plone.rfc822-1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.1.zip"; - md5 = "ba3e26cab9e751fb1cf40639d661d2f0"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - RFC822 marshalling for zope.schema fields - ''; - homepage = "http://pypi.python.org/pypi/plone.rfc822"; - license = "BSD"; - }; - }; - - - "zope.viewlet-3.7.2" = self.buildPythonPackage { - name = "zope.viewlet-3.7.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz"; - md5 = "367e03096df57e2f9b74fff43f7901f9"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Viewlets - ''; - homepage = "http://pypi.python.org/pypi/zope.viewlet"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.ATContentTypes-2.1.14" = self.buildPythonPackage { - name = "Products.ATContentTypes-2.1.14"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.14.zip"; - md5 = "7e777ed4034ffc23688f2a8072a6c109"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.20" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.app.layout-2.3.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Default Content Types for Plone - ''; - homepage = "http://plone.org/"; - license = "GPL"; - }; - }; - - - "coverage-3.7.1" = self.buildPythonPackage { - name = "coverage-3.7.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz"; - md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Code coverage measurement for Python - ''; - homepage = "http://nedbatchelder.com/code/coverage"; - license = "BSD"; - }; - }; - - - "zope.i18n__zcml-3.7.4" = self.buildPythonPackage { - name = "zope.i18n__zcml-3.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz"; - md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Internationalization Support - ''; - homepage = "http://pypi.python.org/pypi/zope.i18n"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.browserresource-3.10.3" = self.buildPythonPackage { - name = "zope.browserresource-3.10.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; - md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Browser resources implementation for Zope. - ''; - homepage = "http://pypi.python.org/pypi/zope.browserresource/"; - license = "UNKNOWN"; - }; - }; - - - "RelStorage" = self."RelStorage-1.5.1"; - - "RelStorage-1.5.1" = self.buildPythonPackage { - name = "RelStorage-1.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/R/RelStorage/RelStorage-1.5.1.tar.gz"; - md5 = "2454211d086ac02a4af10f7292e260ec"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."zc.lockfile-1.0.2" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A backend for ZODB that stores pickles in a relational database. - ''; - homepage = "http://pypi.python.org/pypi/RelStorage"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "five.formlib-1.0.4" = self.buildPythonPackage { - name = "five.formlib-1.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip"; - md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - zope.formlib integration for Zope 2 - ''; - homepage = "http://pypi.python.org/pypi/five.formlib"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "xlrd" = self."xlrd-0.9.3"; - - "xlrd-0.9.3" = self.buildPythonPackage { - name = "xlrd-0.9.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.3.tar.gz"; - md5 = "6f3325132f246594988171bc72e1a385"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Library for developers to extract data from Microsoft Excel (tm) spreadsheet files - ''; - homepage = "http://www.python-excel.org/"; - license = "BSD"; - }; - }; - - - "Products.statusmessages-4.0" = self.buildPythonPackage { - name = "Products.statusmessages-4.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip"; - md5 = "265324b0a58a032dd0ed038103ed0473"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies. - ''; - homepage = "http://pypi.python.org/pypi/Products.statusmessages"; - license = "BSD"; - }; - }; - - - "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage { - name = "Products.MimetypesRegistry-2.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.5.zip"; - md5 = "1be555ad13648e139174c034631fce34"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - MIME type handling for Zope - ''; - homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; - license = "UNKNOWN"; - }; - }; - - - "plone.app.upgrade-1.3.6" = self.buildPythonPackage { - name = "plone.app.upgrade-1.3.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.6.zip"; - md5 = "36703e1085f0d5d1d0f6e635e72fd5c1"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.6" self."plone.app.portlets-2.4.8" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.27" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Upgrade machinery for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage { - name = "Products.PloneLanguageTool-3.2.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; - md5 = "bd9eb6278bf76e8cbce99437ca362164"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations. - ''; - homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool"; - license = "GPL"; - }; - }; - - - "plone.intelligenttext-2.0.2" = self.buildPythonPackage { - name = "plone.intelligenttext-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; - md5 = "51688fa0815b49e00334e3ef948328ba"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Provides transforms from text/x-web-intelligent to text/html and vice versa. - ''; - homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.contenttype-3.5.5" = self.buildPythonPackage { - name = "zope.contenttype-3.5.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip"; - md5 = "c6ac80e6887de4108a383f349fbdf332"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope contenttype - ''; - homepage = "http://pypi.python.org/pypi/zope.contenttype"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.proxy-4.1.4" = self.buildPythonPackage { - name = "zope.proxy-4.1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.4.tar.gz"; - md5 = "3bcaf8b8512a99649ecf2f158c11d05b"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Generic Transparent Proxies - ''; - homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.globalrequest-1.0" = self.buildPythonPackage { - name = "zope.globalrequest-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip"; - md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Global way of retrieving the currently active request. - ''; - homepage = "http://pypi.python.org/pypi/zope.globalrequest"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "zope.sendmail-3.7.5" = self.buildPythonPackage { - name = "zope.sendmail-3.7.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz"; - md5 = "8a513ecf2b41cad849f6607bf16d6818"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope sendmail - ''; - homepage = "http://pypi.python.org/pypi/zope.sendmail"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.annotation-3.5.0" = self.buildPythonPackage { - name = "zope.annotation-3.5.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz"; - md5 = "4238153279d3f30ab5613438c8e76380"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Object annotation mechanism - ''; - homepage = "http://pypi.python.org/pypi/zope.annotation"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.customerize-1.2.2" = self.buildPythonPackage { - name = "plone.app.customerize-1.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip"; - md5 = "6a3802c4e8fbd955597adc6a8298febf"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.3" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integrate five.customerize into Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.registry-1.2.3" = self.buildPythonPackage { - name = "plone.app.registry-1.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip"; - md5 = "b2269e10516e8f2faf83545e3d0163d8"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.registry-1.0.1" self."plone.supermodel-1.2.4" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope 2 and Plone integration for plone.registry - ''; - homepage = "http://pypi.python.org/pypi/plone.app.registry"; - license = "GPL"; - }; - }; - - - "plone.session-3.5.3" = self.buildPythonPackage { - name = "plone.session-3.5.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip"; - md5 = "f95872454735abc8f27c3dcbc9434c11"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Session based authentication for Zope - ''; - homepage = "http://pypi.python.org/pypi/plone.session"; - license = "BSD"; - }; - }; - - - "z3c.caching__zcml-2.0a1" = self.buildPythonPackage { - name = "z3c.caching__zcml-2.0a1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz"; - md5 = "17f250b5084c2324a7d15c6810ee628e"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Caching infrastructure for web apps - ''; - homepage = "UNKNOWN"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "zope.filerepresentation-3.6.1" = self.buildPythonPackage { - name = "zope.filerepresentation-3.6.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz"; - md5 = "4a7a434094f4bfa99a7f22e75966c359"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - File-system Representation Interfaces - ''; - homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.memoize-1.1.1" = self.buildPythonPackage { - name = "plone.memoize-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip"; - md5 = "d07cd14b976160e1f26a859e3370147e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Decorators for caching the values of functions and methods - ''; - homepage = "http://pypi.python.org/pypi/plone.memoize"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.interface-3.6.7" = self.buildPythonPackage { - name = "zope.interface-3.6.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip"; - md5 = "9df962180fbbb54eb1875cff9fe436e5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Interfaces for Python - ''; - homepage = "http://pypi.python.org/pypi/zope.interface"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.size-3.4.1" = self.buildPythonPackage { - name = "zope.size-3.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz"; - md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Interfaces and simple adapter that give the size of an object - ''; - homepage = "http://pypi.python.org/pypi/zope.size"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "five.customerize-1.1" = self.buildPythonPackage { - name = "five.customerize-1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip"; - md5 = "80772212a2d55150a6c070fc4638b0c7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - TTW customization of template-based Zope views - ''; - homepage = "http://pypi.python.org/pypi/five.customerize"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.dottedname-3.4.6" = self.buildPythonPackage { - name = "zope.dottedname-3.4.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz"; - md5 = "62d639f75b31d2d864fe5982cb23959c"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Resolver for Python dotted names. - ''; - homepage = "http://pypi.python.org/pypi/zope.dottedname"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.resource-1.0.2" = self.buildPythonPackage { - name = "plone.resource-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip"; - md5 = "594d41e3acd913ae92f2e9ef96503b9f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "https://svn.plone.org/svn/plone/plone.resource"; - license = "GPL"; - }; - }; - - - "plone.app.locales-4.3.3" = self.buildPythonPackage { - name = "plone.app.locales-4.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.3.zip"; - md5 = "d774b4de1d16bed639c22c306ad0ada7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Translation files for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.locales"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "collective.z3cform.datetimewidget-1.2.6" = self.buildPythonPackage { - name = "collective.z3cform.datetimewidget-1.2.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.6.zip"; - md5 = "b8101e810c552a5afb8b57144ab6338a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - z3c.form date and datetime widgets - ''; - homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.contentlisting-1.0.5" = self.buildPythonPackage { - name = "plone.app.contentlisting-1.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip"; - md5 = "9fc15b8ecad1c918778c3ea9a75bf533"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Listing of content for the Plone CMS - ''; - homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Zope2-2.13.22" = self.buildPythonPackage { - name = "Zope2-2.13.22"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.22.zip"; - md5 = "4322d37b5ca63b2e4fe43cfc67960819"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.27" self."Products.ZCTextIndex-2.13.5" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope2 application server / web framework - ''; - homepage = "http://zope2.zope.org"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.textfield-1.2.3" = self.buildPythonPackage { - name = "plone.app.textfield-1.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.3.zip"; - md5 = "1a018fa11ea21de5894f85b67161bcf1"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Text field with MIME type support - ''; - homepage = "http://pypi.python.org/pypi/plone.app.textfield"; - license = "GPL"; - }; - }; - - - "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { - name = "Products.ExternalMethod-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - This package provides support for external Python methods within a Zope 2 environment. - ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.browserlayer-2.1.3" = self.buildPythonPackage { - name = "plone.browserlayer-2.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.3.zip"; - md5 = "41df50201e912fa10286c63687aaec3d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Browser layer management for Zope 2 applications - ''; - homepage = "http://pypi.python.org/pypi/plone.browserlayer"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.workflow-2.1.7" = self.buildPythonPackage { - name = "plone.app.workflow-2.1.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.7.zip"; - md5 = "269dc3dfdb8dae195ca6e1dff26a51da"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - workflow and security settings for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.app.folder-1.0.6" = self.buildPythonPackage { - name = "plone.app.folder-1.0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.6.zip"; - md5 = "78e76f9d20e0c0e6e8edef7cb7e5d8f1"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.folder-1.0.5" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integration package for `plone.folder` into Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.folder/"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zc.lockfile-1.0.2" = self.buildPythonPackage { - name = "zc.lockfile-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; - md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Basic inter-process locks - ''; - homepage = "http://www.python.org/pypi/zc.lockfile"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.StandardCacheManagers-2.13.0" = self.buildPythonPackage { - name = "Products.StandardCacheManagers-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip"; - md5 = "c5088b2b62bd26d63d9579a04369cb73"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Cache managers for Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "RestrictedPython-3.6.0" = self.buildPythonPackage { - name = "RestrictedPython-3.6.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip"; - md5 = "aa75a7dcc7fbc966357837cc66cacec6"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. - ''; - homepage = "http://pypi.python.org/pypi/RestrictedPython"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.stringinterp-1.0.11" = self.buildPythonPackage { - name = "plone.stringinterp-1.0.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.11.zip"; - md5 = "e54dfa87b20a72f9b1465fcee1fd7ecd"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Adaptable string interpolation - ''; - homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "tempstorage-2.12.2" = self.buildPythonPackage { - name = "tempstorage-2.12.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; - md5 = "7a2b76b39839e229249b1bb175604480"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A RAM-based storage for ZODB - ''; - homepage = "http://pypi.python.org/pypi/tempstorage"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.uuid-1.1" = self.buildPythonPackage { - name = "plone.app.uuid-1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.1.zip"; - md5 = "12ab2dee1a23d1c731b563686cf7b59f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone integration for the basic plone.uuid package - ''; - homepage = "http://plone.org"; - license = "GPL"; - }; - }; - - - "zope.datetime-3.4.1" = self.buildPythonPackage { - name = "zope.datetime-3.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz"; - md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope datetime - ''; - homepage = "http://pypi.python.org/pypi/zope.datetime"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "lxml-2.3.6" = self.buildPythonPackage { - name = "lxml-2.3.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz"; - md5 = "d5d886088e78b1bdbfd66d328fc2d0bc"; - }; - doCheck = false; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. - ''; - homepage = "http://lxml.de/"; - license = "UNKNOWN"; - }; - }; - - - "zope.location-4.0.3" = self.buildPythonPackage { - name = "zope.location-4.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz"; - md5 = "201416f4eb72a9cf61c7d6d37bb87f24"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" self."zope.proxy-4.1.4" self."zope.schema-4.4.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Location - ''; - homepage = "http://pypi.python.org/pypi/zope.location/"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "WSGIProxy2-0.4.1" = self.buildPythonPackage { - name = "WSGIProxy2-0.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.4.1.zip"; - md5 = "fb8937620dc24270916678f6f07e337b"; - }; - doCheck = true; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."six-1.6.1" self."WebOb-1.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "https://github.com/gawel/WSGIProxy2/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "zope.app.locales-3.6.2" = self.buildPythonPackage { - name = "zope.app.locales-3.6.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz"; - md5 = "bd2b4c6040e768f33004b1210d3207fa"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope locale extraction and management utilities - ''; - homepage = "http://pypi.python.org/pypi/zope.app.locales"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "five.globalrequest-1.0" = self.buildPythonPackage { - name = "five.globalrequest-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope 2 integration for zope.globalrequest - ''; - homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "zope.app.content-3.5.1" = self.buildPythonPackage { - name = "zope.app.content-3.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz"; - md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Content Type - ''; - homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.discussion-2.2.12" = self.buildPythonPackage { - name = "plone.app.discussion-2.2.12"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.12.zip"; - md5 = "410d25455ff13100aa7ef2eca9f28ac4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.11" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Enhanced discussion support for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.discussion"; - license = "GPL"; - }; - }; - - - "Products.MIMETools-2.13.0" = self.buildPythonPackage { - name = "Products.MIMETools-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - MIMETools provides the <!--#mime--> tag for DocumentTemplate. - ''; - homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.z3cform-0.7.6" = self.buildPythonPackage { - name = "plone.app.z3cform-0.7.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.6.zip"; - md5 = "292367803fafba716f04fa7a546e7064"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."z3c.formwidget.query-0.10" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A collection of widgets, templates and other components for use with z3c.form and Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.z3cform"; - license = "GPL"; - }; - }; - - - "python-dateutil-1.5" = self.buildPythonPackage { - name = "python-dateutil-1.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Extensions to the standard python 2.3+ datetime module - ''; - homepage = "http://labix.org/python-dateutil"; - license = "PSF License"; - }; - }; - - - "plone.i18n-2.0.9" = self.buildPythonPackage { - name = "plone.i18n-2.0.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.9.zip"; - md5 = "8e8ceffc64f04beecf1579a24edc2670"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Advanced i18n/l10n features - ''; - homepage = "http://pypi.python.org/pypi/plone.i18n"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.contentmigration-2.1.7" = self.buildPythonPackage { - name = "Products.contentmigration-2.1.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.7.zip"; - md5 = "50cefdb73c88e15d331dff50086c109e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A generic content migration framework for Plone. - ''; - homepage = "http://pypi.python.org/pypi/Products.contentmigration"; - license = "LGPL"; - }; - }; - - - "zope.browsermenu-3.9.1" = self.buildPythonPackage { - name = "zope.browsermenu-3.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; - md5 = "a47c7b1e786661c912a1150bf8d1f83f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Browser menu implementation for Zope. - ''; - homepage = "http://pypi.python.org/pypi/zope.browsermenu/"; - license = "UNKNOWN"; - }; - }; - - - "ZODB3-3.10.5" = self.buildPythonPackage { - name = "ZODB3-3.10.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Object Database: object database and persistence - ''; - homepage = "UNKNOWN"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.jquery-1.7.2" = self.buildPythonPackage { - name = "plone.app.jquery-1.7.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; - md5 = "e204cf45456d26217263531832b5bdac"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - jQuery integration for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "venusian-1.0a8" = self.buildPythonPackage { - name = "venusian-1.0a8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/v/venusian/venusian-1.0a8.tar.gz"; - md5 = "a1a72166fd7cccf0f30e3305e09ce5cf"; - }; - doCheck = false; - buildInputs = [ self."nose-1.3.3" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A library for deferring decorator actions - ''; - homepage = "http://pylonsproject.org"; - license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; - }; - }; - - - "plone.contentrules-2.0.4" = self.buildPythonPackage { - name = "plone.contentrules-2.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.4.zip"; - md5 = "21b189c2139ec7baea63a1e7ee187c55"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone ContentRules Engine - ''; - homepage = "http://pypi.python.org/pypi/plone.contentrules"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.protect-2.0.2" = self.buildPythonPackage { - name = "plone.protect-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip"; - md5 = "74925ffb08782e72f9b1e850fa78fffa"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Security for browser forms - ''; - homepage = "http://pypi.python.org/pypi/plone.protect"; - license = "BSD"; - }; - }; - - - "zope.i18nmessageid-3.5.3" = self.buildPythonPackage { - name = "zope.i18nmessageid-3.5.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; - md5 = "cb84bf61c2b7353e3b7578057fbaa264"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Message Identifiers for internationalization - ''; - homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "transaction-1.1.1" = self.buildPythonPackage { - name = "transaction-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz"; - md5 = "30b062baa34fe1521ad979fb088c8c55"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Transaction management for Python - ''; - homepage = "http://www.zope.org/Products/ZODB"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Method and property caching decorators - ''; - homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.theme-2.1.1" = self.buildPythonPackage { - name = "plone.theme-2.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.1.zip"; - md5 = "28f06c6486059221648e38b5da1d304d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Tools for managing themes in CMF and Plone sites - ''; - homepage = "http://pypi.python.org/pypi/plone.theme"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "borg.localrole-3.0.2" = self.buildPythonPackage { - name = "borg.localrole-3.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip"; - md5 = "04082694dfda9ae5cda62747b8ac7ccf"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A PAS plugin which can manage local roles via an adapter lookup on the current context - ''; - homepage = "http://pypi.python.org/pypi/borg.localrole"; - license = "LGPL"; - }; - }; - - - "Products.ZCatalog-2.13.27" = self.buildPythonPackage { - name = "Products.ZCatalog-2.13.27"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.27.zip"; - md5 = "49cad3f1c408973cc9a1430acc9e1432"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.5" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope 2's indexing and search solution. - ''; - homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.TinyMCE-1.3.6" = self.buildPythonPackage { - name = "Products.TinyMCE-1.3.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.6.zip"; - md5 = "c9e7aa751768f88f3647c5881cc84603"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.imaging-1.0.10" self."plone.app.layout-2.3.11" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.5" self."plone.outputfilters-1.12" self."Products.ResourceRegistries-2.2.10" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone. - ''; - homepage = "http://plone.org/products/tinymce"; - license = "LGPL"; - }; - }; - - - "plone.app.layout-2.3.11" = self.buildPythonPackage { - name = "plone.app.layout-2.3.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.11.zip"; - md5 = "641297ae21cba8fc6cbf03bbbb81c11f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.content-2.1.4" self."plone.app.portlets-2.4.8" self."plone.app.viewletmanager-2.0.5" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self.setuptools self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Layout mechanisms for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Pillow-2.3.0" = self.buildPythonPackage { - name = "Pillow-2.3.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-2.3.0.zip"; - md5 = "56b6614499aacb7d6b5983c4914daea7"; - }; - doCheck = false; - buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ]; - propagatedBuildInputs = [ ]; - configurePhase = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' - ''; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Python Imaging Library (Fork) - ''; - homepage = "http://python-imaging.github.io/"; - license = "Standard PIL License"; - }; - }; - - - "plone.supermodel-1.2.4" = self.buildPythonPackage { - name = "plone.supermodel-1.2.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.4.zip"; - md5 = "f07134bc7ff1ab30735a61bc6f7d4c47"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Serialize Zope schema definitions to and from XML - ''; - homepage = "http://code.google.com/p/dexterity"; - license = "BSD"; - }; - }; - - - "plone.app.caching-1.1.8" = self.buildPythonPackage { - name = "plone.app.caching-1.1.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.8.zip"; - md5 = "f74d9f293ba3a89b9dd91589ab6672b5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.6" self."plone.cachepurging-1.0.5" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.1.1" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone UI and default rules for plone.caching/z3c.caching - ''; - homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.exceptions-3.6.2" = self.buildPythonPackage { - name = "zope.exceptions-3.6.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz"; - md5 = "d7234d99d728abe3d9275346e8d24fd9"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Exceptions - ''; - homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.z3cform-0.8.0" = self.buildPythonPackage { - name = "plone.z3cform-0.8.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; - md5 = "bdb23dd162544964d2f8f8f5f002e874"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.batching-1.0.1" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. - ''; - homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "AccessControl-3.0.8" = self.buildPythonPackage { - name = "AccessControl-3.0.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.8.zip"; - md5 = "06bea3be59d1ce76c815661180b7ffd9"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Security framework for Zope2. - ''; - homepage = "http://pypi.python.org/pypi/AccessControl"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Record-2.13.0" = self.buildPythonPackage { - name = "Record-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip"; - md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Special Record objects used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/Record"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "python-gettext-1.2" = self.buildPythonPackage { - name = "python-gettext-1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; - md5 = "cd4201d440126d1296d1d2bc2b4795f3"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."unittest2-0.5.1" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Python Gettext po to mo file compiler. - ''; - homepage = "http://pypi.python.org/pypi/python-gettext"; - license = "BSD"; - }; - }; - - - "plone.resourceeditor-1.0" = self.buildPythonPackage { - name = "plone.resourceeditor-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; - md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "https://github.com/plone/plone.resourceeditor"; - license = "GPL"; - }; - }; - - - "Products.ResourceRegistries-2.2.10" = self.buildPythonPackage { - name = "Products.ResourceRegistries-2.2.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.10.zip"; - md5 = "207878a7c4b1583fe3cd609116e40bee"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Registry for managing CSS and JS - ''; - homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "pyquery-1.2.8" = self.buildPythonPackage { - name = "pyquery-1.2.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.8.zip"; - md5 = "a2a9c23a88f7b2615b41722a3ddebeb7"; - }; - doCheck = true; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."cssselect-0.9.1" self."lxml-3.3.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A jquery-like library for python - ''; - homepage = "https://github.com/gawel/pyquery"; - license = "BSD"; - }; - }; - - - "initgroups-2.13.0" = self.buildPythonPackage { - name = "initgroups-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip"; - md5 = "38e842dcab8445f65e701fec75213acd"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Convenience uid/gid helper function used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/initgroups"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zdaemon-2.0.7" = self.buildPythonPackage { - name = "zdaemon-2.0.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz"; - md5 = "291a875f82e812110557eb6704af8afe"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Daemon process control library and tools for Unix-based systems - ''; - homepage = "http://www.python.org/pypi/zdaemon"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.querystring-1.1.1" = self.buildPythonPackage { - name = "plone.app.querystring-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.1.1.zip"; - md5 = "845c1a4fc37f615022b536667281b80e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.11" self."plone.app.vocabularies-2.1.14" self."plone.batching-1.0.1" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "z3c.zcmlhook-1.0b1" = self.buildPythonPackage { - name = "z3c.zcmlhook-1.0b1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz"; - md5 = "7b6c80146f5930409eb0b355ddf3daeb"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Easily hook into the ZCML processing machinery - ''; - homepage = "UNKNOWN"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "zope.authentication-3.7.1" = self.buildPythonPackage { - name = "zope.authentication-3.7.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip"; - md5 = "7d6bb340610518f2fc71213cfeccda68"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Definition of authentication basics for the Zope Framework - ''; - homepage = "http://pypi.python.org/pypi/zope.authentication"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "eggtestinfo-0.3" = self.buildPythonPackage { - name = "eggtestinfo-0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz"; - md5 = "6f0507aee05f00c640c0d64b5073f840"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Add test information to .egg-info - ''; - homepage = "http://pypi.python.org/pypi/eggtestinfo"; - license = with stdenv.lib.licenses; [ psfl zpt20 ]; - }; - }; - - - "plone.batching-1.0.1" = self.buildPythonPackage { - name = "plone.batching-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.1.zip"; - md5 = "4b57b660082683ad66910b3c6725c141"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Batching facilities used in Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.batching"; - license = "GPL"; - }; - }; - - - "plone.portlet.collection-2.1.5" = self.buildPythonPackage { - name = "plone.portlet.collection-2.1.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip"; - md5 = "065f0d9141860229cf66d0ff2ed6d4ea"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A portlet that fetches results from a collection - ''; - homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.browser-1.3" = self.buildPythonPackage { - name = "zope.browser-1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip"; - md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Shared Zope Toolkit browser components - ''; - homepage = "http://pypi.python.org/pypi/zope.browser"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.collection-1.0.11" = self.buildPythonPackage { - name = "plone.app.collection-1.0.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.11.zip"; - md5 = "3f97abc0cd5e370c4bbb1a73f7ee05a7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.querywidget-1.0.10" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - This package adds 'saved search' functionality to Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.collection"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.CMFCalendar-2.2.3" = self.buildPythonPackage { - name = "Products.CMFCalendar-2.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.3.tar.gz"; - md5 = "75659630aa12cfe86cc740db64ef294f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.app.form-4.0.2" self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Calendar product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Plone" = self."Plone-4.3.3"; - - "Plone-4.3.3" = self.buildPythonPackage { - name = "Plone-4.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.3.zip"; - md5 = "ce8ab3b3033e05b9544a8127dc67e09a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.caching-1.1.8" self."plone.app.dexterity-2.0.11" self."plone.app.iterate-2.1.12" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.CMFPlone-4.3.3" self.setuptools self."wicked-1.1.10" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The Plone Content Management System - ''; - homepage = "http://plone.org/"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage { - name = "Products.PluggableAuthService-1.10.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; - md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Pluggable Zope2 authentication / authorization framework - ''; - homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "wicked-1.1.10" = self.buildPythonPackage { - name = "wicked-1.1.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; - md5 = "f65611f11d547d7dc8e623bf87d3929d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone - ''; - homepage = "http://pypi.python.org/pypi/wicked"; - license = "GPL"; - }; - }; - - - "plone.app.jquerytools-1.5.7" = self.buildPythonPackage { - name = "plone.app.jquerytools-1.5.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.7.zip"; - md5 = "f87fe3088f5258a8dae1490d7d989988"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - jQuery Tools integration for Plone plus overlay and AJAX form helpers. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.GenericSetup-1.7.4" = self.buildPythonPackage { - name = "Products.GenericSetup-1.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz"; - md5 = "f93251ed519e8c4aea0bc001416027b1"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Read Zope configuration state from profile dirs / tarballs - ''; - homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "ExtensionClass-2.13.2" = self.buildPythonPackage { - name = "ExtensionClass-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Metaclass for subclassable extension types - ''; - homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.schemaeditor-1.3.7" = self.buildPythonPackage { - name = "plone.schemaeditor-1.3.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.7.zip"; - md5 = "94535ff5b8d8d871fbbd9806912c4c00"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.autoform-1.6" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Provides through-the-web editing of a zope schema/interface. - ''; - homepage = "http://svn.plone.org/svn/plone/plone.schemaeditor"; - license = "BSD"; - }; - }; - - - "zope.structuredtext-3.5.1" = self.buildPythonPackage { - name = "zope.structuredtext-3.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz"; - md5 = "eabbfb983485d0879322bc878d2478a0"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - StructuredText parser - ''; - homepage = "http://pypi.python.org/pypi/zope.structuredtext"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.ramcache-1.0" = self.buildPythonPackage { - name = "zope.ramcache-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip"; - md5 = "87289e15f0e51f50704adda1557c02a7"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope RAM Cache - ''; - homepage = "http://pypi.python.org/pypi/zope.ramcache"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.traversing-3.13.2" = self.buildPythonPackage { - name = "zope.traversing-3.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip"; - md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Resolving paths in the object hierarchy - ''; - homepage = "http://pypi.python.org/pypi/zope.traversing"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.contentprovider-3.7.2" = self.buildPythonPackage { - name = "zope.contentprovider-3.7.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz"; - md5 = "1bb2132551175c0123f17939a793f812"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Content Provider Framework for Zope Templates - ''; - homepage = "http://pypi.python.org/pypi/zope.contentprovider"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plonetheme.classic-1.3.3" = self.buildPythonPackage { - name = "plonetheme.classic-1.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.3.zip"; - md5 = "5bcf588a8998f4a1c5aecb99c3d9ecf4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The classic Plone 3 default theme. - ''; - homepage = "http://pypi.python.org/pypi/plonetheme.classic"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.scale__storage-1.3.3" = self.buildPythonPackage { - name = "plone.scale__storage-1.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.3.zip"; - md5 = "f2d56ec944e5677a4998b3b9e21534e3"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Image scaling - ''; - homepage = "http://pypi.python.org/pypi/plone.scale"; - license = "BSD"; - }; - }; - - - "plone.portlet.static-2.0.2" = self.buildPythonPackage { - name = "plone.portlet.static-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; - md5 = "ec0dc691b4191a41ff97779b117f9985"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A simple static HTML portlet for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.SecureMailHost-1.1.2" = self.buildPythonPackage { - name = "Products.SecureMailHost-1.1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip"; - md5 = "7db0f1fa867bd0df972082f502a7a707"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements. - ''; - homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk"; - license = stdenv.lib.licenses.zpt20; - }; - }; - - - "plone.portlets-2.2" = self.buildPythonPackage { - name = "plone.portlets-2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip"; - md5 = "5b7e06bee6e40af83694b82e1fee8c2d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - An extension of zope.viewlet to support dynamic portlets - ''; - homepage = "http://pypi.python.org/pypi/plone.portlets"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "Products.PluginRegistry-1.3" = self.buildPythonPackage { - name = "Products.PluginRegistry-1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Configure application plugins based on interfaces - ''; - homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "repoze.xmliter-0.5" = self.buildPythonPackage { - name = "repoze.xmliter-0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip"; - md5 = "99da76bcbad6fbaced4a273bde29b10e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Wrapper for ``lxml`` trees which serializes to string upon iteration. - ''; - homepage = "http://www.repoze.org"; - license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; - }; - }; - - - "zLOG-2.11.1" = self.buildPythonPackage { - name = "zLOG-2.11.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz"; - md5 = "68073679aaa79ac5a7b6a5c025467147"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A general logging facility - ''; - homepage = "http://cheeseshop.python.org/pypi/zLOG"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.location-3.9.1" = self.buildPythonPackage { - name = "zope.location-3.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz"; - md5 = "1684a8f986099d15296f670c58e713d8"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Location - ''; - homepage = "http://pypi.python.org/pypi/zope.location/"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "experimental.cssselect-0.3" = self.buildPythonPackage { - name = "experimental.cssselect-0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip"; - md5 = "3fecdcf1fbc3ea6025e115a56a262957"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Experimental version of lxml.cssselect - ''; - homepage = "https://github.com/lrowe/experimental.cssselect"; - license = "UNKNOWN"; - }; - }; - - - "zope.formlib-4.0.6" = self.buildPythonPackage { - name = "zope.formlib-4.0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip"; - md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Form generation and validation library for Zope - ''; - homepage = "http://pypi.python.org/pypi/zope.formlib"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "zope.copy-3.5.0" = self.buildPythonPackage { - name = "zope.copy-3.5.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz"; - md5 = "a9836a5d36cd548be45210eb00407337"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Pluggable object copying mechanism - ''; - homepage = "http://pypi.python.org/pypi/zope.copy"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "plone.app.vocabularies-2.1.14" = self.buildPythonPackage { - name = "plone.app.vocabularies-2.1.14"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.14.zip"; - md5 = "c3ce7028fd0e3f70588167b8d3c002d5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A collection of generally useful vocabularies. - ''; - homepage = "https://github.com/plone/plone.app.vocabularies"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "archetypes.querywidget-1.0.10" = self.buildPythonPackage { - name = "archetypes.querywidget-1.0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.10.zip"; - md5 = "6b65a6ff701ebcb6e9550d27c7e2a855"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.7" self."plone.app.querystring-1.1.1" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.registry-1.0.1" = self.buildPythonPackage { - name = "plone.registry-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip"; - md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A debconf-like (or about:config-like) registry for storing application settings - ''; - homepage = "http://pypi.python.org/pypi/plone.registry"; - license = "GPL"; - }; - }; - - - "Products.ExtendedPathIndex-3.1" = self.buildPythonPackage { - name = "Products.ExtendedPathIndex-3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip"; - md5 = "00c048a4b103200bdcbda61fa22c66df"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope catalog index for paths - ''; - homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "plone.subrequest-1.6.8" = self.buildPythonPackage { - name = "plone.subrequest-1.6.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.8.zip"; - md5 = "6ea93bc17d56612d41a497cdc5f2960b"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Subrequests for Zope2 - ''; - homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "z3c.form-3.1.1" = self.buildPythonPackage { - name = "z3c.form-3.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.1.1.zip"; - md5 = "0b54d848d6a1be9eab867255e10f5504"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - An advanced form and widget framework for Zope 3 - ''; - homepage = "https://launchpad.net/z3c.form"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "Products.CMFActionIcons-2.1.3" = self.buildPythonPackage { - name = "Products.CMFActionIcons-2.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz"; - md5 = "ab1dc62404ed11aea84dc0d782b2235e"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Action icons product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "WebTest-2.0.15" = self.buildPythonPackage { - name = "WebTest-2.0.15"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.15.zip"; - md5 = "49314bdba23f4d0bd807facb2a6d3f90"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ]; - preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"''; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Helper to test WSGI applications - ''; - homepage = "http://webtest.pythonpaste.org/"; - license = stdenv.lib.licenses.mit; - }; - }; - - - "plone.app.linkintegrity-1.5.4" = self.buildPythonPackage { - name = "plone.app.linkintegrity-1.5.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.4.zip"; - md5 = "f82e73603ade6f588bc27f01c5aea404"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Manage link integrity in Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = stdenv.lib.licenses.gpl2; - }; - }; - - - "zope.app.form-4.0.2" = self.buildPythonPackage { - name = "zope.app.form-4.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz"; - md5 = "3d2b164d9d37a71490a024aaeb412e91"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The Original Zope 3 Form Framework - ''; - homepage = "http://pypi.python.org/pypi/zope.app.form"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - - "five.localsitemanager-2.0.5" = self.buildPythonPackage { - name = "five.localsitemanager-2.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip"; - md5 = "5e3a658e6068832bd802018ebc83f2d4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Local site manager implementation for Zope 2 - ''; - homepage = "http://pypi.python.org/pypi/five.localsitemanager"; - license = stdenv.lib.licenses.zpt21; - }; - }; - - -} diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json deleted file mode 100644 index 8dbd010b9b6..00000000000 --- a/pkgs/top-level/python-packages.json +++ /dev/null @@ -1,150 +0,0 @@ -[ - { "name": "pyramid", - "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], - "override": { - "pyramid": { - "buildInputs": [ - "nose", - "WebTest", - "zope.component", - "zope.interface" - ] - }, - "cssselect": { - "doCheck": false - }, - "lxml": { - "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], - "doCheck": false - }, - "six": { - "doCheck": false - }, - "beautifulsoup4": { - "doCheck": false - }, - "zope.exceptions": { - "doCheck": false - }, - "zope.component": { - "doCheck": false - }, - "zope.schema": { - "doCheck": false - }, - "zope.testing": { - "buildInputs": [ "zope.location" ] - }, - "waitress": { - "doCheck": false - }, - "venusian": { - "buildInputs": [ "nose" ], - "doCheck": false - }, - "Mako": { - "buildInputs": [ "nose" ] - }, - "WebOb": { - "buildInputs": [ "nose" ], - "propagatedBuildInputs": [ "python.modules.ssl" ] - }, - "WebTest": { - "buildInputs": [ - "nose", - "unittest2", - "pyquery", - "WSGIProxy2", - "PasteDeploy", - "mock", - "coverage" - ] - }, - "mock": { - "buildInputs": [ "unittest2" ] - }, - "PasteDeploy": { - "buildInputs": [ "nose" ] - }, - "Chameleon": { - "buildInputs": [ "zope.event" ], - "doCheck": false - }, - "zope.interface": { - "buildInputs": [ "zope.event" ] - }, - "translationstring": { - "buildInputs": [ "nose" ] - }, - "repoze.lru": { - "buildInputs": [ "nose" ] - } - } - }, - { "name": "Plone", - "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", - "doCheck": false, - "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .", - "override": { - "Products.DCWorkflow": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "lxml": { - "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], - "doCheck": false - }, - "Products.CMFDefault": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "Products.CMFQuickInstallerTool": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "Products.CMFUid": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "Products.CMFActionIcons": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "Products.CMFCalendar": { - "propagatedBuildInputs": [ "eggtestinfo" ] - }, - "Pillow": { - "buildInputs": [ - "pkgs.freetype", - "pkgs.libjpeg", - "pkgs.zlib", - "pkgs.libtiff", - "pkgs.libwebp" - ], - "configurePhase": [ - "sed -i \"setup.py\" \\", - " -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;", - " s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;", - " s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;", - " s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;", - " s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'" - ] - } - } - }, - { "name": "plone.recipe.zope2instance", - "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", - "doCheck": false - }, - { "name": "RelStorage", - "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", - "doCheck": false - }, - { "name": "psycopg2", - "buildInputs": [ "pkgs.postgresql" ], - "doCheck": false - }, - { "name": "xlrd", - "doCheck": false - }, - { "name": "suds", - "doCheck": false - }, - { "name": "html2text" - } -] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4da6cdbcf78..95655002afa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -32,12 +32,7 @@ let crypt = null; }; - pythonPackages = modules // import ./python-packages-generated.nix { - inherit pkgs python; - inherit (pkgs) stdenv fetchurl; - self = pythonPackages; - } -// { + pythonPackages = modules // { inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage; From 27007155670c2ac739d0ac5fb945cff13c21b4c5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 11 Jun 2015 10:37:49 +0200 Subject: [PATCH 231/412] global: update from 6.4 to 6.5 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 0fa54709788..13903b4c7b9 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-6.4"; + name = "global-6.5"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; + sha256 = "1af6lhwhrpdnigd3707fnk3dd6y53pbc4g0i75xjf0563bdi5zaa"; }; nativeBuildInputs = [ libtool makeWrapper ]; From 6125f583e636afbf636ba85eb230008640f73f6d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 11 Jun 2015 10:46:12 +0200 Subject: [PATCH 232/412] redis: update from 3.0.1 to 3.0.2, fixes CVE-2015-4335 --- pkgs/servers/nosql/redis/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix index 0e7a7d0f250..ae5a98d5f0a 100644 --- a/pkgs/servers/nosql/redis/3.0.nix +++ b/pkgs/servers/nosql/redis/3.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; name = "redis-${version}"; src = fetchurl { url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; - sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl"; + sha256 = "00gazq98ccz64l4l5vzpynyk5wg15iwmwwvznaarkwm99b9rsz4g"; }; makeFlags = "PREFIX=$(out)"; From 19248c309ac08d314805d7c717beb998c018cf9c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jun 2015 10:48:29 +0200 Subject: [PATCH 233/412] neovim: uses vimUtils to make it configurable like vim_configurable is - vimAlias argument , when true, will create a @out/bin/vim symlink - configure argument, which will configure neovim the same way as it does vim_configurable. eg.: ~/.nixpkgs/config.nix { packageOverrides = pkgs : with pkgs; rec { vimg = neovim.override { vimAlias = true; configure = { customRC = '' set spell ''; vam.pluginDictionaries = [ { names = [ "youcompleteme" "ctrlp"]; } ]; }; }; }; } Enjoy! --- pkgs/applications/editors/neovim/default.nix | 149 +++++++++++-------- 1 file changed, 84 insertions(+), 65 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e2dbc4abc56..599b04e1028 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,9 +1,13 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack -, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack -, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper +{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey +, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, ncurses, perl +, pkgconfig, unibilium, makeWrapper, vimUtils + , withPython ? true, pythonPackages, extraPythonPackages ? [] , withPython3 ? true, python3Packages, extraPython3Packages ? [] , withJemalloc ? true, jemalloc + +, vimAlias ? false +, configure ? null }: with stdenv.lib; @@ -48,74 +52,89 @@ let ignoreCollisions = true; }; -in stdenv.mkDerivation rec { - name = "neovim-${version}"; + neovim = stdenv.mkDerivation rec { + name = "neovim-${version}"; - src = fetchFromGitHub { - sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; - rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; - repo = "neovim"; - owner = "neovim"; - }; + src = fetchFromGitHub { + sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; + rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; + repo = "neovim"; + owner = "neovim"; + }; - enableParallelBuilding = true; + enableParallelBuilding = true; - buildInputs = [ - makeWrapper - cmake - glib - libtermkey - libuv - luajit - lua - lpeg - luaMessagePack - luabitop - libmsgpack - ncurses - neovimLibvterm - pkgconfig - unibilium - ] ++ optional withJemalloc jemalloc; + buildInputs = [ + makeWrapper + cmake + glib + libtermkey + libuv + luajit + lua + lpeg + luaMessagePack + luabitop + libmsgpack + ncurses + neovimLibvterm + pkgconfig + unibilium + ] ++ optional withJemalloc jemalloc; - nativeBuildInputs = [ - gettext - ]; + nativeBuildInputs = [ + gettext + ]; - LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; - LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; + LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - postInstall = optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python - '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python $out/bin/nvim-python3 - '' + optionalString (withPython || withPython3) '' - wrapProgram $out/bin/nvim --add-flags "${ - (optionalString withPython - ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') + - (optionalString withPython3 - ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'') - }" - ''; - - meta = { - description = "Vim text editor fork focused on extensibility and agility"; - longDescription = '' - Neovim is a project that seeks to aggressively refactor Vim in order to: - - Simplify maintenance and encourage contributions - - Split the work between multiple developers - - Enable the implementation of new/modern user interfaces without any - modifications to the core source - - Improve extensibility with a new plugin architecture + postInstall = optionalString withPython '' + ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPython3 '' + ln -s ${python3Env}/bin/python $out/bin/nvim-python3 + '' + optionalString (withPython || withPython3) '' + wrapProgram $out/bin/nvim --add-flags "${ + (optionalString withPython + ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') + + (optionalString withPython3 + ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '') + }" ''; - homepage = http://www.neovim.io; - # "Contributions committed before b17d96 by authors who did not sign the - # Contributor License Agreement (CLA) remain under the Vim license. - # Contributions committed after b17d96 are licensed under Apache 2.0 unless - # those contributions were copied from Vim (identified in the commit logs - # by the vim-patch token). See LICENSE for details." - license = with licenses; [ asl20 vim ]; - maintainers = with maintainers; [ manveru nckx ]; - platforms = platforms.unix; + + meta = { + description = "Vim text editor fork focused on extensibility and agility"; + longDescription = '' + Neovim is a project that seeks to aggressively refactor Vim in order to: + - Simplify maintenance and encourage contributions + - Split the work between multiple developers + - Enable the implementation of new/modern user interfaces without any + modifications to the core source + - Improve extensibility with a new plugin architecture + ''; + homepage = http://www.neovim.io; + # "Contributions committed before b17d96 by authors who did not sign the + # Contributor License Agreement (CLA) remain under the Vim license. + # Contributions committed after b17d96 are licensed under Apache 2.0 unless + # those contributions were copied from Vim (identified in the commit logs + # by the vim-patch token). See LICENSE for details." + license = with licenses; [ asl20 vim ]; + maintainers = with maintainers; [ manveru nckx garbas ]; + platforms = platforms.unix; + }; }; + +in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec { + name = "neovim-${version}-configured"; + buildInputs = [ makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + for item in ${neovim}/bin/*; do + ln -s $item $out/bin/ + done + '' + optionalString vimAlias '' + ln -s $out/bin/nvim $out/bin/vim + '' + optionalString (configure != null) '' + wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" + ''; } From d9461e945f6dda78ce51f797ea09ba83613855d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jun 2015 12:40:14 +0200 Subject: [PATCH 234/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/bab92d665cf0dc5c4cc74cc6b8afe84080cb426a with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1 --- .../haskell-modules/hackage-packages.nix | 315 +++++++++++++++--- 1 file changed, 268 insertions(+), 47 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d29bddf0c39..4794ec73879 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10657,9 +10657,9 @@ self: { }: mkDerivation { pname = "Neks"; - version = "0.3.0.0"; - sha256 = "1nqww81d9hdm4d2kgv5k4vhp3wavlpa39vym4x7bddcxg1g5drmv"; - isLibrary = false; + version = "0.4.0.0"; + sha256 = "0xi5d9wvk2xzsn500d61b6mmvwd36fs2n92l5qy4hzhww5lmkrrb"; + isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cereal containers directory hashable messagepack @@ -14442,6 +14442,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "TestExplode" = callPackage + ({ mkDerivation, base, containers, directory, fgl, graphviz + , interpolatedstring-perl6, mtl, process, text + }: + mkDerivation { + pname = "TestExplode"; + version = "0.1.0.0"; + sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1"; + buildDepends = [ + base containers directory fgl graphviz interpolatedstring-perl6 mtl + process text + ]; + jailbreak = true; + homepage = "https://github.com/testexplode/testexplode"; + description = "Generates testcases from program-snippets"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Theora" = callPackage ({ mkDerivation, base, ogg, theora }: mkDerivation { @@ -25018,6 +25036,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bindings-potrace" = callPackage + ({ mkDerivation, base, bindings-DSL, potrace }: + mkDerivation { + pname = "bindings-potrace"; + version = "0.1"; + sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd"; + buildDepends = [ base bindings-DSL ]; + extraLibraries = [ potrace ]; + homepage = "https://github.com/rwbarton/bindings-potrace"; + description = "Low-level bindings to the potrace bitmap tracing library"; + license = stdenv.lib.licenses.gpl2; + }) { inherit (pkgs) potrace;}; + "bindings-ppdev" = callPackage ({ mkDerivation, base, bindings-DSL, ioctl }: mkDerivation { @@ -25797,18 +25828,19 @@ self: { }) {}; "bitx-bitcoin" = callPackage - ({ mkDerivation, aeson, base, bytestring, Decimal, hspec - , http-conduit, network, record, split, text, time + ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit + , network, record, scientific, split, text, time }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.1.0.0"; - sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2"; + version = "0.2.0.0"; + sha256 = "1n0hp16rpddm74q2rfldga7vpvvsqfn099qdp8qd5pqh8swkmwq8"; buildDepends = [ - aeson base bytestring Decimal http-conduit network record split + aeson base bytestring http-conduit network record scientific split text time ]; testDepends = [ aeson base bytestring hspec record time ]; + homepage = "https://github.com/tebello-thejane/bitx-haskell"; description = "A Haskell library for working with the BitX bitcoin exchange"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -30565,31 +30597,29 @@ self: { "chatter" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers - , deepseq, directory, filepath, fullstop, ghc-prim, HUnit, mbox - , MonadRandom, parsec, QuickCheck, quickcheck-instances - , random-shuffle, regex-base, regex-tdfa, regex-tdfa-text, safe - , split, test-framework, test-framework-hunit + , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom + , parsec, QuickCheck, quickcheck-instances, random-shuffle + , regex-tdfa, regex-tdfa-text, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-skip, text, tokenize , transformers, zlib }: mkDerivation { pname = "chatter"; - version = "0.5.0.1"; - sha256 = "0saavfnxd6l6w3ybvdmi14ia06ssc4lndb0ba8hhyqb3qzz7l7zs"; + version = "0.5.0.2"; + sha256 = "1nbdc4np4hmvnsh1rfpldi2j1wm1klmfm9szi2kz9fa8g8n3kxxl"; isLibrary = true; isExecutable = true; buildDepends = [ array base bytestring cereal containers deepseq directory filepath - fullstop ghc-prim mbox MonadRandom parsec QuickCheck - quickcheck-instances random-shuffle regex-base regex-tdfa - regex-tdfa-text safe split text tokenize transformers zlib + fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances + random-shuffle regex-tdfa regex-tdfa-text text tokenize + transformers zlib ]; testDepends = [ base cereal containers filepath HUnit parsec QuickCheck quickcheck-instances test-framework test-framework-hunit test-framework-quickcheck2 test-framework-skip text tokenize ]; - jailbreak = true; homepage = "http://github.com/creswick/chatter"; description = "A library of simple NLP algorithms"; license = stdenv.lib.licenses.bsd3; @@ -32800,8 +32830,8 @@ self: { }: mkDerivation { pname = "coinbase-exchange"; - version = "0.1.0.0"; - sha256 = "0l09gjn0lk7v51s1gw52p0m9i8amhci93qpi98p1r1nlxx09xj3v"; + version = "0.2.0.0"; + sha256 = "1x9cgdj38z1zhrx464rj3qhh8rxqs98mfpqfsnn5yill037p1ig8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -32815,7 +32845,6 @@ self: { base bytestring http-client-tls http-conduit old-locale tasty tasty-hunit tasty-quickcheck tasty-th time transformers uuid ]; - jailbreak = true; description = "Connector library for the coinbase exchange"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -43508,8 +43537,8 @@ self: { }: mkDerivation { pname = "dsh-sql"; - version = "0.2.0.1"; - sha256 = "0vr9wsad74735py2i2kqwqi4phf49ksw3d4w89jlcgi6xpsc02s1"; + version = "0.2.0.2"; + sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44398,8 +44427,8 @@ self: { ({ mkDerivation, base, edenmodules, parallel }: mkDerivation { pname = "edenskel"; - version = "2.0.0.2"; - sha256 = "0dkvbdy04w4zbbc3q11hzzg3h5d8azka11yiiz3rvy1nkhp9wv5l"; + version = "2.1.0.0"; + sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q"; buildDepends = [ base edenmodules parallel ]; description = "Semi-explicit parallel programming skeleton library"; license = stdenv.lib.licenses.bsd3; @@ -47805,6 +47834,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fay-geoposition" = callPackage + ({ mkDerivation, fay-base, fay-text }: + mkDerivation { + pname = "fay-geoposition"; + version = "0.1.0.1"; + sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q"; + buildDepends = [ fay-base fay-text ]; + homepage = "https://github.com/victoredwardocallaghan/fay-geoposition"; + description = "W3C compliant implementation of GeoPosition API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fay-hsx" = callPackage ({ mkDerivation, fay-base, fay-jquery }: mkDerivation { @@ -52808,6 +52849,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-simple" = callPackage + ({ mkDerivation, base, data-default, ghc, ghc-paths }: + mkDerivation { + pname = "ghc-simple"; + version = "0.1.0.0"; + sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf"; + buildDepends = [ base data-default ghc ghc-paths ]; + homepage = "https://github.com/valderman/ghc-simple"; + description = "Simplified interface to the GHC API"; + license = stdenv.lib.licenses.mit; + }) {}; + "ghc-srcspan-plugin" = callPackage ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { @@ -52996,8 +53049,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.4"; - sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0"; + version = "0.4.2"; + sha256 = "094ffwwlxg7qgrcgw35rmzincfrwyhxkh6iw9bqdib5l8w9gcr6d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74970,6 +75023,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-win32" = callPackage + ({ mkDerivation, base, containers, inline-c, template-haskell + , Win32 + }: + mkDerivation { + pname = "inline-c-win32"; + version = "0.1"; + sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm"; + buildDepends = [ base containers inline-c template-haskell Win32 ]; + homepage = "https://github.com/anton-dessiatov/inline-c-win32"; + description = "Win32 API Context for the inline-c library"; + license = stdenv.lib.licenses.mit; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -75598,6 +75665,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ip-quoter" = callPackage + ({ mkDerivation, base, network, split, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "ip-quoter"; + version = "1.0.0.0"; + revision = "1"; + sha256 = "1idi03f6l9nwnsfp2mvkxz4sgwqlpa8ag3h5drb3i4hwgx0mkhfg"; + editedCabalFile = "5cd6b449c4acd24b27d27a839acdab85f65b5556dd7bc8be115b7e2f6dc5df11"; + buildDepends = [ base network split template-haskell ]; + testDepends = [ base network tasty tasty-hunit ]; + homepage = "https://github.com/shlevy/ip-quoter"; + description = "Quasiquoter for IP addresses"; + license = stdenv.lib.licenses.mit; + }) {}; + "ip6addr" = callPackage ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { @@ -81116,14 +81200,14 @@ self: { "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core - , lens-family-th + , lens-family-th, transformers }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.3"; - sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk"; + version = "0.1.0.4"; + sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3"; buildDepends = [ - base lens-family lens-family-core lens-family-th + base lens-family lens-family-core lens-family-th transformers ]; homepage = "https://github.com/michaelt/lens-simple"; description = "simplified import of elementary lens-family combinators"; @@ -82370,6 +82454,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linear-grammar" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }: + mkDerivation { + pname = "linear-grammar"; + version = "0.0.0.5"; + sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry"; + buildDepends = [ base ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A simple grammar for building linear equations and inclusive inequalities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linear-maps" = callPackage ({ mkDerivation, base, containers, HUnit }: mkDerivation { @@ -84756,9 +84852,12 @@ self: { mkDerivation { pname = "machinecell"; version = "1.3.1"; + revision = "1"; sha256 = "1v4rrjszh6sm2x1nwq33f4xwa41bnls0awhy9qfkap62bpad8fxg"; + editedCabalFile = "5a7ee43c327694ac753228da8f16d681a60d23b4926132726e2a093ecacb4725"; buildDepends = [ arrows base free mtl profunctors semigroups ]; testDepends = [ base hspec mtl profunctors QuickCheck ]; + jailbreak = true; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; @@ -90266,16 +90365,17 @@ self: { }) {}; "multistate" = callPackage - ({ mkDerivation, base, mtl, transformers }: + ({ mkDerivation, base, hspec, mtl, tagged, transformers }: mkDerivation { pname = "multistate"; - version = "0.3.0.0"; - sha256 = "1sqaxvvs94max8gw1sz3kkgnp8y9zwrjdclnzv1kkkhciix9a1d1"; + version = "0.6.0.0"; + sha256 = "17b54qy4dgacj0lwy61nf3hbppd950xk9c1yphjn6i6jcr8z66li"; isLibrary = true; isExecutable = true; - buildDepends = [ base mtl transformers ]; + buildDepends = [ base mtl tagged transformers ]; + testDepends = [ base hspec transformers ]; homepage = "https://github.com/lspitzner/multistate"; - description = "like mtl's ReaderT/WriterT/StateT, but more than one contained value/type"; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95856,8 +95956,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.7.1.1"; - sha256 = "1n96g7l16cn1qcp9xsbdmp844078lpcjsz3lg1x81drnzax9fpa1"; + version = "0.7.2"; + sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95870,7 +95970,6 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - jailbreak = true; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95881,8 +95980,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.2.0"; - sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f"; + version = "0.1.2.1"; + sha256 = "1hr2jfbzanpqbkvsfcbzvlfsnzba11hdrmvc3j63fwqk931qi2jm"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -98829,6 +98928,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-mongodb" = callPackage + ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: + mkDerivation { + pname = "pipes-mongodb"; + version = "0.1.0.0"; + sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888"; + buildDepends = [ base monad-control mongoDB pipes ]; + testDepends = [ base monad-control mongoDB pipes text ]; + homepage = "http://github.com/jb55/pipes-mongodb"; + description = "Stream results from MongoDB"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes-network" = callPackage ({ mkDerivation, base, bytestring, network, network-simple, pipes , pipes-safe, transformers @@ -100642,6 +100754,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) adns; inherit (pkgs) openssl;}; + "potrace" = callPackage + ({ mkDerivation, base, bindings-potrace, bytestring, containers + , data-default, JuicyPixels, vector + }: + mkDerivation { + pname = "potrace"; + version = "0.1.0.0"; + sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng"; + buildDepends = [ + base bindings-potrace bytestring containers data-default + JuicyPixels vector + ]; + description = "Trace bitmap images to paths using potrace"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "potrace-diagrams" = callPackage + ({ mkDerivation, base, diagrams-lib, JuicyPixels, potrace }: + mkDerivation { + pname = "potrace-diagrams"; + version = "0.1.0.0"; + sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v"; + buildDepends = [ base diagrams-lib JuicyPixels potrace ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Potrace bindings for the diagrams library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "powermate" = callPackage ({ mkDerivation, base, directory, network, unix }: mkDerivation { @@ -108719,6 +108859,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "safe-printf" = callPackage + ({ mkDerivation, base, doctest, haskell-src-meta, hspec, QuickCheck + , template-haskell, th-lift + }: + mkDerivation { + pname = "safe-printf"; + version = "0.1.0.0"; + sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6"; + buildDepends = [ base haskell-src-meta template-haskell th-lift ]; + testDepends = [ + base doctest haskell-src-meta hspec QuickCheck template-haskell + th-lift + ]; + homepage = "https://github.com/konn/safe-printf"; + description = "Well-typed, flexible and variadic printf for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safecopy" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, quickcheck-instances, tasty @@ -109533,8 +109691,8 @@ self: { }: mkDerivation { pname = "schedule-planner"; - version = "1.0.0.1"; - sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399"; + version = "1.0.1.0"; + sha256 = "0vlr4wwazpr7xf5pym2f42gwniy017h02wwymn0zn80wypiv6dz1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -118894,8 +119052,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "structural-induction"; - version = "0.2"; - sha256 = "1lr91wc1m655pi3ljw3n89svfazrb16785s9mfx361jgn335m8rd"; + version = "0.2.0.1"; + sha256 = "0ac5yhx6cbxzcdqy74lp791xwgammsnd8jazx0xy3ngxn4wwf23r"; buildDepends = [ base containers genifunctors mtl pretty safe ]; testDepends = [ base geniplate language-haskell-extract mtl pretty QuickCheck safe @@ -124568,6 +124726,46 @@ test/package-dump/ghc-7.10.txt"; license = stdenv.lib.licenses.mit; }) {}; + "tip-haskell-frontend" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , geniplate-mirror, ghc, ghc-paths, mtl, pretty, pretty-show + , QuickCheck, split, tip-lib + }: + mkDerivation { + pname = "tip-haskell-frontend"; + version = "0.1.1"; + sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring containers directory filepath geniplate-mirror ghc + ghc-paths mtl pretty pretty-show QuickCheck split tip-lib + ]; + homepage = "http://tip-org.github.io"; + description = "Convert from Haskell to Tip"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "tip-lib" = callPackage + ({ mkDerivation, alex, array, base, containers, geniplate-mirror + , happy, mtl, optparse-applicative, pretty, pretty-show, split + }: + mkDerivation { + pname = "tip-lib"; + version = "0.1.1"; + sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array base containers geniplate-mirror mtl optparse-applicative + pretty pretty-show split + ]; + buildTools = [ alex happy ]; + homepage = "http://tip-org.github.io"; + description = "tons of inductive problems - support library and tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "titlecase" = callPackage ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit , tasty-quickcheck, text @@ -125699,6 +125897,28 @@ test/package-dump/ghc-7.10.txt"; license = stdenv.lib.licenses.bsd3; }) {}; + "trurl" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, hastache + , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text + , unordered-containers + }: + mkDerivation { + pname = "trurl"; + version = "0.1.0.0"; + sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring directory hastache http-conduit MissingH + scientific tar text unordered-containers + ]; + testDepends = [ base hastache tasty tasty-hunit ]; + jailbreak = true; + homepage = "http://github.com/dbushenko/trurl"; + description = "Haskell template code generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tsession" = callPackage ({ mkDerivation, base, containers, mtl, time, transformers }: mkDerivation { @@ -127361,6 +127581,7 @@ test/package-dump/ghc-7.10.txt"; hashable mtl network old-locale primitive process syb transformers uhc-util uulib vector ]; + jailbreak = true; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; @@ -127373,8 +127594,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "uhc-util"; - version = "0.1.5.5"; - sha256 = "00b1ycdnm0gm01izs96qwsx3c3p1mrcimzamscaimyr1y14jvfc1"; + version = "0.1.5.6"; + sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz"; buildDepends = [ array base binary bytestring containers directory fclabels fgl hashable ListLike mtl process syb time time-compat uulib From 1c31a4660a53b631ccaa4a45befbcdaa1121ec74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 11:02:53 +0200 Subject: [PATCH 235/412] haskell-pipes-mongodb: disable the test suite which tries to access the network --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8ee927f6fb8..c58d047ae8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -305,6 +305,7 @@ self: super: { marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 + pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw scotty-binding-play = dontCheck super.scotty-binding-play; From 9e04c74d9580abe76f0e153d55ad1279db728a5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 11:04:19 +0200 Subject: [PATCH 236/412] haskell-bitx-bitcoin: disable the test suite which tries to access the network --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c58d047ae8f..420050147aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -293,6 +293,7 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; bitcoin-api = dontCheck super.bitcoin-api; bitcoin-api-extra = dontCheck super.bitcoin-api-extra; + bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw From 2f6c8127f5c00ef8ee2f2cd53411e66cf39004aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 11:06:41 +0200 Subject: [PATCH 237/412] uhc: update to version 1.1.9.1 --- pkgs/development/compilers/uhc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index c788112fb91..64d51f971b9 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -2,13 +2,13 @@ let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.9.0"; + version = "1.1.9.1"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4"; - sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2"; + rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b"; + sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; From 283b75910a62ec3b07ed642a7ce6f981d76a3223 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 11:11:15 +0200 Subject: [PATCH 238/412] haskell-Win32: mark broken on systems other than Cygwin --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 420050147aa..e5f41f2d9bc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -849,4 +849,8 @@ self: super: { # Avoid spurious test suite failures. fft = dontCheck super.fft; + # This package can't be built on non-Windows systems. + Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; }); + inline-c-win32 = dontDistribute super.inline-c-win32; + } From 414d71c4995a49bdd21abf41fd027adcb48375c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 11:43:22 +0200 Subject: [PATCH 239/412] haskell-cron-compat: unnecessary fork of 'cron' that doesn't compile anyway --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e5f41f2d9bc..7835ed7d96f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -853,4 +853,7 @@ self: super: { Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; }); inline-c-win32 = dontDistribute super.inline-c-win32; + # Doesn't work with recent versions of mtl. + cron-compat = markBroken super.cron-compat; + } From 84dfce0bc07991a128d4e6162b12c1bfc15fecda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 12:07:15 +0200 Subject: [PATCH 240/412] mercurial: install bash completion --- pkgs/applications/version-management/mercurial/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 2409e8e2240..565c95af508 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation { mkdir -p $out/share/cgi-bin cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi + + # install bash completion + install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial ''; meta = { From 84327822e1ada2a73b67f23ebc238ab07bf6c185 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 11 Jun 2015 12:27:39 +0200 Subject: [PATCH 241/412] gnome-latest.sh: use bash, it doesn't work with sh --- maintainers/scripts/gnome-latest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh index 9290b6deaff..63b309c5a77 100755 --- a/maintainers/scripts/gnome-latest.sh +++ b/maintainers/scripts/gnome-latest.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash GNOME_FTP="ftp.gnome.org/pub/GNOME/sources" From 9aa07ac846ddd8c89b8e6924e861133de1758a5c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 11 Jun 2015 12:27:57 +0200 Subject: [PATCH 242/412] sourceforge: remove unreachable mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 1453af3a62a..0e2a6e756f6 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -14,8 +14,6 @@ rec { http://heanet.dl.sourceforge.net/sourceforge/ http://surfnet.dl.sourceforge.net/sourceforge/ http://dfn.dl.sourceforge.net/sourceforge/ - http://mesh.dl.sourceforge.net/sourceforge/ - http://ovh.dl.sourceforge.net/sourceforge/ http://osdn.dl.sourceforge.net/sourceforge/ http://kent.dl.sourceforge.net/sourceforge/ ]; From 8a7c23456d78858051c9d4dadf9983ec831d490a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jun 2015 22:40:42 +0200 Subject: [PATCH 243/412] jetty: Update from 9.2.5 to 9.2.11 --- pkgs/servers/http/jetty/9.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix index 41afc9b40af..4ac38e8d3cb 100644 --- a/pkgs/servers/http/jetty/9.2.nix +++ b/pkgs/servers/http/jetty/9.2.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { name = "jetty-9.2.5"; src = fetchurl { - url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1"; - name = "jetty-distribution-9.2.5.v20141112.tar.gz"; - sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1"; + url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.11.v20150529.tar.gz&r=1"; + name = "jetty-distribution-9.2.11.v20150529.tar.gz"; + sha256 = "1d9s9l64b1l3x6vkx8qwgzfqwm55iq5g9xjjm2h2akf494yx1mrd"; }; phases = [ "unpackPhase" "installPhase" ]; From 63bb4f919c59c3024f71b7f9c0fb6914340960e4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 11 Jun 2015 14:31:44 +0200 Subject: [PATCH 244/412] Update evolution and evolution-data-server --- pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix | 4 ++-- .../gnome-3/3.16/core/evolution-data-server/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix index af60d890673..b4240a35a68 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix @@ -7,11 +7,11 @@ let majVer = gnome3.version; in stdenv.mkDerivation rec { - name = "evolution-${majVer}.1"; + name = "evolution-${majVer}.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz"; - sha256 = "1lm877rrcfy98mpp4iq7m9p8r1nr9kir916n4qin2ygas9zx0qlb"; + sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix index 7193b845468..82397b385d5 100644 --- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "evolution-data-server-${gnome3.version}.1"; + name = "evolution-data-server-${gnome3.version}.3"; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz"; - sha256 = "0lgb8jvn8kx50692gg1m9klvwm7msvk4f7wm0yl7rj880wbxzvh4"; + sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f"; }; buildInputs = with gnome3; From a51e9610e76ec2e45cdbb9f9802ba8b4519d5c1c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Jun 2015 10:02:44 +0200 Subject: [PATCH 245/412] fix libtermkey on darwin --- pkgs/development/libraries/libtermkey/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index e5965a10f67..c59542fdfed 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; buildInputs = [ libtool pkgconfig ncurses ]; From 414d6d9e87b8e74944f4124969633fc45f1e2dac Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Jun 2015 10:03:23 +0200 Subject: [PATCH 246/412] fix unibilium on darwin --- pkgs/development/libraries/unibilium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 663432f8ec8..369e271191f 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; buildInputs = [ libtool pkgconfig ]; From 8ffce0888c3f6138fa915e1a3c5d94b0056de940 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Jun 2015 10:04:51 +0200 Subject: [PATCH 247/412] fix luaPackages.luabitop on darwin --- pkgs/top-level/lua-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 84befe7f652..c5fbaf6df2a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -33,8 +33,15 @@ let sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; }; + buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile + ''; + preBuild = '' makeFlagsArray=( + ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"} INCLUDES="-I${lua}/include" LUA="${lua}/bin/lua"); ''; From c7f36cb5f0ddc86d50774ba7181064372e417f85 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Jun 2015 10:05:59 +0200 Subject: [PATCH 248/412] fix neovim on darwin --- pkgs/applications/editors/neovim/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 599b04e1028..3943a9910a4 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -29,7 +29,8 @@ let buildInputs = [ libtool perl ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; enableParallelBuilding = true; @@ -89,7 +90,16 @@ let LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - postInstall = optionalString withPython '' + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=${jemalloc}/lib + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + echo patching $out/bin/nvim + install_name_tool -change libjemalloc.1.dylib \ + ${jemalloc}/lib/libjemalloc.1.dylib \ + $out/bin/nvim + '' + optionalString withPython '' ln -s ${pythonEnv}/bin/python $out/bin/nvim-python '' + optionalString withPython3 '' ln -s ${python3Env}/bin/python $out/bin/nvim-python3 From c7a73dbbdbd2a303f5d1e26726adfd66e6e294de Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Jun 2015 14:30:00 +0200 Subject: [PATCH 249/412] removed unnecessary patch --- pkgs/top-level/lua-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c5fbaf6df2a..d53bd43a800 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -35,10 +35,6 @@ let buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile - ''; - preBuild = '' makeFlagsArray=( ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"} From 020f466ef4b3f1fe5906169569ed82ef5145b227 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 Jun 2015 10:35:40 +0200 Subject: [PATCH 250/412] disable tests for pythonPackages.trollius --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7af8b7e0052..e2e35a1aa04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15795,6 +15795,8 @@ let sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py ''; + doCheck = !stdenv.isDarwin; + meta = { description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; homepage = "https://bitbucket.org/enovance/trollius"; From 61531556d8d69db7c4677245b26c2f7a0e8b8b6d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 Jun 2015 10:47:27 +0200 Subject: [PATCH 251/412] remove hardcoded clang --- pkgs/top-level/lua-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d53bd43a800..c1b04afba38 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -37,7 +37,7 @@ let preBuild = '' makeFlagsArray=( - ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"} + ${stdenv.lib.optionalString stdenv.cc.isClang "CC=$CC"} INCLUDES="-I${lua}/include" LUA="${lua}/bin/lua"); ''; From e1683eeff1a3bffa7837a162b58fda648ff95c08 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jun 2015 14:54:30 +0200 Subject: [PATCH 252/412] lsof: url is behind auth. changed downloaded url for lsof --- pkgs/development/tools/misc/lsof/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 6370e7447f2..af9145bc409 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lsof-4.88"; src = fetchurl { - url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2; + url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_4.88.tar.bz2"; sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy"; }; From fbfdc71e1ffd555fe47eff8ff28688308feaac99 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 11 Jun 2015 15:46:50 +0200 Subject: [PATCH 253/412] libical: fix crash when TZDIR is empty, and add non-nixos zoneinfo paths. Closes #8285 --- .../libraries/libical/respect-env-tzdir.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 980a0d5c71a..fad78c2fb8a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,28 +1,25 @@ -diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c -index fe984c9..22ba0a1 100644 ---- a/src/libical/icaltz-util.c -+++ b/src/libical/icaltz-util.c -@@ -107,7 +107,7 @@ typedef struct +--- a/src/libical/icaltz-util.c 2015-06-11 15:40:58.843138630 +0200 ++++ b/src/libical/icaltz-util.c 2015-06-11 15:43:12.722046252 +0200 +@@ -107,7 +107,7 @@ char charcnt[4]; } tzinfo; -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/etc/zoneinfo"}; ++static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"}; static char *zdir = NULL; #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -194,6 +194,16 @@ set_zonedir (void) +@@ -194,6 +194,15 @@ const char *fname = ZONES_TAB_SYSTEM_FILENAME; unsigned int i; -+ const char *env_tzdir = strdup (getenv ("TZDIR")); ++ const char *env_tzdir = getenv ("TZDIR"); + if (env_tzdir) { + sprintf (file_path, "%s/%s", env_tzdir, fname); + if (!access (file_path, F_OK|R_OK)) { + zdir = env_tzdir; + return; + } -+ free (env_tzdir); + } + for (i = 0; i < NUM_SEARCH_PATHS; i++) { From fb19019af7c122b145eb3403dae3fc0a8287671a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 Jun 2015 16:01:24 +0200 Subject: [PATCH 254/412] pythonPackages.trollius: disable the tests that fail on darwin --- pkgs/top-level/python-packages.nix | 32 +++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2e35a1aa04..c65fe86c382 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15791,12 +15791,38 @@ let ++ optional isPy26 ordereddict ++ optional (isPy26 || isPy27 || isPyPy) futures; - patchPhase = optionalString isPy26 '' + # Some of the tests fail on darwin with `error: AF_UNIX path too long' + # because of the *long* path names for sockets + patchPhase = optionalString stdenv.isDarwin '' + sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|" tests/test_events.py + sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py + sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py + sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py + sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|" tests/test_unix_events.py + sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|" tests/test_unix_events.py + sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py + sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py + sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py + sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py + sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py + sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py + sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py + sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py + sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py + sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py + sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py + '' + optionalString isPy26 '' sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py ''; - doCheck = !stdenv.isDarwin; - meta = { description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; homepage = "https://bitbucket.org/enovance/trollius"; From 7a0ca5226727911bc6f3e7148407701d611d783d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 11 Jun 2015 16:49:43 +0200 Subject: [PATCH 255/412] scollector: Change type of collectors to allow proper merging --- nixos/modules/services/monitoring/scollector.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 0143d2e327b..179c587431e 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -73,7 +73,7 @@ in { }; collectors = mkOption { - type = types.attrs; + type = with types; attrsOf (listOf path); default = {}; example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }"; description = '' From 58fd4f672f08a323f86a6a2eb57069be83893084 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Thu, 11 Jun 2015 18:23:58 +0200 Subject: [PATCH 256/412] Chromium: Update and build fixes. Changes included: - Update versions. - Use gyp package not gyp_svn1977. - Remove icu from buildInputs, since this causes a build error due to inferference with use_system_icu=false. - Remove the hack that inserts the absolute path into gyp files, and pass `--depth .` to gyp. This resolves the `third_party/angle` gyp error. - Do a normal copy of the source code not a symlink copy. This resolves some link error where the symlinks interfere with relative paths (seems like because gyp resolves symlinks first). Note, this used to be worked around with the absolute path insertion hack. - Change the bucketURL in update.nix to https (for more secure updates). --- .../networking/browsers/chromium/common.nix | 17 +++++-------- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- .../browsers/chromium/source/update.nix | 2 +- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1f6c272aceb..d3a0c86daf4 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ninja, which # default dependencies -, bzip2, flac, speex, icu, libopus +, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp @@ -84,7 +84,7 @@ let }; defaultDependencies = [ - bzip2 flac speex icu opusWithCustomModes + bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp @@ -113,7 +113,7 @@ let glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2 + pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -124,15 +124,10 @@ let # be fixed, then try again to unbundle everything into separate # derivations. prePatch = '' - cp -dsr --no-preserve=mode "${source.main}"/* . - cp -dsr --no-preserve=mode "${source.sandbox}" sandbox + cp -dr --no-preserve=mode "${source.main}"/* . + cp -dr --no-preserve=mode "${source.sandbox}" sandbox cp -dr "${source.bundled}" third_party chmod -R u+w third_party - - # Hardcode source tree root in all gyp files - find -iname '*.gyp*' \( -type f -o -type l \) \ - -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ - -exec chmod u+w {} + ''; postPatch = optionalString (versionOlder version "42.0.0.0") '' @@ -200,7 +195,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} - python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + python build/gyp_chromium -f ninja --depth . ${gypFlags} ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index e1144a44afb..3adbbab8392 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "43.0.2327.5"; - sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n"; - sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6"; - sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb"; + version = "45.0.2421.0"; + sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk"; + sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89"; + sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598"; }; beta = { - version = "42.0.2311.39"; - sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0"; - sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v"; - sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx"; + version = "44.0.2403.39"; + sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n"; + sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn"; + sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c"; }; stable = { - version = "41.0.2272.89"; - sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk"; - sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4"; - sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv"; + version = "43.0.2357.124"; + sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92"; + sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p"; + sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index 27af85de546..e639cdb087b 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -9,7 +9,7 @@ let then import ./sources.nix else null; - bucketURL = "http://commondatastorage.googleapis.com/" + bucketURL = "https://commondatastorage.googleapis.com/" + "chromium-browser-official"; debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; From 6a8afa4bb35ee9cffb8e62f5a294adc781b9d348 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Jun 2015 19:34:29 +0200 Subject: [PATCH 257/412] chromium: Fix plugin_paths patch for version 44. The pepper effects plugin has been removed and migrated to NaCl, so I'm just dropping the hunk of that patch. Upstream reviow URL: https://codereview.chromium.org/1085393003 Signed-off-by: aszlig --- .../browsers/chromium/source/default.nix | 13 ++- .../chromium/source/nix_plugin_paths_44.patch | 84 +++++++++++++++++++ 2 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 54430bb5be9..a3a46631484 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -18,7 +18,7 @@ let "s,^/,," ]); - pre42 = versionOlder version "42.0.0.0"; + pre44 = versionOlder version "44.0.0.0"; in stdenv.mkDerivation { name = "chromium-source-${version}"; @@ -47,10 +47,10 @@ in stdenv.mkDerivation { done ''; - patches = if pre42 then [ - ./sandbox_userns_36.patch ./nix_plugin_paths.patch - ] else [ + patches = if pre44 then [ ./nix_plugin_paths_42.patch + ] else [ + ./nix_plugin_paths_44.patch ]; patchPhase = let @@ -73,11 +73,10 @@ in stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" - '' + optionalString (!pre42) '' sed -i -e '/LOG.*no_suid_error/d' \ "$main/content/browser/browser_main_loop.cc" + '' + optionalString useOpenSSL '' + cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch new file mode 100644 index 00000000000..326da7f420a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch @@ -0,0 +1,84 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index 8a205a6..d5c24e1 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -97,21 +97,14 @@ static base::LazyInstance + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) && !defined(OS_IOS) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + } // namespace +@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(FILE_PATH_LITERAL("script.log")); + break; + case chrome::FILE_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) + return false; + cur = cur.Append(kInternalFlashPluginFileName); + break; +@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); +@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { + // In the component case, this is the source adapter. Otherwise, it is the + // actual Pepper module that gets loaded. + case chrome::FILE_WIDEVINE_CDM_ADAPTER: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) + return false; + cur = cur.AppendASCII(kWidevineCdmAdapterFileName); + break; From af54ddf8b635e2897db64d775317e33a42c259e2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Jun 2015 19:36:28 +0200 Subject: [PATCH 258/412] chromium: Drop plugin_paths patch for old versions. The patch was for versions prior to version 22, so we no longer need it. Signed-off-by: aszlig --- .../chromium/source/nix_plugin_paths.patch | 99 ------------------- 1 file changed, 99 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch deleted file mode 100644 index 0220d042941..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 8a205a6..d5c24e1 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -97,21 +97,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - } // namespace -@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(FILE_PATH_LITERAL("script.log")); - break; - case chrome::FILE_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) - return false; - cur = cur.Append(kInternalFlashPluginFileName); - break; -@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(chrome::kPepperFlashPluginFilename); - break; - case chrome::FILE_PDF_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PDF")) - return false; - cur = cur.Append(kInternalPDFPluginFileName); - break; - case chrome::FILE_EFFECTS_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) - return false; - cur = cur.Append(kEffectsPluginFileName); - break; -@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; From 03e4e3e92a25386ed559e3c4a70782c7f07fa355 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 11 Jun 2015 17:33:11 +0200 Subject: [PATCH 259/412] bosun: Update to 0.2.0 --- pkgs/servers/monitoring/bosun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 807ee702267..dfb2ffbb838 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150506172827"; + rev = "0.2.0"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; + sha256 = "146k37zg4l01l10vwhnhjs6jv8d35zf5l5rljmvy9ydq2npadsjd"; }; subPackages = [ "cmd/bosun" ]; From 85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8 Mon Sep 17 00:00:00 2001 From: John Chee Date: Thu, 11 Jun 2015 10:52:00 -0700 Subject: [PATCH 260/412] openconnect: update to version 7.06 and support openssl or gnutls --- pkgs/tools/networking/openconnect.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix index d53af5c9e40..54239b76617 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } : +{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } : + +let + xor = a: b: (a || b) && (!(a && b)); +in + +assert xor (openssl != null) (gnutls != null); stdenv.mkDerivation rec { - name = "openconnect-5.02"; + name = "openconnect-7.06"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" ]; - sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4"; + sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs"; }; preConfigure = '' @@ -22,5 +28,6 @@ stdenv.mkDerivation rec { "--without-openssl-version-check" ]; - propagatedBuildInputs = [ vpnc openssl libxml2 zlib ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 991928ae5db..a9d9848904d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3144,7 +3144,16 @@ let vpnc = callPackage ../tools/networking/vpnc { }; - openconnect = callPackage ../tools/networking/openconnect.nix { }; + openconnect = openconnect_openssl; + + openconnect_openssl = callPackage ../tools/networking/openconnect.nix { + gnutls = null; + }; + + openconnect_gnutls = lowPrio (openconnect.override { + openssl = null; + gnutls = gnutls; + }); vtun = callPackage ../tools/networking/vtun { }; From f3ca1cc2382acdeaa992ea599d34086b32605b92 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Thu, 11 Jun 2015 20:58:05 +0200 Subject: [PATCH 261/412] gyp: 2015-05-17 -> 2015-06-11 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c65fe86c382..58b2a9ee213 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5920,12 +5920,12 @@ let gyp = buildPythonPackage rec { name = "gyp-${version}"; - version = "2015-05-15"; + version = "2015-06-11"; src = pkgs.fetchgit { url = "https://chromium.googlesource.com/external/gyp.git"; - rev = "9f594095c5b14f8bc518081a660e77890c294861"; - sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5"; + rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043"; + sha256 = "176sdxkva2irr1v645nn4q6rwc6grbb1wxj82n7x9hh09q4bxqcz"; }; patches = optionals pkgs.stdenv.isDarwin [ From 39902b01bfb583621d4844f23a1ff7d069a7d763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 20:50:43 +0200 Subject: [PATCH 262/412] goffice: separate from gnome3 It's got practically no coupling with gnome, except for gtk3. --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/default.nix | 8 -------- .../3.16/misc => development/libraries}/goffice/0.8.nix | 4 ++-- .../misc => development/libraries}/goffice/default.nix | 0 .../libraries}/goffice/pcre_info.patch | 0 pkgs/top-level/all-packages.nix | 8 +++++++- 6 files changed, 11 insertions(+), 13 deletions(-) rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/0.8.nix (91%) rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/default.nix (100%) rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/pcre_info.patch (100%) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 02a78a2b2d1..e54dd591cfd 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, gnome3, makeWrapper, gtk3 +, goffice, gnome3, makeWrapper, gtk3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # ToDo: optional libgda, python, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser - gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme + goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 15f4a210e04..be60a58db26 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -273,14 +273,6 @@ rec { gfbgraph = callPackage ./misc/gfbgraph { }; - goffice = callPackage ./misc/goffice { }; - - goffice_0_8 = callPackage ./misc/goffice/0.8.nix { - inherit (pkgs.gnome2) libglade libgnomeui; - gconf = pkgs.gnome2.GConf; - libart = pkgs.gnome2.libart_lgpl; - }; - gitg = callPackage ./misc/gitg { webkitgtk = webkitgtk24x; }; diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix similarity index 91% rename from pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix rename to pkgs/development/libraries/goffice/0.8.nix index 02520a9f121..75a7dfb4898 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: +, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }: stdenv.mkDerivation rec { name = "goffice-0.8.17"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = gnome3.goffice.meta // { + meta = goffice.meta // { maintainers = [ ]; }; } diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix rename to pkgs/development/libraries/goffice/default.nix diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch similarity index 100% rename from pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch rename to pkgs/development/libraries/goffice/pcre_info.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 991928ae5db..bff25e186c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11260,7 +11260,13 @@ let goffice = goffice_0_8; }; - goffice_0_8 = gnome3.goffice_0_8; + goffice = callPackage ../development/libraries/goffice { }; + + goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix { + inherit (pkgs.gnome2) libglade libgnomeui; + gconf = pkgs.gnome2.GConf; + libart = pkgs.gnome2.libart_lgpl; + }; idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); From cfc753478e9e32714364d1c7463f5a59318c9755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 20:52:03 +0200 Subject: [PATCH 263/412] abiword: support goffice /cc maintainer @pSub. --- pkgs/applications/office/abiword/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 2aaf1e8f032..c17a4910f44 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt +, boost, libxslt, goffice }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt + libgsf enchant wv libjpeg perl boost libxslt goffice ]; meta = with stdenv.lib; { From 3a90a80a9dbd9d228ffd0c247bb365e52bc02f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 21:06:35 +0200 Subject: [PATCH 264/412] abiword: fix gschemas crash and missing icons The gtk3 file dialogs were crashing, as always without wrapping. /cc maintainer @pSub. --- pkgs/applications/office/abiword/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index c17a4910f44..18ece7a7401 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice +, boost, libxslt, goffice, makeWrapper, iconTheme }: stdenv.mkDerivation rec { @@ -16,9 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice + libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme ]; + postFixup = '' + wrapProgram "$out/bin/abiword" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; homepage = http://www.abisource.com/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff25e186c7..4a4e2182f33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10413,6 +10413,7 @@ let abiword = callPackage ../applications/office/abiword { inherit (gnome) libglade libgnomecanvas; + iconTheme = gnome3.defaultIconTheme; }; abook = callPackage ../applications/misc/abook { }; From e5b56cdfff989b2e1afce09fe0ab0a3f59946617 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 7 May 2015 14:28:36 +0300 Subject: [PATCH 265/412] firefox: add option to build with GTK3 (close #7743) --- pkgs/applications/networking/browsers/firefox/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 03b96acc712..727f89fe668 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu +, enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo gstreamer gst_plugins_base icu - ]; + ] + ++ lib.optional enableGTK3 gtk3; configureFlags = [ "--enable-application=browser" @@ -64,6 +66,7 @@ stdenv.mkDerivation rec { "--disable-updater" "--disable-pulseaudio" ] + ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a4e2182f33..c10bf661571 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11150,6 +11150,7 @@ let firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; + enableGTK3 = false; }; firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; From d15777fac98f26d5f7ab599a86bc418105ebcd4f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Jun 2015 21:28:16 +0200 Subject: [PATCH 266/412] gyp: Remove old SVN version to build Chromium. This reverts commit b26de392522176b9a176eb21bb5be4a5ac8d9062. We no longer need this version because Chromium now builds with the latest gyp version, see 58fd4f672f08a323f86a6a2eb57069be83893084. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58b2a9ee213..c625301926b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5941,28 +5941,6 @@ let }; }; - # Needed to build Chromium until #7402 is fixed. - gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec { - rev = "1977"; - name = "gyp-r${rev}"; - - src = pkgs.fetchsvn { - url = "http://gyp.googlecode.com/svn/trunk"; - inherit rev; - sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; - }; - - patches = optionals pkgs.stdenv.isDarwin [ - ../development/python-modules/gyp/no-darwin-cflags.patch - ]; - - meta = { - homepage = http://code.google.com/p/gyp; - license = licenses.bsd3; - description = "Generate Your Projects"; - }; - }); - guessit = buildPythonPackage rec { version = "0.9.4"; name = "guessit-${version}"; From 69945a8701457a9e58020aee5f2e281731ce0e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 21:34:32 +0200 Subject: [PATCH 267/412] ffmpeg: remove 0.11 and replace by 0.10 That branch is better supported, and 0.11 only had one user - minidlna still builds --- pkgs/development/libraries/ffmpeg/0.11.nix | 7 ------- pkgs/top-level/all-packages.nix | 13 ++++++------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/0.11.nix diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix deleted file mode 100644 index abdb2666877..00000000000 --- a/pkgs/development/libraries/ffmpeg/0.11.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.5"; - branch = "0.11"; - sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c10bf661571..3acdd30a0e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5995,12 +5995,11 @@ let fcgi = callPackage ../development/libraries/fcgi { }; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; - ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { }; ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; # Aliases - ffmpeg_0 = ffmpeg_0_11; + ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_6; ffmpeg = ffmpeg_2; @@ -6253,7 +6252,7 @@ let gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; @@ -7572,7 +7571,7 @@ let openscenegraph = callPackage ../development/libraries/openscenegraph { giflib = giflib_4_1; - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; openspades = callPackage ../games/openspades {}; @@ -10476,7 +10475,7 @@ let audacious = callPackage ../applications/audio/audacious { }; audacity = callPackage ../applications/audio/audacity { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; milkytracker = callPackage ../applications/audio/milkytracker { }; @@ -11107,7 +11106,7 @@ let blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python readline sqlite tcl tk libtiff freetype makeWrapper wxGTK; fftw = fftwSinglePrec; - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; motif = lesstif; opendwg = libdwg; wxPython = wxPython28; @@ -13473,7 +13472,7 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; lua = lua5; }; From cdc70b69f518ff2317cdb6b402c4a4d07437de71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Jun 2015 21:35:22 +0200 Subject: [PATCH 268/412] steam-original: Mark package as lowPrio. This is to avoid accidentally installing it via "nix-env -i", which leads to a non-working Steam on NixOS. Thanks to srhh and Pamelloes on IRC for bringing this up. Signed-off-by: aszlig --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acdd30a0e7..362af5d3e17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13418,7 +13418,7 @@ let stardust = callPackage ../games/stardust {}; - steam-original = callPackage ../games/steam { }; + steam-original = lowPrio (callPackage ../games/steam { }); steam = callPackage ../games/steam/chrootenv.nix { }; From 6a76633bb6e2fd49fbe264a55b39ce0a5166605f Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 11 Jun 2015 00:45:24 +0200 Subject: [PATCH 269/412] llvm-3.4: enable RTTI (close #8289) --- pkgs/development/compilers/llvm/3.4/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index d3beb2e7461..a44f157a13e 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_REQUIRES_RTTI=1" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; From 885808a8d910ea54a899e9b82042413e401ff638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 22:11:21 +0200 Subject: [PATCH 270/412] liferea: maintenance update --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 26078c8e583..28baa2f7b67 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.14"; + version = "1.10.15"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs"; + sha256 = "0iicw42rf0vhq4xs81awlj5v3v7xfid3h5fh87f3bqbpn9pmifdg"; }; buildInputs = with gst_all_1; [ From 95def7e4f03b19295060dcfd27a8c97c48baadd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2015 22:19:20 +0200 Subject: [PATCH 271/412] lib/maintainers: recommend to re-use github usernames --- lib/maintainers.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index df7a442ac52..1a0a3b832e3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -1,8 +1,11 @@ /* -*- coding: utf-8; -*- */ { - /* Add your name and email address here. Keep the list - alphabetically sorted. */ + /* Add your name and email address here. + Keep the list alphabetically sorted. + Prefer the same attrname as your github username, please, + so it's easy to ping a package @maintainer. + */ abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; From f12a466730c835633354d486f6bc9fbf311359ed Mon Sep 17 00:00:00 2001 From: Adrien Devresse Date: Mon, 1 Jun 2015 10:05:53 +0200 Subject: [PATCH 272/412] New expression for the davix toolkit --- lib/maintainers.nix | 1 + pkgs/tools/networking/davix/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/davix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index df7a442ac52..62e7a33db8b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -6,6 +6,7 @@ abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; + adev = "Adrien Devresse "; aforemny = "Alexander Foremny "; aflatter = "Alexander Flatter "; aherrmann = "Andreas Herrmann "; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix new file mode 100644 index 00000000000..748e28407b2 --- /dev/null +++ b/pkgs/tools/networking/davix/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }: + +stdenv.mkDerivation rec { + name = "davix-0.4.0"; + buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; + + src = fetchFromGitHub { + owner = "cern-it-sdc-id"; + repo = "davix"; + rev = "R_0_4_0-1"; + sha256 = "0i6ica7rmpc3hbybjql5mr500cd43w4qzc69cj1djkc6bqqb752v"; + }; + + + meta = with stdenv.lib; { + description = "Toolkit for Http-based file management"; + + longDescription = "Davix is a toolkit designed for file + operations with Http based protocols (WebDav, Amazon S3, ...). + Davix provides an API and a set of command line tools"; + + license = licenses.lgpl2Plus; + homepage = http://dmc.web.cern.ch/projects/davix/home; + maintainers = [ maintainers.adev ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf9fed11ae..f91bc9a71eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -988,6 +988,8 @@ let cadaver = callPackage ../tools/networking/cadaver { }; + davix = callPackage ../tools/networking/davix { }; + cantata = callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; From 838c8f252023f19b05d25f7ab4376d9023d89a6a Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Thu, 11 Jun 2015 23:42:14 +0200 Subject: [PATCH 273/412] wavpack: 4.70.0 -> 4.75.0 --- pkgs/development/libraries/wavpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 08465861f27..b205519eea1 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "wavpack-${version}"; - version = "4.70.0"; + version = "4.75.0"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; - sha256 = "191h8hv8qk72hfh1crg429i9yq3cminwqb249sy9zadbn1wy7b9c"; + sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; }; meta = with stdenv.lib; { From 4e49773d266bdb6fb60030c9f2d46c85402a673d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 02:01:48 +0300 Subject: [PATCH 274/412] sdl-jstest: add package --- pkgs/tools/misc/sdl-jstest/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/sdl-jstest/default.nix diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix new file mode 100644 index 00000000000..3da62874c13 --- /dev/null +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -0,0 +1,21 @@ +{ fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }: + +stdenv.mkDerivation rec { + name = "sdl-jstest-20150611"; + src = fetchgit { + url = "https://github.com/Grumbel/sdl-jstest"; + rev = "684d168e5526da16760dcfc6d40da0103ab284cc"; + sha256 = "fc110a858edc2defc5cd8b176a5ce74666d3957d0268b861d0f9669362a1bd03"; + }; + + buildInputs = [ SDL SDL2 ncurses ]; + nativeBuildInputs = [ cmake pkgconfig docbook_xsl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Grumbel/sdl-jstest; + description = "Simple SDL joystick test application for the console"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43f679bc55a..2f5df67d078 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2815,6 +2815,8 @@ let sdcv = callPackage ../applications/misc/sdcv { }; + sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; From 9a517da2b19f9c1165fcee7665d80fdcac1f00f7 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 10 Jun 2015 21:20:40 -0400 Subject: [PATCH 275/412] Add dfilemanager/dfm --- .../misc/dfilemanager/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/dfilemanager/default.nix diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix new file mode 100644 index 00000000000..40bb2e8fe56 --- /dev/null +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, qt5, file, kde5}: + +let + version = "git-2015-06-10"; +in +stdenv.mkDerivation rec { + name = "dfilemanager-${version}"; + src = fetchgit { + url = "git://git.code.sf.net/p/dfilemanager/code"; + rev = "806a28aa8fed30941a2fd6784c7c9c240bca30e3"; + sha256 = "1k15qzjmqg9ffv4cl809b071dpyckf8jspkhfhpbmfd9wasr0m7i"; + }; + + buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid]; + + cmakeFlags = "-DQT5BUILD=true"; + + meta = { + homepage = "http://dfilemanager.sourceforge.net/"; + description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling"; + #license = stdenv.lib.licenses; # license not specified + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.eduarrrd ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43fb9c7896..6566e899446 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -800,6 +800,8 @@ let ddate = callPackage ../tools/misc/ddate { }; + dfilemanager = callPackage ../applications/misc/dfilemanager { }; + diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellngPackages) ghcWithPackages diagrams-builder; }; From cd28c5517c224c0c969f6bccb1f85dcc280ed7f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 01:37:45 +0200 Subject: [PATCH 276/412] Revert "Drop tests.installer.grub1 as release critical" This reverts commit 1907ca8a2aaa51d3e6910bb086dd75efffa81a6b. See https://github.com/NixOS/nixpkgs/commit/1907ca8a2aaa51d3e6910bb086dd75efffa81a6b#commitcomment-9719007 --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ddedcd9fe97..191d5044341 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,6 +52,7 @@ 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.luksroot) (all nixos.tests.installer.separateBoot) From bc3217251e4fb8dd9d648b41d963d8804a0d8f67 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 11 Jun 2015 19:23:25 -0500 Subject: [PATCH 277/412] pythonPackages.scikitlearn: build with openblas --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80931ecfe1f..c05aff22a5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11298,15 +11298,14 @@ let }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ]; + propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; buildPhase = '' - export ATLAS=${pkgs.atlas} ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' ''; checkPhase = '' - LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests + LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ''; meta = { From ffcd8acee643994dd1de65fa567e1213006e8ab7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 11 Jun 2015 13:44:57 -0700 Subject: [PATCH 278/412] nixos/pulseaudio: Fix description --- nixos/modules/config/pulseaudio.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index bd010738500..2ebc6126055 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -81,7 +81,10 @@ in { support32Bit = mkOption { type = types.bool; default = false; - description = "no"; + description = '' + Whether to include the 32-bit pulseaudio libraries in the systemn or not. + This is only useful on 64-bit systems and currently limited to x86_64-linux. + ''; }; configFile = mkOption { From 776608a332656d970fcdebb9103f3f8be2a30dac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2015 13:02:16 +0200 Subject: [PATCH 279/412] aha: remove default GitHub downloadPage --- pkgs/tools/text/aha/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index a0be19607ea..4ae8048623c 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; homepage = https://github.com/theZiz/aha; - downloadPage = https://github.com/theZiz/aha/releases; license = with licenses; [ lgpl2Plus mpl11 ]; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; From 21569371662a891b0837257508a3cf1c7cc1dd66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Jun 2015 00:17:11 +0200 Subject: [PATCH 280/412] include-what-you-use 3.6 -> 0.4 (sic) Not a downgrade. Upstream's weird. --- .../analysis/include-what-you-use/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 9a8df0f4690..36164bffebf 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, cmake, llvmPackages_35 }: +{ stdenv, fetchurl, cmake, llvmPackages_36 }: -let version = "3.5"; in with llvmPackages_35; -stdenv.mkDerivation rec { +let + version = "0.4"; + llvmPackages = llvmPackages_36; +in stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; src = fetchurl { - sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w"; + sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; @@ -19,14 +21,16 @@ stdenv.mkDerivation rec { actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; - homepage = http://include-what-you-use.com; + homepage = http://include-what-you-use.org; license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ clang cmake llvm ]; + buildInputs = with llvmPackages; [ clang llvm ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}"; - cmakeFlags = [ "-DLLVM_PATH=${llvm}" ]; enableParallelBuilding = true; } From 29db05132b5e0921e3fae35d62c30634e85a271f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 11 Jun 2015 19:35:35 -0500 Subject: [PATCH 281/412] pythonPackages.cvxopt: build with openblas --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c05aff22a5d..cb649a2ec97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1011,7 +1011,12 @@ let sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; }; doCheck = false; - buildInputs = with pkgs; [ liblapack blas ]; + buildInputs = with pkgs; [ openblasCompat ]; + preConfigure = '' + export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + ''; meta = { homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; From 6cc817cf516159efa48f5322bfb1bf258ae01501 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 03:22:50 +0300 Subject: [PATCH 282/412] mueval: add patch until release is pushed to Hackage --- .../haskell-modules/configuration-common.nix | 2 +- .../configuration-ghc-7.10.x.nix | 5 -- .../haskell-modules/mueval-fix.patch | 90 +++++++++++++++++++ 3 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/haskell-modules/mueval-fix.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7835ed7d96f..e1f45351a78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -760,7 +760,7 @@ self: super: { dyre = appendPatch super.dyre ./dyre-nix.patch; # https://github.com/gwern/mueval/issues/9 - mueval = markBrokenVersion "0.9.1.1" super.mueval; + mueval = appendPatch super.mueval ./mueval-fix.patch; # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 335b133f555..28c74f61925 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -116,11 +116,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # Until the changes have been pushed to Hackage - mueval = appendPatch super.mueval (pkgs.fetchpatch { - url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch"; - sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg"; - }); present = appendPatch super.present (pkgs.fetchpatch { url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch"; sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8"; diff --git a/pkgs/development/haskell-modules/mueval-fix.patch b/pkgs/development/haskell-modules/mueval-fix.patch new file mode 100644 index 00000000000..62a8f8f61e2 --- /dev/null +++ b/pkgs/development/haskell-modules/mueval-fix.patch @@ -0,0 +1,90 @@ +diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs +index 05c8fd9..0c32e27 100644 +--- a/Mueval/ArgsParse.hs ++++ b/Mueval/ArgsParse.hs +@@ -1,10 +1,9 @@ ++{-# LANGUAGE CPP #-} + module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where + + import Control.Monad (liftM) + import System.Console.GetOpt + +-import qualified Codec.Binary.UTF8.String as Codec (decodeString) +- + import Mueval.Context (defaultModules, defaultPackages) + + -- | See the results of --help for information on what each option means. +@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..." + -- | Just give us the end result options; this parsing for + -- us. Bonus points for handling UTF. + getOptions :: [String] -> Either (Bool, String) Options +-getOptions = interpreterOpts . map Codec.decodeString +\ No newline at end of file ++getOptions = interpreterOpts . map decodeString ++ ++decodeString :: String -> String ++#if __GLASGOW_HASKELL__ >= 702 ++decodeString = id ++#else ++decodeString = Codec.decodeString ++#endif +diff --git a/Mueval/Context.hs b/Mueval/Context.hs +index 78925cf..548514c 100644 +--- a/Mueval/Context.hs ++++ b/Mueval/Context.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module Mueval.Context ( + cleanModules, + defaultModules, +@@ -32,7 +33,9 @@ defaultModules = ["Prelude", + "Control.Monad.Error", + "Control.Monad.Fix", + "Control.Monad.Identity", ++#if !MIN_VERSION_base(4,7,0) + "Control.Monad.Instances", ++#endif + "Control.Monad.RWS", + "Control.Monad.Reader", + "Control.Monad.State", +diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs +index 29b771f..6c39482 100644 +--- a/Mueval/Interpreter.hs ++++ b/Mueval/Interpreter.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE PatternGuards #-} ++{-# LANGUAGE FlexibleContexts #-} + -- TODO: suggest the convenience functions be put into Hint proper? + module Mueval.Interpreter where + +@@ -12,8 +13,6 @@ import System.Exit (exitFailure) + import System.FilePath.Posix (takeFileName) + import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..)) + +-import qualified System.IO.UTF8 as UTF (putStrLn) +- + import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO, + installedModulesInScope, languageExtensions, + typeOf, setTopLevelModules, runInterpreter, glasgowExtensions, +@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl + -- flooding. Lambdabot has a similar limit. + sayIO :: String -> IO () + sayIO str = do (out,b) <- render 1024 str +- UTF.putStrLn out ++ putStrLn out + when b exitFailure + + -- | Oh no, something has gone wrong. If it's a compilation error pretty print +diff --git a/mueval.cabal b/mueval.cabal +index 3f9406d..b86d796 100644 +--- a/mueval.cabal ++++ b/mueval.cabal +@@ -32,7 +32,7 @@ library + exposed-modules: Mueval.Parallel, Mueval.Context, Mueval.Interpreter, + Mueval.ArgsParse, Mueval.Resources + build-depends: base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process, +- hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect ++ hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect + ghc-options: -Wall -static + + executable mueval-core From bb6e504d6b75b9e21beed9a55037ac2ff9a9427c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 03:30:47 +0300 Subject: [PATCH 283/412] thermald: update and adopt --- pkgs/tools/system/thermald/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 86d121f0c22..85bc40caa27 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.4.2"; name = "thermald-${version}"; - src = fetchurl { - url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip"; - sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc"; + src = fetchFromGitHub { + owner = "01org"; + repo = "thermal_daemon"; + rev = "v${version}"; + sha256 = "051119wb0n31rn15pnx56d1r58a2d1fmj030q991mcv7pcy6c8mg"; }; - buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + + buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; @@ -25,12 +28,11 @@ stdenv.mkDerivation rec { preInstall = "sysconfdir=$out/etc"; - meta = { + meta = with stdenv.lib; { description = "Thermal Daemon"; - longDescription = '' - Thermal Daemon - ''; homepage = https://01.org/linux-thermal-daemon; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } From 9bb5e7edbdbe4631a4129f3fc0da2d52c30cd9bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 03:39:48 +0300 Subject: [PATCH 284/412] generate-cran-packages: make executable --- pkgs/development/r-modules/generate-cran-packages.R | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 pkgs/development/r-modules/generate-cran-packages.R diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-cran-packages.R old mode 100644 new mode 100755 index 3510a2fa92c..ad6c103513f --- a/pkgs/development/r-modules/generate-cran-packages.R +++ b/pkgs/development/r-modules/generate-cran-packages.R @@ -1,3 +1,5 @@ +#!/usr/bin/env Rscript + library(data.table) library(parallel) cl <- makeCluster(10) From 29779ae6425e2e6d5f4cbe0671243b6b85e853b4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 03:41:13 +0300 Subject: [PATCH 285/412] R: regenerate CRAN packages --- pkgs/development/r-modules/cran-packages.nix | 1035 ++++++++++-------- 1 file changed, 583 insertions(+), 452 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 79770b6a620..77c075397e1 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -17,9 +17,9 @@ ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rap ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[dplyr cluster fields knitr]; }; -AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; depends=[car lmtest sandwich survival zoo Formula]; }; +AER = derive { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car lmtest sandwich survival zoo Formula]; }; AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; }; -AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; }; +AGD = derive { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; }; AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; }; AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; }; AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS tseries nortest]; }; @@ -34,11 +34,13 @@ AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy4 AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[snowfall rlecuyer spdep]; }; AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; }; +APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate stringr plyr sirad]; }; APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; }; +ARTIVA = derive { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[MASS igraph gplots]; }; ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; -ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; }; +ARTool = derive { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[lme4 car plyr pbkrtest]; }; ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[qtl gtools fields lattice]; }; ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; }; ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; @@ -68,13 +70,14 @@ AnglerCreelSurveySimulation = derive { name="AnglerCreelSurveySimulation"; versi AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; }; AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; }; -Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07jl05nv7136jwhfndn01vim2kx9s76mk4alvsw7s8ls"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; }; -ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1"; sha256="0wdf9438c5rww0fm5k44ahvivg95vzn3dpnhf4mhpvrjd1am546z"; depends=[foreach doParallel]; }; +Anthropometry = derive { name="Anthropometry"; version="1.2"; sha256="15689jy85kf8j9w8yhffjfjw3lsdlv2w99za32p33shp32f3rvjz"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; }; +ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[foreach doParallel]; }; AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; }; ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; }; ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; }; +ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; }; ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; }; AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; }; AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; @@ -83,7 +86,7 @@ AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58 AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AutoSEARCH = derive { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[zoo lgarch]; }; B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; }; -BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j3d3ikn13a1j3g2xvfy275qdmmm4"; depends=[ggplot2 rJava]; }; +BACA = derive { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 rJava]; }; BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; }; BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; }; BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; @@ -113,7 +116,7 @@ BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qs BGLR = derive { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; }; BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; }; BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; -BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; depends=[]; }; +BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; }; BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; }; BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; }; BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[Rcpp miceadds mitools TAM Rcpp RcppArmadillo]; }; @@ -127,11 +130,11 @@ BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0day BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; }; BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[mvtnorm MASS]; }; -BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; -BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; }; +BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; }; +BNSP = derive { name="BNSP"; version="1.0.3"; sha256="1q7nxl1lx57dzb5yfpb0966ylyl15x22y9r78r6pxrprrbsnv931"; depends=[]; }; BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; }; BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; }; -BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; }; +BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; }; BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS pscl plyr]; }; BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; }; @@ -156,7 +159,7 @@ BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324h BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda Matrix pbapply mvtnorm stringr gtools MatrixModels Rcpp Rcpp RcppEigen]; }; -BayesGESM = derive { name="BayesGESM"; version="1.3"; sha256="0lw593hqava5bhr8nfbh3qw63ilfr06zh58p2rw3nnv1ldrrzncv"; depends=[truncdist GIGrvg normalp Formula]; }; +BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[GIGrvg normalp Formula]; }; BayesLCA = derive { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[e1071 coda fields nlme MCMCpack]; }; BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; }; BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; }; @@ -191,6 +194,7 @@ BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; }; Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; }; +BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[Formula expm numDeriv]; }; BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; }; BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; }; BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; }; @@ -213,7 +217,7 @@ BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nk BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; }; BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[lme4 brglm gtools]; }; -BrailleR = derive { name="BrailleR"; version="0.18-1"; sha256="0v5y5v6b52kh4146bbhwpsnb5p435dk5nhv28sxi7r89fixbc20q"; depends=[nortest xtable moments knitr gridGraphics gridSVG]; }; +BrailleR = derive { name="BrailleR"; version="0.20"; sha256="1cfg5jfhal77n1pmwcj0awhnprqw6bha7q7z3s2m3q4g1ar49shv"; depends=[knitr gridGraphics gridSVG moments nortest rmarkdown xtable]; }; Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; }; BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; @@ -235,14 +239,14 @@ CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1 CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; }; CBPS = derive { name="CBPS"; version="0.9"; sha256="08pc50fndpx6xvxkvqdklrp6v98w2j387frq08nlglcbfjk22i6x"; depends=[MASS MatchIt nnet numDeriv]; }; CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; -CCAGFA = derive { name="CCAGFA"; version="1.0.4"; sha256="159gh0mx4da1gpqf5swyhg8ksclpi59p4zmzsiq5ywfpy5cjr71z"; depends=[]; }; +CCAGFA = derive { name="CCAGFA"; version="1.0.6"; sha256="19il9i7ybjg2qchmpjwkyx48l4fl7lb1zdkfpiaw3fng6ndasp1k"; depends=[]; }; CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; }; CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[R2jags rjags psych mvtnorm polycor MASS]; }; CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; -CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; }; +CDM = derive { name="CDM"; version="4.3-0"; sha256="0xryd4l0fqa2m39zcgd6jyi6shlqxc98qgwdpg38csqmbpny4bvm"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr lattice Rcpp RcppArmadillo]; }; CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; @@ -252,7 +256,7 @@ CFC = derive { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58z CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; }; CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; -CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; }; +CHNOSZ = derive { name="CHNOSZ"; version="1.0.5"; sha256="19kh4fnf6myn072hrjcibw7bhm4qbjp039vdqjq1qx3bmz28an1k"; depends=[]; }; CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; }; CIDnetworks = derive { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm MASS Rcpp]; }; CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; }; @@ -265,6 +269,7 @@ CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphj CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; }; CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; +CMplot = derive { name="CMplot"; version="1.0.1"; sha256="04pkpv0sl0aijp6b4sgn27bq54cn95zazikjlx5pwiyc8p0bzz86"; depends=[]; }; CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mixdist mclust survival]; }; CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; @@ -275,7 +280,7 @@ COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7ph COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; }; COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; }; CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; -CORElearn = derive { name="CORElearn"; version="0.9.45"; sha256="0j2lhzikh96ky4n52x0rwhknx5zdk9h78x9ygzfpr6p9x80w850f"; depends=[cluster rpart]; }; +CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; }; CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; }; COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; }; COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; }; @@ -288,7 +293,6 @@ CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rv CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; }; CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; CRTSize = derive { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; -CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; }; CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; }; CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; }; @@ -298,8 +302,9 @@ CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fn CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; }; Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; }; CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; }; -CatDyn = derive { name="CatDyn"; version="1.0-6"; sha256="07n7qwpq8b70i2f48npy0pd87w0fj5xzjg00xw53m2idikqf82pn"; depends=[optimx BB]; }; +CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[optimx BB]; }; CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; +CausalFX = derive { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; }; Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; }; CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; @@ -316,6 +321,7 @@ ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CircE = derive { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; }; +CircOutlier = derive { name="CircOutlier"; version="3.1.3"; sha256="103d5fbwzbj9ribl2vzrj1lxv0n3hcygjrf5k4kqm0kfnql91k2s"; depends=[CircStats circular]; }; CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; }; CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; }; @@ -323,12 +329,14 @@ Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; }; ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; }; ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; }; +ClustMMDD = derive { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp Rcpp]; }; ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; -ClustVarLV = derive { name="ClustVarLV"; version="1.3.2"; sha256="0lnrpvfkhsmjjaimxqjrvwv4wrh6mxl6ifr9dj1kfkmnparyp6fp"; depends=[Rcpp Rcpp]; }; +ClustVarLV = derive { name="ClustVarLV"; version="1.4.0"; sha256="1dm4vyfq4mf9y2ha32fhirqyss4yjk5zxrb9i3fx4i8kbaw6160z"; depends=[Rcpp Rcpp]; }; CoClust = derive { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; }; CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; }; CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; }; +ColorPalette = derive { name="ColorPalette"; version="1.0-0"; sha256="0mh1fjcl80fc5prrypl42aqj1svzs6600n250a5sah276bd0zzk9"; depends=[]; }; CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; }; CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; }; CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; }; @@ -355,7 +363,7 @@ Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz CopulaREMADA = derive { name="CopulaREMADA"; version="0.5-1"; sha256="1lrqx07986f7cv0ws1dd9p0dza0qkc67p8mp7rdq58b9f1h7yk2r"; depends=[statmod]; }; CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; -CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; }; +CorReg = derive { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; }; CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; }; CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; }; Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; @@ -377,6 +385,7 @@ DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; }; DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; }; +DAISIE = derive { name="DAISIE"; version="1.0.1"; sha256="1dhfkjgksxy39siz5mf97sw2gyb0jvy44ndy0asdmplwhmqrc4md"; depends=[deSolve]; }; DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; }; DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; }; DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[geiger caper ape deSolve matrixStats expm picante]; }; @@ -403,12 +412,12 @@ DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9l DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; }; DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; -DLMtool = derive { name="DLMtool"; version="1.34"; sha256="0ir1131r408ya235k7syg854bfgsim39hh2k1498n5hrbaa99xfx"; depends=[snowfall boot MASS]; }; +DLMtool = derive { name="DLMtool"; version="1.35"; sha256="1qcc5q35a68m468ip1mhij2g0qzz5fhcjzax11a8n2fl9x2s9d57"; depends=[snowfall boot MASS]; }; DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; }; DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; }; DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; }; -DNMF = derive { name="DNMF"; version="1.0"; sha256="0s484hzzvvkqdh4s5cb6znz26wx07f9k7y940ghx3dkdc7rb0hrx"; depends=[]; }; +DNMF = derive { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[foreach Matrix gplots doParallel]; }; DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; }; DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; @@ -418,6 +427,8 @@ DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbs DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; }; DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[shapefiles splancs mrds mgcv]; }; DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; }; +DSviaDRM = derive { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; +DT = derive { name="DT"; version="0.1"; sha256="0mj7iiy1gglw7kixybmb7kr1bcl5r006zcb3klkw7p6vvvzdm6qj"; depends=[htmltools htmlwidgets magrittr]; }; DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; @@ -426,6 +437,7 @@ DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmw DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; }; Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; +Dark = derive { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; }; DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; DataCombine = derive { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; }; Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; }; @@ -441,14 +453,14 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; }; -Deriv = derive { name="Deriv"; version="3.4"; sha256="03fawwlcc3lxp7y3labbhvhpzcp9yfxhbwq7bq8av1fvq92l4xi6"; depends=[]; }; -DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; }; +Deriv = derive { name="Deriv"; version="3.5.4"; sha256="07a3pm79mv8wiapjdb2n6scgl3hc7pvz9inalm80aqlhpqrvp3hs"; depends=[]; }; +DescTools = derive { name="DescTools"; version="0.99.11"; sha256="0ccqgx6w7x55h5pd76hjyq79g0cdyw2m0w1h55kw4chqj0ibqizy"; depends=[manipulate boot mvtnorm foreign]; }; DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; }; DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; -DiagrammeR = derive { name="DiagrammeR"; version="0.6"; sha256="021i1nvw5airli3392rwz9vq1zxwm2pdlw1y6wqw4968g8yc0k9f"; depends=[htmlwidgets rstudioapi]; }; +DiagrammeR = derive { name="DiagrammeR"; version="0.7"; sha256="0cfxhxs4b5kknp1xsq2gg0dnyyv9vrj3bfswlvc5np7pkxankr2r"; depends=[htmlwidgets rstudioapi stringr]; }; DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; DiceKriging = derive { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; }; @@ -480,6 +492,7 @@ DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihr DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[ggplot2 stargazer shiny compare]; }; +DynTxRegime = derive { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; }; DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; }; EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; }; @@ -519,9 +532,9 @@ ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500b ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp Rcpp]; }; ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; }; ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; -ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; }; +ETLUtils = derive { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[ff bit]; }; EW = derive { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; -EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; }; +EWGoF = derive { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp Rcpp]; }; EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; }; EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; }; EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; }; @@ -529,11 +542,12 @@ EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8i EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; }; Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; }; -EcoGenetics = derive { name="EcoGenetics"; version="1.1.0"; sha256="1a7dsjvkxaa37nfha07fgfas9zygsj9hrsllgf4b67rkqihrzz87"; depends=[adegenet ggplot2 gstudio hierfstat party raster rgdal rkt sp vegan]; }; +EcoGenetics = derive { name="EcoGenetics"; version="1.2.0"; sha256="090vcbl8gl23335rga1126w6jqvql62kk9wxlfpjz4q11czgdclq"; depends=[adegenet ggplot2 hierfstat party raster rgdal rkt SoDA sp vegan]; }; EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; }; EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; +EditImputeCont = derive { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[Rcpp editrules Rcpp]; }; EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[lavaan shiny foreign ggplot2 nnet survey lavaan_survey car]; }; EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; }; EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; }; @@ -548,15 +562,15 @@ EnsembleCV = derive { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; }; EnsemblePenReg = derive { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; }; EntropyEstimation = derive { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; }; -EntropyExplorer = derive { name="EntropyExplorer"; version="1.0"; sha256="0daj7g209nk8lsalk51kf8kkr6lbnnlzf7xd2mmv1axm7y5rppl2"; depends=[]; }; +EntropyExplorer = derive { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; }; EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; -EnvStats = derive { name="EnvStats"; version="2.0.0"; sha256="1yjm1lm9hsq5gw6j8wqxxgc72p7c6prr5fx8vk9v6bb2hgf2bm8i"; depends=[MASS]; }; -EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; }; +EnvStats = derive { name="EnvStats"; version="2.0.1"; sha256="1z909p56dlhr00a5ir55sn5ny51h1wwi85as6arv3cn8c0zqyi74"; depends=[MASS]; }; +EnviroStat = derive { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; }; EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; }; EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; }; EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; -EpiModel = derive { name="EpiModel"; version="1.1.4"; sha256="0gyj80xmhwa3a7k12m3lla9rkpfv1n307vjf8lka1bd1rvwipg2c"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; }; +EpiModel = derive { name="EpiModel"; version="1.1.6"; sha256="0h3bbvk9qyhc0jml2jd21dahi1v00alar67jkzpwnavvmcgd8a3s"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; }; Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; }; EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; @@ -565,19 +579,20 @@ EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; }; EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; -Exact = derive { name="Exact"; version="1.5"; sha256="14469wfm5g28ajlpcrqkmvhbqps8wvrh5lsi0rcrwbwybfv435vn"; depends=[]; }; +Exact = derive { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; }; ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; }; ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; }; -ExomeDepth = derive { name="ExomeDepth"; version="1.1.4"; sha256="0a4y6y1zi1jn1g14f3wsl2pfbmp58afwkvrk7x7s1wp16vwgq0xb"; depends=[aod VGAM]; }; +ExomeDepth = derive { name="ExomeDepth"; version="1.1.5"; sha256="11ff89c080855wmvglapif7h3wmk6zrgfqcb0kshy4jglpwkz52x"; depends=[aod VGAM]; }; ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; +ExtDist = derive { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; }; ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; }; FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; }; FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; }; FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; }; FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; }; -FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbdrd6ijy6n32a9xd26z2ix839qgywvqj"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; }; +FAOSTAT = derive { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; }; FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; }; FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; }; FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; }; @@ -594,7 +609,7 @@ FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dw FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; -FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; }; +FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv survival perm MASS]; }; FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; }; FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; }; @@ -612,9 +627,10 @@ FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; }; FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Rcpp stringr miscTools Hmisc pROC Rcpp RcppArmadillo]; }; +FSInteract = derive { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Rcpp Matrix Rcpp]; }; FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[randomForest RWeka digest entropy]; }; FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; }; -FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; }; +FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56xy3kwhwbgcn1yx4afhlpydnavp3aclrqrg"; depends=[cvTools mgcv]; }; FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; }; FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; }; @@ -622,14 +638,14 @@ FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1m Factoshiny = derive { name="Factoshiny"; version="1.0"; sha256="0r8xnnmf2c0nhddgzwsfb86ajpirkr1788phhcjdap1w9k67nsy9"; depends=[FactoMineR shiny]; }; Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; }; Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; }; -FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; }; +FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats robustbase Rcpp RcppEigen]; }; FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; }; FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; }; FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; -FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; }; +FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; }; FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; }; FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[sp rgdal raster RCurl rgeos igraph data_table devtools soilDB]; }; FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; }; @@ -681,7 +697,7 @@ GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gac GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; GAR = derive { name="GAR"; version="1.0"; sha256="1278rdln23pl5ay87nb6w15ywdh6ls8hx8k0nb48ab4ysjqf6r04"; depends=[httr jsonlite]; }; GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; }; -GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; }; +GB2 = derive { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; }; GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; }; @@ -696,7 +712,7 @@ GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbf GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; }; GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; }; GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; }; -GGIR = derive { name="GGIR"; version="1.1-4"; sha256="1z1dwnx8lpj3xk7fdfm6sidbxpfgxjw9righ1kdnjw9g1nnkp29x"; depends=[]; }; +GGIR = derive { name="GGIR"; version="1.1-5"; sha256="0lanza1i7bqa0z745hbxkkyjhf6jy578jjva6nbisbbfsrbf7ydj"; depends=[]; }; GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[mvtnorm lars gtools]; }; GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; }; GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; @@ -727,12 +743,12 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; }; GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; }; -GSIF = derive { name="GSIF"; version="0.4-5"; sha256="041w4jvg7cwf90l03wl0jff24vf3lkzm3xqvl15117piix82lsf4"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; }; +GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; }; GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; }; GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; }; GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[Rcpp pracma subplex Rcpp]; }; GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; }; -GUTS = derive { name="GUTS"; version="0.9.1"; sha256="1rxgvhpy8ss2a5vaidv1ay3rvq3msv7hv3rcyykmdxj34nvz19bb"; depends=[Rcpp Rcpp BH]; }; +GUTS = derive { name="GUTS"; version="0.9.3"; sha256="0gyi5vlr1r35qn3gj788lh9xrb7dz03r57hxk11x8w72kv415pih"; depends=[Rcpp Rcpp]; }; GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; }; GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; }; GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; @@ -786,7 +802,7 @@ GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9 GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; }; Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[Rcpp minqa nlme]; }; -HAC = derive { name="HAC"; version="1.0-2"; sha256="0f4him7qpam4s0xxm49xqx0g3nrj87rszm52l376xi63z7r02wbv"; depends=[copula]; }; +HAC = derive { name="HAC"; version="1.0-3"; sha256="084i123fj5vnhn08fa1qzbk93khsi3r60s52d6pqkqvzbxc572jr"; depends=[copula numDeriv]; }; HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; }; HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; }; @@ -826,13 +842,13 @@ HWxtest = derive { name="HWxtest"; version="1.0.5"; sha256="01pvi87g5sfglbdv38ik HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; }; Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; }; -HapEstXXR = derive { name="HapEstXXR"; version="0.1-7"; sha256="1jarb0465yymb08r8dr0mn6qlwbf0y0c4ipvxvcfwlvqalbp2kd6"; depends=[survival]; }; -Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; }; +HapEstXXR = derive { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; }; +Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[GenABEL DatABEL mgcv MASS SuppDists snow]; }; HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; }; HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; -HelpersMG = derive { name="HelpersMG"; version="1.0"; sha256="11bjzkbdrysnryxriqk3wj8npk42i8rpc5b0c07q1zvk39png3lk"; depends=[coda]; }; -HiClimR = derive { name="HiClimR"; version="1.2.0"; sha256="10ick0311nc4zcqswlk3lhi9k5bv96nicqxqcq706cmlfk0qd0c7"; depends=[]; }; +HelpersMG = derive { name="HelpersMG"; version="1.1"; sha256="0pk8bcad9dnza803cq1428qlgb74vzq0vzx2q6f2j2hwmfpn13dx"; depends=[coda]; }; +HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; }; HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; }; HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; }; @@ -856,6 +872,7 @@ HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650 HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; }; IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; }; +IATscores = derive { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[stringr dplyr reshape2 qgraph]; }; IBDLabels = derive { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; }; IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; }; @@ -873,7 +890,7 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; }; IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; -IFP = derive { name="IFP"; version="0.1.2"; sha256="1sgjyxjfw3i1k02wy2lc7w9gnrs5g4wnp8kd78ks77f9j0sah2j8"; depends=[haplo_stats coda]; }; +IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[haplo_stats coda]; }; IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; }; IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[sp Matrix spdep]; }; @@ -887,10 +904,10 @@ ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdg ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; }; ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; }; ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; -ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; }; +ISwR = derive { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; }; IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; }; Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; -IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; }; +IgorR = derive { name="IgorR"; version="0.8"; sha256="1khm7mbs497ybaw428ziwlxxygg1vcn5kx77w2cwm4mg8w95f4na"; depends=[bitops]; }; Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; }; @@ -904,18 +921,18 @@ InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; }; Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; }; -InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-2"; sha256="09s6jwcb6wyi6p1nqxvyfvv4140fq6svfv7w681nk8g57xlgc1h1"; depends=[glmnet mboost jointDiag]; }; +InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-3"; sha256="00sxfgnzqikp92haqnqi4asq904dcsqqnxmz23lx7508qbfx3vhn"; depends=[glmnet mboost]; }; InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; }; IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; }; -Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; }; +Iso = derive { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; }; IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; }; IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; }; JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; }; JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[Rcpp plyr lme4 doParallel Rcpp]; }; JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; -JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; }; +JBTools = derive { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[foreach gplots colorspace plotrix]; }; JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; }; JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; }; @@ -956,7 +973,7 @@ LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6g LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; LDAvis = derive { name="LDAvis"; version="0.2"; sha256="18fbnk5qd7icn3mgwwb3ld3c9n3j1z4ydc2pg2zizkrahhqxdswi"; depends=[proxy RJSONIO]; }; LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; }; -LDPD = derive { name="LDPD"; version="1.0.2"; sha256="0bs3s6x6f9rpp53x8ird6qnz9rfayf64askrr04hdjhlgw7cs0n7"; depends=[MASS nleqslv]; }; +LDPD = derive { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; }; LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; }; LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; }; @@ -985,13 +1002,13 @@ LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlq LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; }; LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; }; LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; }; -LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; }; +LTPDvar = derive { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; }; LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; }; LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp Rcpp]; }; Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; }; -LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.1"; sha256="1k764w8f30jfz1xkq9xjm9rwfdll5kp7jv3zc4932ck8cgqam3jv"; depends=[rLakeAnalyzer plyr]; }; +LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[rLakeAnalyzer plyr]; }; Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[moments MASS gsl]; }; Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; @@ -1017,11 +1034,11 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; }; LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; -Luminescence = derive { name="Luminescence"; version="0.4.3"; sha256="11nrgi403ryjj7y1p995fxcyqz117qawyharv1yad8f33l610d5m"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp minpack_lm Rcpp]; }; +Luminescence = derive { name="Luminescence"; version="0.4.4"; sha256="0b7a55aqishi6jwxlpkbakfr38brjd4c61n4mcbsg6nwg7qiz1v7"; depends=[XML shape rgl matrixStats raster zoo bbmle data_table Rcpp minpack_lm Rcpp]; }; M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; }; MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; }; MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; }; -MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; }; +MALDIquant = derive { name="MALDIquant"; version="1.12"; sha256="1grlqplcz41xdr3wlmn246xs3vk8y6qqq0n92srv2crlr8fw2yg2"; depends=[]; }; MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; }; MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; }; MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; }; @@ -1051,7 +1068,7 @@ MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41a MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; }; MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; -MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.7"; sha256="0hqbl38r2acvwmxkx7j6lab6an90ykia4bffjmy9a319l0dps5l4"; depends=[MCMCglmm ggplot2 coda]; }; +MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.2"; sha256="1v8jkxxy7z1r3l9jlshhsq6634chf30d9bb1w80iqrjfn6aamn69"; depends=[MCMCglmm ggplot2 coda]; }; MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; }; MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; @@ -1059,6 +1076,7 @@ MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8 MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; }; MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; MCS = derive { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; }; +MCTM = derive { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; }; MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; }; MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; }; @@ -1076,18 +1094,21 @@ MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sab MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; }; MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[survival MASS mstate]; }; -MIIVsem = derive { name="MIIVsem"; version="0.1"; sha256="098ybi5xdz7vvgd4vczqxm54gaq6cjsg0lxk319bx3z0da1a0bx5"; depends=[lavaan]; }; +MIIVsem = derive { name="MIIVsem"; version="0.2"; sha256="15sv6fskhdm70vyz6y6wbxw9ghwinvqad7414qkn7lgymn5fm767"; depends=[lavaan Matrix]; }; MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; +MInt = derive { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso trust MASS testthat]; }; MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; MKmisc = derive { name="MKmisc"; version="0.98"; sha256="0ng6n1x2x1bg60byhpk212pihh7hirbjr4s89lzrwj854z93bv5l"; depends=[RColorBrewer robustbase]; }; +MLCIRTwithin = derive { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[MASS limSolve MultiLCIRT]; }; MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; }; MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; }; MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; }; +MM2S = derive { name="MM2S"; version="1.0.0"; sha256="0g5x375c58xsihj43dh19hx6vh87f8ppjibik5sb7lxvl1xms49c"; depends=[kknn lattice pheatmap]; }; MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; }; MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; }; MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; }; @@ -1106,7 +1127,7 @@ MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; }; -MRIaggr = derive { name="MRIaggr"; version="1.1"; sha256="0yq5qjc04rgssjb8pskvrcnr3xv1dlzakily39p9ya526zm9lrmv"; depends=[Rcpp spam Matrix Rcpp RcppArmadillo]; }; +MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp Rcpp RcppArmadillo]; }; MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; }; MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; }; MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; @@ -1120,14 +1141,14 @@ MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4 MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[Rcpp fGarch mvtnorm Rcpp]; }; -MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2hir5r9nryhqh8lrh41fwps4la9x8"; depends=[RCurl digest XML]; }; +MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[RCurl digest XML]; }; MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; }; MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; }; MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; -MVN = derive { name="MVN"; version="3.9"; sha256="1l6bib1gl5nj7p1dk6mbmflp9p5sgm405q3l53pqmq09jm55flh6"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; +MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; }; -MVar_pt = derive { name="MVar.pt"; version="1.0"; sha256="0wzc2r5psla8khyrkd7p8y23cxyn5bsy8vxglh2p3mpayfzi8k2a"; depends=[]; }; -MXM = derive { name="MXM"; version="0.3"; sha256="14kw4shc0jp6jrs8afimy13jssah0agwa3p5ay2py1zfid43k63y"; depends=[gRbase VGAM MASS pcalg survival]; }; +MVar_pt = derive { name="MVar.pt"; version="1.1"; sha256="0jcxsf0c9klnj19j8shiadxrbh3wa7da2vywk352ylirl5vdv2yl"; depends=[]; }; +MXM = derive { name="MXM"; version="0.3.1"; sha256="06sp6hy0dparya6fcfbiyhh0h10r8ai8fmh4rq2fz0dq6prk95ic"; depends=[]; }; MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; }; ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; @@ -1139,11 +1160,11 @@ MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; }; Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; }; MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[MASS igraph segmented]; }; -Matrix = derive { name="Matrix"; version="1.2-0"; sha256="0ywz213p6cpwnklxd81hzdyxjzagaj6cn32ycc5rcnhxy30d7kk5"; depends=[lattice]; }; +Matrix = derive { name="Matrix"; version="1.2-1"; sha256="0farq1x1qhgzdwqqd4bn3g6hbv91hk5sm2v00vphf0zgj2fg2qm6"; depends=[lattice]; }; MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; }; MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; -MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.3"; sha256="09a7zd0jkf5gx0zybbnlzcmzhzdiwh15mjg2nfyy00lrjbhvq83i"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; +MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; }; McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; }; @@ -1167,6 +1188,7 @@ MethComp = derive { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgb Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; }; MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; }; +MiRSEA = derive { name="MiRSEA"; version="1.0"; sha256="1azabfwd83x6g3fpwdqss5b0rxj8zfmj9972bd0brk8z39wggsrr"; depends=[]; }; MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron snowfall rlecuyer]; }; MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; }; @@ -1178,9 +1200,9 @@ MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; }; MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; }; -MixGHD = derive { name="MixGHD"; version="1.5"; sha256="1wjjz300yr9mj5kwrpybdji0znqrh26i2jlhbjcxkn3j4frkhlh3"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; }; +MixGHD = derive { name="MixGHD"; version="1.6"; sha256="0lmv1yspjn9m5kw0zd2sabgy33zd77p0nqfvs9cvy3ldvz35095i"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; }; MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; }; -MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; }; +MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; }; MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; }; MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; }; Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[Ohmage ggplot2 wordcloud reshape2]; }; @@ -1196,15 +1218,15 @@ MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; }; Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; }; MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; -MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05qjmzv80bkp3ib45x7i05s2mqy1yxn"; depends=[]; }; +MuMIn = derive { name="MuMIn"; version="1.14.0"; sha256="0zwwwp7979kss5871vp6975maqm8gsc0hn75fxq90l0xcyipxvcy"; depends=[Matrix]; }; MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; }; MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; -MultiJoin = derive { name="MultiJoin"; version="0.1"; sha256="02wdn2rcci4n553jjd7ivw3afp6w6zcjc002yj0pvi0ai3jw6p92"; depends=[]; }; MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; }; MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; }; MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; }; MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; }; +MultiRR = derive { name="MultiRR"; version="1.0"; sha256="0m2v13cygabjbsz0fwxwh03csd3yfdpzk4yfvx8lrim9m90026hz"; depends=[MASS lme4]; }; MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; }; MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; @@ -1217,17 +1239,18 @@ NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[proftools dplyr]; }; -NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; -NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; }; +NEff = derive { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[msm bit]; }; +NHANES = derive { name="NHANES"; version="2.0"; sha256="0bdsccr1g2vnisllnmj2z4sma5hdp2iqm1fpr0kmbv1dnkpmxd41"; depends=[]; }; NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; }; NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; }; +NHMSAR = derive { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[ucminf lars SIS caTools glasso]; }; NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; }; NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; }; NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP SnowballC qdap]; }; NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; -NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; +NMF = derive { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMOF = derive { name="NMOF"; version="0.34-2"; sha256="1hqq0gypry614jfc8hcagwkf6xz6z98pb9hzkl9ygykv4rfs5bms"; depends=[]; }; NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny xtable stringr]; }; @@ -1293,9 +1316,10 @@ OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; }; Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; -OpasnetUtils = derive { name="OpasnetUtils"; version="1.1.0"; sha256="1a7j96pg0v8j527m0w48k8lxwb2ynrqq1y7140bi1ciq0466azx3"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp]; }; +OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp plyr]; }; OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; }; OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; +OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[digest MASS RcppEigen StanHeaders BH]; }; OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[pvclust colorspace plyr stringr abind rgl GPArotation psych XML]; }; OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; }; OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; @@ -1312,7 +1336,7 @@ OutbreakTools = derive { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; }; OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; }; OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; -P2C2M = derive { name="P2C2M"; version="0.6"; sha256="00m4dmvnvbjbxxqi9ai2zd33cwlsb7ghjbswz256w5iab4c0ls02"; depends=[ape apTreeshape ggplot2 rPython stringr]; }; +P2C2M = derive { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; }; PAFit = derive { name="PAFit"; version="0.7.2"; sha256="047ajzb9xnhxqa9v5dggznix9rd9z66g0mzanzwqb8ds5f8gm8ls"; depends=[Rcpp Rcpp]; }; PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; }; @@ -1339,7 +1363,7 @@ PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kw PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation ThreeWay MASS Matrix]; }; PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; }; PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; -PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; +PEIP = derive { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix RSEIS pracma]; }; PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; }; PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; }; @@ -1367,7 +1391,7 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; }; PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; }; PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; -PPtreeViz = derive { name="PPtreeViz"; version="1.0.1"; sha256="0010ixyxgal7q5vwpsslvw6p6bb8qkhbysh41rf0ymdwn37p085p"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; }; +PPtreeViz = derive { name="PPtreeViz"; version="1.0.3"; sha256="0m0nw6kh8ybgdih2d10b8q8q0wknrbppad8nq8jmq85sm0xrrysj"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; }; PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; }; PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; @@ -1383,6 +1407,7 @@ PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm2 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; }; PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; }; +Pade = derive { name="Pade"; version="0.1-2"; sha256="144wzwh5wy9hmxd4ng6k601ppvdbqn6hrx210kj266dlapwyg8l2"; depends=[]; }; PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; }; PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; }; Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; @@ -1397,7 +1422,7 @@ PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yh PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; }; PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; }; -Peptides = derive { name="Peptides"; version="1.0.4"; sha256="0qpppbdsz7c3dw6l5m3sxggma4xxdx0vflwlxpa0d7wynqpsn3wn"; depends=[]; }; +Peptides = derive { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; }; PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; }; PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; }; PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; }; @@ -1416,6 +1441,8 @@ PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; PoisBinNonNor = derive { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; }; +PoisBinOrdNonNor = derive { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[Matrix corpcor MASS GenOrd BB]; }; +PoisBinOrdNor = derive { name="PoisBinOrdNor"; version="1.0"; sha256="0big81yvbz9qyw4h6h1ak2wzvn56g1d1809m7lnmd2kx780i2hsf"; depends=[Matrix corpcor mvtnorm psych GenOrd]; }; PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; }; PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; @@ -1432,12 +1459,12 @@ PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; }; Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; }; -PowerTOST = derive { name="PowerTOST"; version="1.2-06"; sha256="1amzc0229cwydvnbw59aah52krswdx4k20n6i23vqimmxb26kc64"; depends=[mvtnorm]; }; -PracTools = derive { name="PracTools"; version="0.1"; sha256="0d8m326p41xqr4ndizp5x6qq5h55wgc7yinb6jsxi4xhfd2kiwq5"; depends=[]; }; +PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; }; +PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; }; PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[Hmisc ROCR epitools PBSmodelling]; }; PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; -PrevMap = derive { name="PrevMap"; version="1.1.4"; sha256="1m5a71s6j6x4kmqij1v7wikblk0a0l9lbskrj6q2znwj0hnbk1wy"; depends=[geoR maxLik raster pdist splancs]; }; +PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik raster pdist splancs]; }; PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; }; ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; }; @@ -1457,7 +1484,7 @@ PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; }; QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; }; QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; }; -QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.0"; sha256="0rv2pfaj5fh8zva47k2r2rwzpnilj48jigaazkw2ibs8zq5f3qwz"; depends=[]; }; +QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; }; QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; }; @@ -1471,18 +1498,18 @@ QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdc Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[xts httr zoo]; }; QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; QuantifQuantile = derive { name="QuantifQuantile"; version="2.1"; sha256="1d3dcpri8d98mn2c0nfipp1pdr67a8h35p0y7bdil6il71h4qldm"; depends=[rgl]; }; -QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; }; +QuasiSeq = derive { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[mgcv pracma]; }; Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; -R_filesets = derive { name="R.filesets"; version="2.7.1"; sha256="0awvjqkk5h8wzbdgn255m3gy3w5dsnlqp4wj7gzqgqm5mwg4jdyh"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; +R_filesets = derive { name="R.filesets"; version="2.7.2"; sha256="0jlbpvj1ijjknjrb48x26c1ngkv7gl42fmk5g9sqaivm69d76nav"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; }; R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; }; R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; }; R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; -R_utils = derive { name="R.utils"; version="2.0.2"; sha256="1bqykygqbgx2wwqypvgj9siyiqa77cbchjnqw0qgg1rg8q2ldw65"; depends=[R_oo R_methodsS3]; }; -R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; }; +R_utils = derive { name="R.utils"; version="2.1.0"; sha256="03pi6pkcsq65fv7cn4x74cj050dc8x5d4xyg930p6f7flk788xaz"; depends=[R_oo R_methodsS3]; }; +R0 = derive { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; }; @@ -1493,7 +1520,7 @@ R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; }; R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; }; R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; }; -R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; }; +R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[coda boot]; }; R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; }; R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[rjags abind coda R2WinBUGS]; }; R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; @@ -1503,7 +1530,7 @@ R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0a R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; }; RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; }; RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; }; -RAM = derive { name="RAM"; version="1.2.0"; sha256="1xf296a2xqv9nq3m5lswnbfy023s6dp0yv8y0hr8xq0mw9mym3v3"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps ape lattice reshape]; }; +RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[vegan ggplot2 ape gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps lattice reshape ade4 phangorn phytools Hmisc]; }; RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; }; RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; }; RANN = derive { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; }; @@ -1530,7 +1557,7 @@ RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; }; RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[R6 assertthat XML plyr dplyr]; }; -RDS = derive { name="RDS"; version="0.7-1"; sha256="1vkrplzak95yqykrxgzjxgvyb4g255rnk6msh1yi5mgrd32f0gdl"; depends=[gridExtra ggplot2 Hmisc igraph reshape2 scales]; }; +RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[gridExtra ggplot2 igraph reshape2 scales]; }; RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; @@ -1541,12 +1568,13 @@ REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fz REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; }; REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; -RESS = derive { name="RESS"; version="1.0"; sha256="0p6zfvakq4c02qp26l8zqcmi95na408rv6j6ibaxbcyf5vq9rhcs"; depends=[]; }; +RESS = derive { name="RESS"; version="1.1"; sha256="1g4g15m29cb6c60ah86si6ibi8sb2j7spqml6lmcflk4rrnyi4pc"; depends=[]; }; REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; }; REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; }; RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; }; +RFgroove = derive { name="RFgroove"; version="1.0"; sha256="13cf2grp87j7mm0lqf8f65d1pzypjp3b7g09f35x6dfirvc7lkdy"; depends=[randomForest wmtsa fda]; }; RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; }; RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; }; @@ -1572,7 +1600,7 @@ RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh44 RImageJROI = derive { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; RImpala = derive { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; }; RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; -RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; }; +RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp Rcpp]; }; RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; }; @@ -1592,14 +1620,14 @@ RMOAjars = derive { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76 RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; }; RMTstat = derive { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; -RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; depends=[snowfall matrixcalc msm coda]; }; +RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[snowfall matrixcalc msm coda]; }; RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; }; RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; }; RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; }; RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; -RNeXML = derive { name="RNeXML"; version="2.0.2"; sha256="1giqwpcvr3v7na0z25qwps3qlrnffji0frcx694ifdfa89fn0s4d"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; +RNeXML = derive { name="RNeXML"; version="2.0.3"; sha256="02aaacd2vs2iccjabx1bcrimhzr1kpzhkx9l50amwilj8q8ackr0"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; RNetCDF = derive { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; }; RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; }; RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; }; @@ -1639,14 +1667,15 @@ RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6 RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; }; RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; }; RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; -RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; +RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat shapefiles plyr]; }; RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; }; RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; }; RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; }; -RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; }; +RSGHB = derive { name="RSGHB"; version="1.1.0"; sha256="08ir7460mg0f414j69s7ffj35drip9qbbzwva1ps6x0gjjdnmzcq"; depends=[]; }; RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; }; RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; }; +RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[lattice plyr gridExtra]; }; RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; }; RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; }; RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; }; @@ -1673,7 +1702,7 @@ RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hm RVFam = derive { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme survival lme4 kinship2 MASS Matrix]; }; RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; }; RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; }; -RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; }; +RVsharing = derive { name="RVsharing"; version="1.3.4"; sha256="0v267m7gfvc6fvfh4i53jk2xcr21kih6ddlgvb600j5ck6mi14vf"; depends=[kinship2]; }; RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; }; RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; }; RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; }; @@ -1692,17 +1721,19 @@ Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; }; RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; }; -RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.2"; sha256="12vja6ilihy2xq78h6nj1i60vgd5b6pqr2knpw7yq1nix22v4qn9"; depends=[]; }; +RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.7"; sha256="1rdhc81gd0y5ss1ap74y1n8g2d7z4gjryviw86z53aznn3ddnbhg"; depends=[]; }; RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; }; RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; }; Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; }; RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; }; -RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; }; +RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[plyr RCurl gdata data_table stringr]; }; Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; }; Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; +Rcell = derive { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[proto plyr reshape ggplot2 digest]; }; +RcellData = derive { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; @@ -1712,7 +1743,7 @@ RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xki RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; }; RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[R2HTML abind ez nortest reshape Rcmdr RcmdrMisc]; }; RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[Rcmdr epiR abind]; }; -RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.27"; sha256="00yk41f8d7z602xb3hpkk0zr2r17d9ap6sx78ni8wl7rkvmn0c7r"; depends=[Rcmdr]; }; +RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.28"; sha256="0by00cnfs0yciy1azqvmcbkbf6r8mr2451xjqqxfd4jwmhg3nrxl"; depends=[Rcmdr]; }; RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; }; RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; }; RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-42"; sha256="0ra5glv2p4ii2c1b3dyxbdjl4ps6idjpl6ni8ridrfb391qlmyrk"; depends=[HH lattice latticeExtra rgl mgcv Rcmdr]; }; @@ -1728,7 +1759,7 @@ RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzm RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; }; RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; }; RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; }; -RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; }; +RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="2.0-4"; sha256="066h5idmmjng4i1n84rbvqgjnj7f1xrj32l1icm1dw3gsh2ipa5l"; depends=[Rcmdr randtests tseries]; }; RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[Rcmdr coin survival multcomp]; }; RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; }; RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; }; @@ -1751,7 +1782,7 @@ Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zab Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; }; RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp Rcpp]; }; -RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.100.1.0"; sha256="0126g932fq24ns4yzj3z2dwagdy9qb7ckprk30zs7alq6rayfmn5"; depends=[Rcpp Rcpp]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp Rcpp]; }; RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; }; RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; }; @@ -1760,10 +1791,11 @@ RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7 RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; }; RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp Rcpp]; }; RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; }; +RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[Rcpp knitr Rcpp]; }; RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; }; RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; }; -RcppParallel = derive { name="RcppParallel"; version="4.3.8"; sha256="0gk42v2qxjgz34ispcyr0mizbp3l9l0p6jpw3y59vafpbkgdk0yg"; depends=[]; }; +RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; }; RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; }; RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; }; RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; }; @@ -1781,10 +1813,10 @@ Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[rootSolve deSolve shape]; }; RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp Rcpp RcppArmadillo]; }; -RecordLinkage = derive { name="RecordLinkage"; version="0.4-7"; sha256="18v9jihp00xfz80vkg054v93w6grnp3aaf7prlzckwxs5i5lff70"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; }; +RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; }; Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; }; -RefManageR = derive { name="RefManageR"; version="0.8.45"; sha256="16smvd25gdssiry2i8gs24km83hnsq2v6m225i7qadcmn9pyj4yh"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; }; +RefManageR = derive { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; }; RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; }; RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; @@ -1799,13 +1831,14 @@ ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m26 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; }; ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; }; +RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[Matrix igraph XML stringr magrittr gtools plyr]; }; Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httr rjson httpuv]; }; Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; }; Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; }; RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; }; Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; }; -Rhpc = derive { name="Rhpc"; version="0.14-261"; sha256="09rb68dys283gqmgn00v5skz6y5mcychg7hjrmi59pcfl5i7sk71"; depends=[]; }; -RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-256"; sha256="1s9mwwh269wwdqnb98jxsmpjm2bdf5dj4c3wkj5i81w2p1sm8qx3"; depends=[]; }; +Rhpc = derive { name="Rhpc"; version="0.15-147"; sha256="1cb60vsvv6vj0sa1p9p05d16xi446qqckjzbiz0lmiy7k43nyccm"; depends=[]; }; +RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; }; RidgeFusion = derive { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; }; @@ -1832,6 +1865,7 @@ RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gq RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; RobustAFT = derive { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; }; +RobustEM = derive { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[mvtnorm e1071 ggplot2 ellipse doParallel foreach]; }; RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; }; Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; @@ -1841,10 +1875,11 @@ RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xadvvp0lljcibg613xi02gq5q8x3h0l9qa4c2x"; depends=[Rcpp Rcpp]; }; Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; +Rphylopars = derive { name="Rphylopars"; version="0.1.1"; sha256="04qd6zzgjgrfnv3ffv3jzlcl4ilfb67fxza49qq4rzinxc2s392b"; depends=[ape Rcpp doBy geiger phylolm phytools mvnmle Rcpp RcppArmadillo]; }; Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl cda]; }; Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; -Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; }; +Rrdrand = derive { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; }; Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; }; Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; }; @@ -1852,9 +1887,10 @@ Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcp Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; }; Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[svd forecast lattice]; }; Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; -Rsymphony = derive { name="Rsymphony"; version="0.1-19"; sha256="0m9xbyp4hxz9rbc8nd7q0fwzgl6126iv0sxwifamxkc9z8vr86js"; depends=[]; }; -Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; }; +Rsymphony = derive { name="Rsymphony"; version="0.1-20"; sha256="10l3z9b51c8xsdfnscwn6g868xn84pfw3dlyj3vrsw3vs7qbi0gl"; depends=[]; }; +Rtsne = derive { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp Rcpp]; }; Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; }; +Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; }; Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; }; Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; }; @@ -1867,7 +1903,7 @@ RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjb RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; }; Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; }; Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; }; -SAENET = derive { name="SAENET"; version="1.0"; sha256="0mnzv1a3xmbf4w9mgsi2kf20kyhcsadaih63wb0zvraqv5ijdd31"; depends=[autoencoder neuralnet]; }; +SAENET = derive { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; }; SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; }; SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; SAMUR = derive { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; @@ -1876,7 +1912,6 @@ SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgva SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; -SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; }; SAVE = derive { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; }; @@ -1940,6 +1975,7 @@ SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dv SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; }; SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; SOMbrero = derive { name="SOMbrero"; version="1.0"; sha256="10d2fakjkfk3p4dfh0cw1sp7i95f7lqdvz8b7x7sc5pg82dpffy7"; depends=[knitr igraph wordcloud scatterplot3d RColorBrewer shiny]; }; +SOPIE = derive { name="SOPIE"; version="1.4"; sha256="0kmzw0plr5bhc65g7aggf8g1i38aw9v2fw7x4vgdgb7zi5qmn5mx"; depends=[circular]; }; SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; }; SOUP = derive { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; SPA3G = derive { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; }; @@ -1997,7 +2033,7 @@ SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; }; SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[numDeriv MASS Rsolnp]; }; SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; }; -SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.3"; sha256="12zjpyl79kx750xgra06zbw5vnaq8mis39cm8672w3d9giy2fxr5"; depends=[mgcv mvtnorm magic VineCopula VGAM survey trust Matrix sn]; }; +SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[mgcv magic VGAM survey trust VineCopula]; }; SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula mgcv mvtnorm gamlss_dist magic trust VGAM Matrix]; }; SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; @@ -2005,8 +2041,9 @@ SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29 SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate rworldmap plyr sp]; }; SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[tcltk2 plotrix ape plyr phangorn calibrate ggplot2]; }; SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; }; -Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; }; +Sequential = derive { name="Sequential"; version="2.0"; sha256="0dndy4a1waxgwj43gq1zb6cqwvrafcr729hhr7qckw5crcmm0iph"; depends=[]; }; SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; }; +ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; }; SharpeR = derive { name="SharpeR"; version="0.1501"; sha256="138faypgrfph48wvz600l20ypqzxdir4q43bl9s7vndysya3vsnl"; depends=[matrixcalc]; }; ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; }; SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; @@ -2043,14 +2080,14 @@ SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1q SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; }; SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; }; -SpatPCA = derive { name="SpatPCA"; version="1.0.0.1"; sha256="1j2zhm0xlm5w1p4yhg60qwa0r2hai7nv1n25ski5x2nfnpb5fiij"; depends=[fields Rcpp Rcpp RcppArmadillo]; }; +SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp Rcpp RcppArmadillo]; }; SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; }; -SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; }; +SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[maps fields]; }; SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; }; SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; }; -SpatialVx = derive { name="SpatialVx"; version="0.2-2"; sha256="16qww58az1523pk8b4b5hzqnpb8djgvph2ykf6bjp8zz5qdfyhjs"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; }; +SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; }; SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; }; SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; }; SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; }; @@ -2060,6 +2097,7 @@ SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256=" SphericalK = derive { name="SphericalK"; version="1.1"; sha256="18h1k0gy65jvzfpsda0ifv3nn3pvzx5ifllxbwh0my6w75c4biqn"; depends=[]; }; SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[pegas doParallel foreach adegenet]; }; +StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6bir0mc1i4bv9cswj5pbhpavsd08r1c"; depends=[gnm forecast MASS rootSolve fanplot reshape2 fields]; }; StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[RcppParallel Rcpp RcppParallel Rcpp]; }; StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; }; Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; }; @@ -2082,11 +2120,12 @@ StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; }; SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; }; +SubpathwayGMir = derive { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[XML igraph]; }; Sunder = derive { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; }; SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; }; SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; }; -Surrogate = derive { name="Surrogate"; version="0.1-5"; sha256="0g66yzbirkxs6f69zbfaw61ki25qgdxwkd3zhmymmgxhbix77n11"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; }; +Surrogate = derive { name="Surrogate"; version="0.1-61"; sha256="0jifjns0v22risy783a0s71v6sn165wn7w6a47sb7dsdimrvnn9d"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; }; SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; }; SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; }; SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; }; @@ -2098,12 +2137,13 @@ SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfm SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; }; Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; -TAM = derive { name="TAM"; version="1.6-0"; sha256="0wca6ry29k422q8x4qwpd9myc6xnd2p2z05dqlmb2gwzgbj3wcbk"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; }; +TAM = derive { name="TAM"; version="1.7-1"; sha256="1zsgdilxh7j7ay74a5id7iwm0mz3vf1rcgw7fvclic1ndwwj68z3"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; }; TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; }; TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; }; TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; }; TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; }; +TDAmapper = derive { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; }; TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[SPOT twiddler testit adabag]; }; @@ -2121,6 +2161,7 @@ TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47 TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; }; TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[expm numDeriv ape phytools phangorn]; }; +TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[raster bit rgdal]; }; TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; }; TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; }; TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; @@ -2131,14 +2172,14 @@ TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[TSdbi DBI tframe TSsql RMySQL]; }; -TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; }; +TSP = derive { name="TSP"; version="1.1-1"; sha256="0wwzmkgfy55dba9jl3mpbyqciia71px0x0s6708k8kz9vr03m2zs"; depends=[foreach]; }; TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[TSdbi DBI tframe tframePlus TSsql RPostgreSQL]; }; TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; }; TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[TSdbi DBI tframe tframePlus TSsql RSQLite]; }; TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; }; TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[TSdbi tframe tfplot DBI]; }; -TSdata = derive { name="TSdata"; version="2015.4-1"; sha256="0h8gxgfal4ak2jmxmql02qpq4lcgj8m263aq9h83l5gmvzd173q7"; depends=[]; }; +TSdata = derive { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; }; TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; }; TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; }; TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; @@ -2148,6 +2189,7 @@ TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6v TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe TSdbi tframePlus zoo]; }; TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; }; TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; }; +TTmoment = derive { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; }; Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableMonster = derive { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; }; @@ -2167,7 +2209,7 @@ Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95a ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; }; ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; }; ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; }; -TickExec = derive { name="TickExec"; version="1.0"; sha256="0ylmf0mxp9hnijnq9rq6l4xahzsyrh8pfjjbgzz6v77ycvzzz5sh"; depends=[]; }; +TickExec = derive { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; }; TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; @@ -2213,16 +2255,16 @@ VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bs VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; }; VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; -VIFCP = derive { name="VIFCP"; version="1.0"; sha256="19jpwhbw5ml46ic8mzkl0ll7qaa0slw608c790dpbch8hx1r5i7s"; depends=[]; }; +VIGoR = derive { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; }; VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; }; VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; }; VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; }; VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; }; VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; -VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; +VSURF = derive { name="VSURF"; version="1.0.0"; sha256="1hqn22k66v9zb2qr7sig0zgki9hbfr5442d7mlldnyj3m012m22j"; depends=[doParallel foreach randomForest rpart]; }; VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; -VarSelLCM = derive { name="VarSelLCM"; version="1.0"; sha256="1i0s4kdqgfh79bk5ipd9fn6m3yl1qgn9gzn62kxx7vfiy683x0a2"; depends=[Rcpp mclust Rcpp RcppArmadillo]; }; +VarSelLCM = derive { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp Rcpp RcppArmadillo]; }; VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; @@ -2232,7 +2274,7 @@ VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ix VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; }; VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; }; VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; }; -VineCopula = derive { name="VineCopula"; version="1.4"; sha256="03bjpnpq8zj1h4z35m2xkgrislvp7lmvpxm905xxn1r3r944kflz"; depends=[MASS mvtnorm igraph copula ADGofTest]; }; +VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[MASS mvtnorm igraph copula ADGofTest lattice]; }; VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; }; Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; @@ -2255,19 +2297,21 @@ WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmg WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; }; WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; -WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0yfnjw73i6mrh0y9iyjbxmhklz2hlxv1k53pppbg"; depends=[oro_nifti mgcv fslr]; }; +WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[oro_nifti mgcv]; }; WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; }; WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; }; -WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; }; +WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; }; +WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; }; WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; }; WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; }; XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp Rcpp]; }; +XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; }; XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; -XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; }; +XML = derive { name="XML"; version="3.98-1.2"; sha256="13rhl534l0cnklxf6zb9y8ykg0k5idg9dxy0nv1vbliz6rw3dr00"; depends=[]; }; XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; }; XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; }; XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; }; @@ -2287,25 +2331,27 @@ ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zl aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; }; aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; }; aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; }; -aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmbrv3ipyy2fh8lgik4zvv4c63mlxsh"; depends=[httr XML]; }; +aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; }; +aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; }; abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data nnet quantreg MASS locfit]; }; abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; -abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; }; +abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; }; abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; }; abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; }; abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; }; abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; -accelerometry = derive { name="accelerometry"; version="2.2.4"; sha256="0jk3dirk7bbddqh5j6nw2k1wm1i3k3xnz1mcb6lb5qyf1b642miw"; depends=[Rcpp Rcpp]; }; -accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; }; +acc = derive { name="acc"; version="1.0.2"; sha256="1z7hncgd43mc84v3wdcqpkp3gxsdyvh7h8s6qvgap2lp04m1j74l"; depends=[zoo PhysicalActivity mhsmm timeDate]; }; +accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp Rcpp]; }; +accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; }; accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; }; acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; }; acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; }; acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; }; acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; }; -acp = derive { name="acp"; version="1.1"; sha256="0bdyaab2zalqaq5m4zr86mj92wqq520wqbdb5bkvs7skq6xd1zq9"; depends=[tseries]; }; +acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[tseries quantmod]; }; acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; }; acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; @@ -2320,7 +2366,7 @@ adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jva adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; }; adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; }; additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; -addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6ij72nzvj2dqyr6y2wzb96jfqv19kl"; depends=[combinat glm2]; }; +addreg = derive { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; }; ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; }; ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; }; adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; }; @@ -2358,7 +2404,7 @@ alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c9 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; }; allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; -alphaOutlier = derive { name="alphaOutlier"; version="1.0.0"; sha256="1f4jma487sp5csrvp5z7rx7k78kj8d4rkw7i3ql764rmm0pbk1h8"; depends=[Rsolnp nleqslv quantreg]; }; +alphaOutlier = derive { name="alphaOutlier"; version="1.0.1"; sha256="1zl80q08vcyvyakfv6cd444m6l5z14p7bv9jf8kpg4dad3d63mhz"; depends=[Rsolnp nleqslv quantreg]; }; alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; }; alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; @@ -2368,7 +2414,7 @@ amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj5 amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; }; aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; }; -analogue = derive { name="analogue"; version="0.16-0"; sha256="1izbqzmnw4hmirjlvwp15imzaai2kxbv2gzc58y5awwbfdrg314m"; depends=[vegan mgcv MASS brglm princurve lattice]; }; +analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[vegan mgcv MASS brglm princurve lattice]; }; analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[vegan3d analogue rgl]; }; analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; }; @@ -2389,7 +2435,7 @@ aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; }; apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Rcpp Matrix Rcpp]; }; -ape = derive { name="ape"; version="3.2"; sha256="015ibyri6r2xdmy644pb1p6xn0rzxaz49sr96859jfvafzi7p2ny"; depends=[nlme lattice]; }; +ape = derive { name="ape"; version="3.3"; sha256="1zdgszyi5kwfj3kccx35q8z57p53zdp819hjqdw5z8y6q7b49j1c"; depends=[nlme lattice]; }; apex = derive { name="apex"; version="1.0.0"; sha256="1y4y1kji5nvbk0igbv9xjwsjrnz7bsjj23cczydywg9nppsi9df0"; depends=[ape phangorn adegenet]; }; aplore3 = derive { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; }; aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; }; @@ -2407,19 +2453,20 @@ aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2q aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; }; archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; -archiDART = derive { name="archiDART"; version="1.0"; sha256="0fahcw3032rvz1qd2vv872k8d7845zjfm2byrk1nk5b34z25wm2b"; depends=[]; }; +archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; }; archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; }; arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; }; argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; }; argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; }; -arm = derive { name="arm"; version="1.8-4"; sha256="17kg5z8spndn41gak9hx7a8dfdx6yrqbsd30lajkgc23x3sd6j1r"; depends=[MASS Matrix lme4 abind coda nlme]; }; +arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[MASS Matrix lme4 abind coda nlme]; }; arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; -aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.0"; sha256="0rb4qijsqzrv47i30fpcngw50a1gk10zn1r13lszxcsm5i8vjqf7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; }; +aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; }; aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_methodsS3 R_oo R_utils R_huge]; }; aroma_cn = derive { name="aroma.cn"; version="1.6.0"; sha256="090qqvv6sk0508knmh2qr1lvpc2vr8s17mj6siblzc66ldp22dj7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; }; -aroma_core = derive { name="aroma.core"; version="2.13.0"; sha256="1r3r0hrw8akdpjmzhnc0fg6nyd9hccvv4kfbms38qll70lac4910"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; }; +aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4c3wl3g10wc8agr13bnqbrq3k4fnm53jpa786qsx"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; }; +arqas = derive { name="arqas"; version="1.0"; sha256="1wqrvrmwpgkccr8vi0kn6xiy191ib1zxzrclb6v564bkj16s2w5q"; depends=[distr ggplot2 reshape iterators doParallel foreach fitdistrplus gridExtra]; }; arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; }; ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx4srnjjlv75cd463x959bycsp6fzb5r"; depends=[Matrix]; }; @@ -2434,12 +2481,13 @@ asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnl ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; }; aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; }; aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; }; +asremlPlus = derive { name="asremlPlus"; version="1.10-16"; sha256="17k1syfdsg097pawldw5mgy3a325p8k7xk99qpcivcl3pzsmw79q"; depends=[dae ggplot2]; }; assertive = derive { name="assertive"; version="0.2-4"; sha256="0xc561fi322qd5z7ss2zi69nl3i8i56w8bksgd38fpjigg0x9fwl"; depends=[knitr]; }; assertr = derive { name="assertr"; version="0.4.1"; sha256="1h77iisvyakccm7v1iqva04s1hn197sjcy28832cagqg89qlsg31"; depends=[dplyr]; }; assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[nlme lattice]; }; aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; }; -aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; }; +aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; }; astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; }; astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[multitaper IDPmisc fields]; }; @@ -2466,6 +2514,7 @@ bReeze = derive { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk babar = derive { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; }; babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; }; +backShift = derive { name="backShift"; version="0.1.1"; sha256="11mr2pdg63xa5yrybv91fxz69jizpshs67i7a8lb84n6ydaq1pj3"; depends=[jointDiag clue pcalg igraph matrixcalc reshape2]; }; backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; }; bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; }; @@ -2480,7 +2529,7 @@ basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszz batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; }; -bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0wdpqbqjacf5viyz69fjd0xbsdgvkgq2d8pjbgp18s0a"; depends=[coda]; }; +bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[numDeriv coda]; }; bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; }; bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; }; bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; }; @@ -2507,7 +2556,7 @@ bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; }; bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; }; -bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; }; +bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; }; bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[shiny ggplot2]; }; bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; }; @@ -2527,7 +2576,7 @@ benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nz benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; bentcableAR = derive { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; -berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; }; +berryFunctions = derive { name="berryFunctions"; version="1.8.1"; sha256="0plksyprbc5537005aw0yswwpahxk23c16lrq77zspzfa60i2vf0"; depends=[]; }; bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; }; betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; }; @@ -2545,7 +2594,7 @@ bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[mvtnorm car lattice combinat]; }; biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; }; -biclust = derive { name="biclust"; version="1.1.0"; sha256="0ffsgjg7dvr5nh238abhawz9k775szh8lxl75bqjvxgqiv07f3hc"; depends=[MASS colorspace lattice flexclust]; }; +biclust = derive { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[MASS colorspace lattice flexclust]; }; bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; }; bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; }; bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; }; @@ -2556,6 +2605,7 @@ biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH BH]; }; bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; +bigml = derive { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[RJSONIO RCurl plyr]; }; bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; }; bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; }; bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; }; @@ -2580,13 +2630,13 @@ binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m63266 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; }; bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; -biogas = derive { name="biogas"; version="1.0"; sha256="0c7ayhmy69k08f32i1agri349wm1addibw4xp9rjq9cmkdhazvbd"; depends=[]; }; +biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; }; biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; }; biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; -biorxivr = derive { name="biorxivr"; version="0.1.0"; sha256="0277kand29vsxczjg1wnlvx494w67x6pd1ybg735ni62is567adg"; depends=[XML]; }; +biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; }; biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[rpanel tkrplot MASS boot]; }; @@ -2607,7 +2657,7 @@ blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cq blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; }; blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; -blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; }; +blme = derive { name="blme"; version="1.0-3"; sha256="0kr2svvjbsravvahg96f6q2whfgyx2y4wgbpj9caf3rc2bd5s4nj"; depends=[lme4]; }; blmeco = derive { name="blmeco"; version="1.0"; sha256="0shhyvqq88i0nr6wdf78rlqk4c91jv26nrb19jcjcw2wxv1mnazq"; depends=[MASS MuMIn arm lme4]; }; blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; }; blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; }; @@ -2624,7 +2674,7 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; }; -bnlearn = derive { name="bnlearn"; version="3.8"; sha256="1jy47sy8pqjwjykdrcfrrdjzrgwgvmzpjxcnh73pgaa2scm9lpk6"; depends=[]; }; +bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; }; bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; }; @@ -2633,11 +2683,11 @@ bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvd boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; -boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73q0s3fgmf65fmh0rr3ryljvzp6sq"; depends=[]; }; +boot = derive { name="boot"; version="1.3-16"; sha256="1fdp3yccsffqpm209dy11085i81cj7g36l34bb94rmd27mqiwrfi"; depends=[]; }; bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; -bootSVD = derive { name="bootSVD"; version="0.2"; sha256="1b31gxlbysng5ysa18mzlp3vlc9jhn51hia0z1j9g47wi0r0f274"; depends=[ff]; }; +bootSVD = derive { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; }; bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; @@ -2649,9 +2699,9 @@ boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; }; boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; -boxr = derive { name="boxr"; version="0.2.5"; sha256="03lxdhjajjdpf58c50j1dn4i4bqy8s7h5xgr6m87r7g1v91x23y4"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; }; +boxr = derive { name="boxr"; version="0.2.6"; sha256="1b7xvblw2a1p8sr1gxrak404d43haa4kk7blnyir1pql8dcw24jd"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; }; bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; }; -bpcp = derive { name="bpcp"; version="1.2.4"; sha256="06q8zkf7z31ax3pb2xmww3l3axcmhvmgrfri1aikhi7ifgcfc979"; depends=[]; }; +bpcp = derive { name="bpcp"; version="1.2.5"; sha256="0dzsj0xhvn7jc8nb54191hwpw4sm7g13af5y3sgp9bhvcym8p31q"; depends=[]; }; bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; }; bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; }; brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; }; @@ -2664,7 +2714,7 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; }; brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; -brms = derive { name="brms"; version="0.1.0"; sha256="0cx01d65vwsrxlhvxwwlaviz1lvxhl0hd8qw0bna99w8ypsqfp3i"; depends=[ggplot2 Rcpp coda ggmcmc gridExtra]; }; +brms = derive { name="brms"; version="0.2.0"; sha256="1i515sz3paiwwkmgglqzb2gzb2y6m99kp95xaarpawsja8nxi2j0"; depends=[ggplot2 Rcpp abind coda ggmcmc gridExtra]; }; brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; }; broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat RPushbullet jsonlite ggplot2]; }; broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[plyr dplyr tidyr psych stringr]; }; @@ -2683,7 +2733,7 @@ bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; }; c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; -cOde = derive { name="cOde"; version="0.1"; sha256="1cjp63lya2r82fgjwz8mnzs50x7hyzg87dkm006m76xs1iyv988i"; depends=[]; }; +cOde = derive { name="cOde"; version="0.2"; sha256="0741ghg0cqxvgwgvrvsgi75qlkirnm8cjc6bw6xbmkg97scrs5ck"; depends=[]; }; cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; }; ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; }; caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; @@ -2716,7 +2766,7 @@ catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybsp catR = derive { name="catR"; version="3.4"; sha256="0rgzcnqp18wb8m7f3m8mm7pv04a1irlknkrsrr4hhnzs0phf06yz"; depends=[]; }; catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; }; -cati = derive { name="cati"; version="0.96"; sha256="07vvhar1skcmx0sqkp4bcrrlmb88llqpgg4vmdi4nqhw48kjyjqn"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; }; +cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; }; catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; }; catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; }; @@ -2724,7 +2774,7 @@ causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92 cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; }; ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; }; -cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; }; +cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[igraph proxy deldir FNN]; }; cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp Rcpp RcppArmadillo]; }; cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; }; ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; }; @@ -2737,10 +2787,10 @@ cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8 cds = derive { name="cds"; version="1.0.1"; sha256="1vw8ghvwsrpsq89yc4vjyfcw2wsz9dhqv1nlaqmv9b4wqm8gsb5h"; depends=[MASS limSolve clue colorspace copula]; }; cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; -celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; }; +celestial = derive { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; }; cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; }; cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; }; -cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; }; +cem = derive { name="cem"; version="1.1.16"; sha256="1crljw5ry3hynmfg9xfnbm3ypy57m33885xg39m88gzi6ydrnsvk"; depends=[lattice MatchIt combinat randomForest nlme]; }; censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; }; cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; @@ -2758,7 +2808,7 @@ cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys51 changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; }; cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; }; -checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; }; +checkmate = derive { name="checkmate"; version="1.5.3"; sha256="1d9szbszql0nz1zxplsr0w9f1c9vi11mjr5xg5960slb5v086x0g"; depends=[]; }; checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; }; cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; }; chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; @@ -2796,23 +2846,24 @@ classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qg classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; }; clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; }; clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; }; -clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; }; +clickstream = derive { name="clickstream"; version="1.1.4"; sha256="0z73phz31j7n49xmwdgv293qbg6ldfgibpd5713qyk7qkhk8hvl7"; depends=[igraph plyr Rsolnp data_table arules]; }; clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[lubridate XML selectr RCurl ggplot2 scales RColorBrewer reshape2]; }; climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[PCICt caTools Rcpp]; }; clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[ggplot2 gridExtra evd lme4 lubridate MuMIn reshape]; }; clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; -clinfun = derive { name="clinfun"; version="1.0.9"; sha256="1igj48kp8898inxp6ynz0sgrc54s6k8whzgf5d349z4dn2jvizsb"; depends=[mvtnorm]; }; +clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; }; clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; }; +clisymbols = derive { name="clisymbols"; version="1.0.0"; sha256="1g68kh1js6nssyzw4lpxp4d2h4rhlayhahaykxw4a4bd67fkw20p"; depends=[]; }; clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; }; cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; clue = derive { name="clue"; version="0.3-49"; sha256="1gz9imirwlvmvzn9j0rmdrrax2girf78xfrxw6mrhal66g48bsrj"; depends=[cluster]; }; clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; }; -clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; +clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; }; cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; -clusterCrit = derive { name="clusterCrit"; version="1.2.4"; sha256="150iq5gp5czb8m7niyi294jjy3dbfpwccgak7scahd5kz2vs07c7"; depends=[]; }; +clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; }; clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; @@ -2822,6 +2873,7 @@ clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; }; clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; }; clustering_sc_dp = derive { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; +clustertend = derive { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; }; clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; }; clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; @@ -2846,9 +2898,9 @@ coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmh codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; }; codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; }; -coefficientalpha = derive { name="coefficientalpha"; version="0.3.3"; sha256="1r38jlcl3z16xc410bcgcw1ck6nnby1mqwx5sk6g0lm3jbjcka57"; depends=[rsem lavaan]; }; +coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[rsem lavaan]; }; coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; }; -coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; }; +coenocliner = derive { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; }; coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[survival modeltools mvtnorm]; }; cold = derive { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; }; @@ -2864,11 +2916,12 @@ combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7l comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; }; commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmkbagyjqwwx21hca670n38k1a28kvnjpix"; depends=[stringr]; }; +commonmark = derive { name="commonmark"; version="0.4"; sha256="0canhzzc91fpcg53zms12k382zj4db652vh5cn74xrp73z8yvabk"; depends=[]; }; compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive { name="compare"; version="0.2-5"; sha256="073apjmw5hwslhnjwhff0m8lwszv29n6vbqy0wxl39pyzg7q2x41"; depends=[]; }; compareC = derive { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; -compareGroups = derive { name="compareGroups"; version="3.0"; sha256="0dgh72virrx9bwls5z9wbdh8rk0q1i08pmyh7wma532mx0yv8mzq"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; }; +compareGroups = derive { name="compareGroups"; version="3.0.1"; sha256="185lz69al72p4s354vn6gvha3zbhyvf2fsfym0knyspgl08q3m2g"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; }; compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; }; @@ -2884,7 +2937,7 @@ cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvf condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; -coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb9ccv343yjpswrgm65p4046sw0b764pny"; depends=[Rcpp RcppArmadillo Rcpp]; }; +coneproj = derive { name="coneproj"; version="1.6"; sha256="1bx0j9r83c944aklyq4lxdhmskyiwh4f6i2fim5fi6hpf6n9ajds"; depends=[Rcpp RcppArmadillo Rcpp]; }; conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; }; conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; }; @@ -2907,6 +2960,7 @@ corHMM = derive { name="corHMM"; version="1.16"; sha256="048bvnw2ib9x7yijlgp4d1l corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; }; corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; +coreNLP = derive { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[rJava XML plotrix]; }; coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; }; corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; @@ -2925,27 +2979,31 @@ countrycode = derive { name="countrycode"; version="0.18"; sha256="1by3xws2c43ry covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; }; covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; }; +covr = derive { name="covr"; version="1.0.0"; sha256="1svq2dcqnd5iwq75nk38lxa3dshiwil2ksd3666713agbqzikgcz"; depends=[jsonlite rex devtools httr crayon htmltools]; }; covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; +cowplot = derive { name="cowplot"; version="0.3.1"; sha256="0sqnirrwm0x2gbmblrvpdghd4v76mhczkhlhr4nd7yjz4947gfcp"; depends=[ggplot2]; }; coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[survival timereg Matrix]; }; coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; }; coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; +cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[MESS]; }; cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; }; cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; }; +cpm = derive { name="cpm"; version="2.0"; sha256="0k27r3bfqrdy3iwpzyh8mp8lr3ndcsc688g6mp5ha4blxiwgciyb"; depends=[]; }; cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; }; -cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; }; +cquad = derive { name="cquad"; version="1.1"; sha256="09rzqdv59q81nsrpjhjbdwm3p803q51w18arjg8x8l2jcgk3zcga"; depends=[]; }; crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; }; cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; }; cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; }; crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; }; -crayon = derive { name="crayon"; version="1.2.0"; sha256="1qgc1bakj5hp4fwmm2m6bzqf0mi84v6zcvw04dgck3lk00dxd0k9"; depends=[memoise]; }; +crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; }; crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; }; crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; @@ -2961,7 +3019,7 @@ crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; }; -crunch = derive { name="crunch"; version="1.1.1"; sha256="0a1nja6nnhga4f9kq4wy330pdrl8mj9c2mr75fdqkqgdll7dd96j"; depends=[httr jsonlite RCurl]; }; +crunch = derive { name="crunch"; version="1.2.1"; sha256="0p3d7iwphywyfb0m9s3fnqhdhf9klgf1cswilaz9ngxfzh5g3df2"; depends=[httr jsonlite RCurl]; }; csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; }; @@ -2979,7 +3037,7 @@ cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1 cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; -curl = derive { name="curl"; version="0.5"; sha256="1fws0402amazfa9wihgydrwrl19rmhi67shc3r1g8hvzfvax5ham"; depends=[]; }; +curl = derive { name="curl"; version="0.8"; sha256="1j24w2hswcs3hl47b60rz3scbqpd2s2dfa2fbf1c9xxb3fi1m38w"; depends=[]; }; currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; }; curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; }; curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; }; @@ -2997,6 +3055,7 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; +dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde trust ggplot2]; }; dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; }; daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; }; daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[V8 jsonlite]; }; @@ -3016,9 +3075,9 @@ dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cb datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; datamart = derive { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[RJSONIO XML RCurl base64 gsubfn markdown]; }; -datamerge = derive { name="datamerge"; version="1.0-1"; sha256="03xb48igkh0f91iq6qc2j5xzqfy2n51ci5i850gn09mm9k4lxij1"; depends=[xtermStyle]; }; +datastepr = derive { name="datastepr"; version="0.0.1"; sha256="1dzx7mw9hl2f8q638m3vwva7mdlb59bgjc5rmpcjb5nxmylpx0vk"; depends=[dplyr lazyeval R6 magrittr rlist]; }; datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; }; -dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; }; +dataview = derive { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; }; date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; }; dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; }; dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[mvtnorm ibdreg boot]; }; @@ -3036,7 +3095,7 @@ dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xiz dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; }; dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; -ddalpha = derive { name="ddalpha"; version="1.1.0"; sha256="0kij4s24v4zchlfk4za5373ispapd1yzkp9ld2bwv4w562amnl5w"; depends=[MASS class robustbase Rcpp BH Rcpp]; }; +ddalpha = derive { name="ddalpha"; version="1.1.1"; sha256="1i0zchgp5pdfa9p1mpd9svbigbn01jqfl47nnqixzlgz1808929c"; depends=[MASS class robustbase Rcpp BH Rcpp]; }; ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; }; ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; }; deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; }; @@ -3044,29 +3103,31 @@ deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vak deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; }; deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; -decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; +decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; +decisionSupport = derive { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; }; decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; }; -decompr = derive { name="decompr"; version="3.0.0"; sha256="06m2k3rjna6nii1fc9b3v2wijkjrknyhskr1ampbdgwligddnzay"; depends=[]; }; +decompr = derive { name="decompr"; version="4.0.0"; sha256="161y5fyy5yqbsl68q9bd4b0s87c3qzv7x9jrzb2k9lxhm4h8qh0w"; depends=[]; }; decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; }; +delt = derive { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; }; deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; }; demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; }; dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066yima31sn8ddp8qrwyx2zc84wf2kixs37ynhw1xi1"; depends=[magrittr whisker]; }; -dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend Rcpp]; }; +dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[Rcpp dendextend Rcpp]; }; dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; }; denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; }; -denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; }; +denpro = derive { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; -depend_truncation = derive { name="depend.truncation"; version="2.3"; sha256="1n0v5cwmgpdyapr185s9przdsrxwaqf32038zm1na0yna8qmj8wl"; depends=[mvtnorm]; }; +depend_truncation = derive { name="depend.truncation"; version="2.4"; sha256="09jcg6gr4dy0ayayn8qvbgncnw6v76xzif90c7v64a09snhh8qv6"; depends=[mvtnorm]; }; depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; }; depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; }; depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; }; @@ -3093,6 +3154,7 @@ dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7 dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; }; dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; }; +diagonals = derive { name="diagonals"; version="0.2.0"; sha256="185nibadqvi6cvablh84ijs52wn2vg0xrc2idizll6lcxhf441yq"; depends=[]; }; diagram = derive { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; }; diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; }; dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; @@ -3110,11 +3172,11 @@ digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whym digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5jpzkpq8xc67zpv560q4vql5nwifm44dwar753"; depends=[]; }; dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; }; dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; -diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2mjzwp4hwc2psqd9kn5989y4a1jmzxp2bg"; depends=[]; }; +diptest = derive { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; }; directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; }; dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; -discSurv = derive { name="discSurv"; version="1.0.0"; sha256="0yq0vpdg6n21ar2r3jbgv2kxy7jn6gssyrrs6vfw4rk1q0bw6b2w"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; }; +discSurv = derive { name="discSurv"; version="1.1.0"; sha256="0jj055w0m749fdd90cqlyklxnjxfjhly179lmg9xfl69w4xrjc2l"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; }; disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; }; discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; @@ -3130,6 +3192,7 @@ displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; }; dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; +distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[survival shiny httr digest jsonlite stringr R6]; }; distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; }; distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; }; @@ -3149,7 +3212,7 @@ diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kg diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; }; divo = derive { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[RcppCNPy cluster]; }; dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; }; -dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; }; +dkDNA = derive { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; dlm = derive { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; }; dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; @@ -3168,24 +3231,25 @@ doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9b doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; }; docopt = derive { name="docopt"; version="0.4.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; }; documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; -domino = derive { name="domino"; version="0.2-6"; sha256="0xbp9gb38gxfdxfbzm792g4fnjsfp2ncncm8cmyra5wja6qwcwl8"; depends=[]; }; +domino = derive { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3zcydyplmzhmbgq3xxrlq92swdyzmyy5"; depends=[]; }; dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; }; -dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; }; +dostats = derive { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; }; downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; }; dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[sem igraph]; }; dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; }; dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; -dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; }; +dplR = derive { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[lattice Matrix digest gmp matrixStats png R_utils stringi stringr XML]; }; dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; }; dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; }; +dpmr = derive { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; }; dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; }; -drat = derive { name="drat"; version="0.0.3"; sha256="1dxgicvjdkhiwkyadxwb6lfvvidx0w2y5sd5dm49chlv6zgjaa2i"; depends=[]; }; +drat = derive { name="drat"; version="0.0.4"; sha256="0pq74a0f1pkgfzgrh0r2xa2xkgxbanp8a5v13bmma09ghy5vnrhm"; depends=[]; }; drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; }; drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; }; -drgee = derive { name="drgee"; version="1.1.1"; sha256="0fb5k26c76d5hh09z97mhzx02fr52y2wixgxfgndbp48w826iqpc"; depends=[nleqslv survival]; }; +drgee = derive { name="drgee"; version="1.1.2"; sha256="1idnwa9yy1bijwbz9ffvc4q4lynhisgjvp3jcik3z3r96wfmz2ks"; depends=[nleqslv survival]; }; drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; @@ -3206,11 +3270,11 @@ dunn_test = derive { name="dunn.test"; version="1.2.4"; sha256="01z9rxhp9mli9b21 dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; -dygraphs = derive { name="dygraphs"; version="0.4.3"; sha256="1pg23lsmjg46nlb17r4shmr6aal3c3pqzkcznfadcc6cgm0afqp2"; depends=[magrittr htmlwidgets zoo xts]; }; +dygraphs = derive { name="dygraphs"; version="0.4.5"; sha256="08bc41d0f8adfnhv668p9sk4507i63xlfs3yswig1g7c0cnyaba9"; depends=[magrittr htmlwidgets zoo xts]; }; dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; }; dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; -dynRB = derive { name="dynRB"; version="0.1"; sha256="16klhc3lrz9jnpd2br4niqsxzcbqri5y8qr2pr1fnqm64dvhnc8x"; depends=[]; }; +dynRB = derive { name="dynRB"; version="0.2"; sha256="00xpigx1bxjm03fz7x19wws7vqyaa6mgfp3zdb8f0mvw3hjkrvr0"; depends=[]; }; dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; }; dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; }; @@ -3225,7 +3289,7 @@ eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvg eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; }; eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; }; -earth = derive { name="earth"; version="4.3.0"; sha256="1i52gm0ib1n6ffamb29np88b665l8vdigv482kvzh545kxc1z0jh"; depends=[plotmo]; }; +earth = derive { name="earth"; version="4.4.0"; sha256="1dsqyp93z8a2afvnhms4453cmhn7zbqf5fy18sl43gn616miarpv"; depends=[plotmo TeachingDemos]; }; easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; ebGenotyping = derive { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; }; @@ -3244,17 +3308,17 @@ ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; }; ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; }; ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; }; -ecp = derive { name="ecp"; version="1.6.2"; sha256="0j416ns93m7vrb7dnyr4prqm213cg19hbgffvscnb67y3qwj6lic"; depends=[Rcpp Rcpp]; }; +ecp = derive { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp Rcpp]; }; edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table]; }; -editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; }; +editrules = derive { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; }; edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; }; eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; }; eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; }; eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; -effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; }; +effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[lme4 nnet lattice colorspace]; }; effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; }; ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; }; egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; }; @@ -3282,12 +3346,12 @@ emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[MASS lattice plyr rgl coda bbmle]; }; emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; }; -emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; }; +emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[dplyr data_table ggplot2 lazyeval magrittr tidyr]; }; emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; }; emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; }; -empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.1"; sha256="12w3ald2ngaj01rm98k445ai3xl3ggr58y27mfxzlsg697yrx83c"; depends=[]; }; +empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[]; }; emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; }; emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; @@ -3300,18 +3364,17 @@ english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3v enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; }; enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; }; enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; -ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; }; +ensembleBMA = derive { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; }; ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; ensurer = derive { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; -enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; }; +enviPat = derive { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; }; enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[shiny readMzXmlData]; }; epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; }; epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa4nysk0sabdgp4bzp5zxw33mf55v"; depends=[survival]; }; epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; -epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; }; epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; }; episensr = derive { name="episensr"; version="0.6.0"; sha256="005cxrwszgqar52zdrliwgg0p8j7rh2msvjd4s028z8ns334zwsb"; depends=[triangle trapezoid]; }; episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; @@ -3327,16 +3390,16 @@ erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[lmtest systemfit tseries urca ggplot2]; }; ergm = derive { name="ergm"; version="3.2.4"; sha256="004d3wrv271i0czqkp7abz9lba8g68z350b21f94ad0xfp0cwlp2"; depends=[statnet_common network robustbase coda trust Matrix Rglpk]; }; ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network ergm]; }; -ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.2"; sha256="1wfk8kh4rqw1f7dg4vsjq8nirgwyyk21r0x7x2hrd4v4ci0mcz6j"; depends=[statnet ergm]; }; +ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[network ergm statnet_common ergm]; }; ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; }; ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; -esaBcv = derive { name="esaBcv"; version="1.1.1"; sha256="0bsdxd0spfpzkaxyv1qh5n3x31qr75wgb1lizifl5j9mfi4ks7h1"; depends=[corpcor svd]; }; +esaBcv = derive { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; }; estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; }; estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; }; -etasFLP = derive { name="etasFLP"; version="1.2.1"; sha256="1jkkpzvnkf3n3jalqj90brk5n4r4znc521kgx13n45y9j8b6ni50"; depends=[mapdata rgl fields maps]; }; +etasFLP = derive { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[mapdata rgl fields maps]; }; etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; }; eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; }; eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; }; @@ -3347,9 +3410,10 @@ eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7fl events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; }; evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; -evmix = derive { name="evmix"; version="2.5"; sha256="0v1raxxxj0qhampaia2q00asprl7ra7vk3s7vvcfpzmg4476vm50"; depends=[MASS gsl SparseM]; }; +evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[MASS gsl SparseM]; }; evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; }; -evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; }; +evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[plyr Rcpp reshape2 ggplot2 magrittr tidyr vegan ape phytools mvtnorm Rcpp]; }; +evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; }; evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; }; @@ -3425,10 +3489,10 @@ faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; }; fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp Rcpp]; }; -fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; }; +fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[fastICA energy]; }; fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; }; fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; }; -fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; }; +fastR = derive { name="fastR"; version="0.10"; sha256="0bd164lij12yfqjykxj1m4rma7x2y4kpv4fspjlp1vpwqn3h4lb9"; depends=[mosaic lattice mosaicData]; }; fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; }; fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[lattice igraph MASS Matrix]; }; fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; }; @@ -3438,14 +3502,14 @@ fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; }; fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; -fbroc = derive { name="fbroc"; version="0.1.0"; sha256="1zpg796day8qlvah3d4qy8118knxx7vfa3gf50jcsv97b8r15dmz"; depends=[ggplot2 Rcpp Rcpp]; }; +fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp Rcpp]; }; fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; }; -fclust = derive { name="fclust"; version="1.1"; sha256="1nimfgirpcff5dqqx2jqn25ma9j0agffimymrv9x5ivfdncdflbg"; depends=[]; }; +fclust = derive { name="fclust"; version="1.1.1"; sha256="0gxgyvz6nzqp5sdjhfdjmm3r4lf1b4min3s5rfddwdqiswzxg8m8"; depends=[]; }; fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; }; fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; }; fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; }; fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; }; -fdakma = derive { name="fdakma"; version="1.2"; sha256="17nbaal3m2rz423fq34fia8pb75dzdzsj5d8w6g2iwckqbapszn0"; depends=[]; }; +fdakma = derive { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; }; fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[MCMCpack]; }; @@ -3457,8 +3521,9 @@ feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpc features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; }; fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; }; federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; }; +fermicatsR = derive { name="fermicatsR"; version="1.3"; sha256="0vv3i1f01rjsd17a8z2wcf3iv6xlwg7fki99z3p5h8m4g6jwljfk"; depends=[]; }; ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; -ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; }; +ffbase = derive { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[ff fastmatch bit]; }; ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; fftwtools = derive { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; }; @@ -3478,18 +3543,19 @@ fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rg finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; }; fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; }; fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; -fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; }; +fishmethods = derive { name="fishmethods"; version="1.8-0"; sha256="1n5wwwnggflq2y7j3m3kf324mwdhf45ihi25gbqyv79qklg5xcai"; depends=[MASS boot bootstrap]; }; fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[ggplot2 plyr MASS boot]; }; fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; }; fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; }; fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; -fitbitScraper = derive { name="fitbitScraper"; version="0.1.2"; sha256="10qm5j4g0vs7yg5nchwza73dpr7w3zqrkffpyl60ginvl0qlqj9j"; depends=[httr stringr RJSONIO]; }; +fitbitScraper = derive { name="fitbitScraper"; version="0.1.3"; sha256="0fh8qm4ws9idx0868rda7v1cs8g61q8zdx1ncyxijbvijhdslfgj"; depends=[httr stringr RJSONIO]; }; fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; }; flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; }; flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; }; flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; }; +flexPM = derive { name="flexPM"; version="1.0"; sha256="0zchcqsjinf3fpw5ijnygh1ywn2fdj9a6rgv7vfb44dcjgy4k74f"; depends=[]; }; flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; }; flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; flexsurv = derive { name="flexsurv"; version="0.6"; sha256="10y6v1m8w5h92y37pi26xqsb4l6wk6dz43593dngpfr9ww1j4aaa"; depends=[survival muhaz mvtnorm deSolve]; }; @@ -3497,7 +3563,6 @@ flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; }; flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; -flowr = derive { name="flowr"; version="0.9.6.5"; sha256="0nb715cgq9zgr7vr094q6y1j4dq77ckldn0f203jr368b9wqbqkh"; depends=[diagram knitr ggplot2 RSQLite reshape2]; }; flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; }; @@ -3510,17 +3575,18 @@ foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; }; foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; }; forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; }; -forecast = derive { name="forecast"; version="6.0"; sha256="13pim2jz14jy9czjjaliv8x86iqcdaglzvdl9dz3xjj47c5nhhac"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; +forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; }; forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; +forestFloor = derive { name="forestFloor"; version="1.4"; sha256="152b5pq9901bdik3dqmn4gb0aiyl8zf8mg88d8xnz839aildp2fw"; depends=[Rcpp randomForest rgl kknn trimTrees Rcpp]; }; forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; }; formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; }; -formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; +formula_tools = derive { name="formula.tools"; version="1.5.2"; sha256="1n2rw9zhrgcsjxrm108fs7sysk9jk1gmq0jmg9s7pm7ff76insnj"; depends=[operator_tools]; }; fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; }; -fpCompare = derive { name="fpCompare"; version="0.1.0"; sha256="1b5jbw6rlrx3qdn0mcga4n4505jqqr2pbz77x0vxcyn35qv9d9ql"; depends=[]; }; +fpCompare = derive { name="fpCompare"; version="0.2.0"; sha256="0s8gfnyj6kjwy3ymiy232bb5wzgkd1ainaqzlki7mcafa3dyzq0a"; depends=[]; }; fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[MASS cluster mclust flexmix prabclus class diptest mvtnorm robustbase kernlab trimcluster]; }; fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; @@ -3534,7 +3600,7 @@ fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8k frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[survival boot MASS survC1]; }; frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; }; -frbs = derive { name="frbs"; version="3.0-0"; sha256="0v2l8s5jla8jsl9izqfpxhcd1dnrxsa0czlhq1wmx5k06jvbvpdw"; depends=[]; }; +frbs = derive { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; }; freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; @@ -3549,7 +3615,7 @@ frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34w frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; fscaret = derive { name="fscaret"; version="0.9.4"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; }; fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; }; -fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; }; +fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wlrsiqb526qsh9gryx9ha4iv0rmc"; depends=[stringr oro_nifti matrixStats R_utils scales]; }; fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; }; @@ -3561,7 +3627,7 @@ funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; -funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; }; +funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; }; futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[lambda_r futile_options]; }; futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; @@ -3578,7 +3644,7 @@ g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydl gCat = derive { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; }; gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rzy1fgl892asq9lhcjslzsz89an5"; depends=[rJava JavaGD xlsxjars MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; }; -gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +gMWT = derive { name="gMWT"; version="1.0"; sha256="12ryjpq0k3brw4xy4f6j89zm94j6phbzn9ga0nr9bzfvslhqjhna"; depends=[clinfun Rcpp Rcpp RcppArmadillo]; }; gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; gProfileR = derive { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[RCurl plyr]; }; @@ -3597,7 +3663,7 @@ gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095 gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; }; gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; }; galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; }; -gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; }; +gam = derive { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; }; gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; }; gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; }; gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; }; @@ -3619,7 +3685,7 @@ gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; }; gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; }; gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; -gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; }; +gap = derive { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; }; gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; }; gapminder = derive { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7w9wa4qkpbsl2178qskzzy8168wlzayx820ad"; depends=[]; }; gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; }; @@ -3634,7 +3700,7 @@ gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs5 gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; }; gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; -gcmr = derive { name="gcmr"; version="0.7.0"; sha256="17wv1qgshakn390719r8zzd8fbbvnkfjhlbcwk2rd2pic05x8msm"; depends=[nlme sandwich geoR betareg Formula car sp]; }; +gcmr = derive { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; }; gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; @@ -3643,12 +3709,12 @@ gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd0 gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; }; gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; }; gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; }; -geeM = derive { name="geeM"; version="0.7.3"; sha256="15qbfki7ds75ws0ymwncr0y26ddnky5a882d7vh04145s1prl6xw"; depends=[Matrix]; }; +geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; }; geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; -geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; }; +geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[nlme gee matrixcalc MASS]; }; geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; }; geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; }; -gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; }; +gelnet = derive { name="gelnet"; version="1.1"; sha256="1d77v44azqpk6hzi7fl2ba6z3nyzh33xn0yp7ydp86nmf1gcgwlh"; depends=[]; }; gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; }; gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta XML plyr]; }; gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; @@ -3677,11 +3743,11 @@ geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[sp rgdal rgeos httr maptools jsonlite magrittr V8]; }; geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; }; -geomorph = derive { name="geomorph"; version="2.1.4"; sha256="19zf9g0lpkrdl3pkkjryzas42h3ng9q01ap182xxd36vr8p55sd8"; depends=[rgl jpeg ape geiger phytools]; }; +geomorph = derive { name="geomorph"; version="2.1.5"; sha256="0xys2gwin16h4ahcjy3m49sslypilxlcgrnky19vv4aagrydq776"; depends=[rgl jpeg ape geiger phytools]; }; geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; }; -geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; }; +geoscale = derive { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; geosphere = derive { name="geosphere"; version="1.3-13"; sha256="124l1mfqf4qq5qsa0k3r5hkky9q2m2waq2rp4xcym49wr3jysf6c"; depends=[sp]; }; geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; }; @@ -3693,7 +3759,7 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; }; gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; }; -ggExtra = derive { name="ggExtra"; version="0.1.0"; sha256="12b2bd8n3hyp5azdxh14dslq6mwaplvxph90dhiydkhzmya27i7i"; depends=[ggplot2]; }; +ggExtra = derive { name="ggExtra"; version="0.1.5.2"; sha256="0lad58245x5gn1yqx65rqpbjwy17yrisns6lqnaw5w1ff5bh7s9i"; depends=[ggplot2]; }; ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[randomForestSRC ggplot2 survival reshape2]; }; ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; }; @@ -3708,7 +3774,7 @@ ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; }; ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; }; ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; }; -ggvis = derive { name="ggvis"; version="0.4.1"; sha256="1sl6ygglgsg7xhzzkxaap8pzb2zmfw0y481w7r7s1nyg7pdgr0r2"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; +ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; }; giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; @@ -3745,13 +3811,14 @@ glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnb globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; +globals = derive { name="globals"; version="0.3.1"; sha256="1fjbs75m07r8gvj5pjqj8dv1xm558h4g2cpg5l1psqzs567gkcxv"; depends=[codetools]; }; glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[zoo sandwich]; }; glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; }; glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; }; gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; }; gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; }; -gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm3d4yv9l2568jcz49pa8lay4d"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; }; +gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; }; gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; @@ -3785,6 +3852,7 @@ graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; }; graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; }; greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[Hmisc data_table rms lattice latticeExtra ggplot2 Formula survival]; }; +greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[survival Hmisc survAUC]; }; gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; }; gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; }; @@ -3794,6 +3862,7 @@ gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkki grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[rrcov pls mgcv robust robustbase MASS]; }; grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; }; +gromovlab = derive { name="gromovlab"; version="0.6-16"; sha256="0ndi4i91fnndvpp3xmr405a62vq5gjagw2qrvcmq1q6cgg7bj17q"; depends=[igraph phangorn glpkAPI quadprog cluster]; }; groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; }; @@ -3802,7 +3871,7 @@ growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819 growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; }; grplasso = derive { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; -grpreg = derive { name="grpreg"; version="2.8-0"; sha256="1mfd3hzzv720zhl8s6ghw0vfpqkz8q050dwnvmmb0smhdvahd2zj"; depends=[Matrix]; }; +grpreg = derive { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; }; grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; }; gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 xtable stringr RUnit plyr]; }; gsalib = derive { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; @@ -3816,14 +3885,13 @@ gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7 gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; }; gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; }; -gstat = derive { name="gstat"; version="1.0-22"; sha256="1jbjl2irg0a2jdxwk7nr3c33jf3dzbcydpxxjmld23zzx94qy1iv"; depends=[lattice sp zoo spacetime FNN]; }; -gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; }; +gstat = derive { name="gstat"; version="1.0-23"; sha256="0as4afwlwzmi37k8sbm0kssin8mikrny88smb71c0wf616yba4xi"; depends=[lattice sp zoo spacetime FNN]; }; gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; }; gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; -gtools = derive { name="gtools"; version="3.4.2"; sha256="1s0vfi07gxaqvllidsws4f9admvc61sw19g2hvffa74sccqiwr6a"; depends=[]; }; +gtools = derive { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; }; gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; }; gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; }; @@ -3870,7 +3938,7 @@ heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; }; heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; }; -hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; }; +hergm = derive { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sjvhlfcdya6jllaj9kgn46kkvci54p"; depends=[ergm latentnet network sna]; }; heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; @@ -3880,7 +3948,7 @@ hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yj hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; }; hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; }; -hglm = derive { name="hglm"; version="2.0-11"; sha256="0yqnky2p5avxn7nv8wnk57xkd0dpk89jas6d577q50ms4dpwdl6z"; depends=[Matrix MASS hglm_data]; }; +hglm = derive { name="hglm"; version="2.1-0"; sha256="02d5m7j7c1z40kih1ywvnd32sdlshgsgagsbh9avhhpcg7lxswj9"; depends=[Matrix MASS hglm_data]; }; hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; }; hgm = derive { name="hgm"; version="1.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; }; hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; }; @@ -3924,15 +3992,15 @@ hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgz hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; }; hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; -hsdar = derive { name="hsdar"; version="0.1.3"; sha256="0vwiavzzfxz81iskgjy0af8gwh8fkjiyzhql82s2n9snvy7d36fk"; depends=[sp raster rgdal rootSolve signal]; }; +hsdar = derive { name="hsdar"; version="0.1.5"; sha256="1ii83dpndshq8d00f3dxrzcxqplcc5b85b9cixxbda5bpvrlkpg1"; depends=[sp raster rgdal rootSolve signal]; }; hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[stringr knitr magrittr]; }; htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; -htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; }; +htmlwidgets = derive { name="htmlwidgets"; version="0.4"; sha256="079y3b3d4na582a1wmb5nc5cyrmmld4v7c1vc08cbfsg43w026zn"; depends=[htmltools jsonlite yaml]; }; hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; -httk = derive { name="httk"; version="1.1"; sha256="198zxzap9m8c6rlzqjfrg6b9pvgbksk2myq5cw7j37j63lfnblki"; depends=[deSolve msm]; }; +httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; }; httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; }; httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; }; @@ -3942,7 +4010,7 @@ hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9 hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; }; hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; }; -hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; }; +hybridEnsemble = derive { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[randomForest kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch rotationForest FNN glmnet]; }; hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; }; hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; }; @@ -3954,7 +4022,7 @@ hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6 hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; }; hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; }; hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; }; -hypervolume = derive { name="hypervolume"; version="1.2.2"; sha256="1nc5hybw5aa5pdrf9j1jv6d69q1im7whz0d05rmyskcayy2x3pyi"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; +hypervolume = derive { name="hypervolume"; version="1.3.0"; sha256="07pnbkdqm4jssv6h31q68mawckiyxczsjfw4gndpyvxnl44p0qrz"; depends=[Rcpp rgl MASS geometry ks fastcluster Rcpp RcppArmadillo]; }; hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; }; hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; }; @@ -3974,7 +4042,7 @@ iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6q ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[lpSolve MASS car lsmeans multcompView]; }; ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; }; -ibelief = derive { name="ibelief"; version="1.0"; sha256="1mcmq1zpj1f6alhnsznb27iknp7dzdsd25di8a64hw5c3cnx3xay"; depends=[]; }; +ibelief = derive { name="ibelief"; version="1.1"; sha256="164cd68qq0z68n5j0b192krpk73y8cy15wr5wnb52rzxv5k7rfd4"; depends=[]; }; ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[RODBC MASS]; }; ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; }; ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; }; @@ -3985,13 +4053,15 @@ icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkql icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; }; icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[Rcpp checkmate Rcpp]; }; -icenReg = derive { name="icenReg"; version="1.1.1"; sha256="0q1h94r6sv56jxrg1lxc8ms1drrcrqf7k888jb63qmg4wscp33bi"; depends=[survival foreach]; }; +icenReg = derive { name="icenReg"; version="1.2.4"; sha256="0fqwg1xmks9zkmbnr1dala4b13l85ibqfd96w4vvrfhmvakqra1r"; depends=[survival foreach]; }; icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; }; idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; +idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijdvqwgrdvh5ykiqifi8kc5xm"; depends=[corpcor ggplot2 dummies animation ca]; }; idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; +ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; }; ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; }; ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; }; ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; @@ -4015,19 +4085,21 @@ indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7 indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; }; ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; -inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; }; +inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[numDeriv lme4 Formula]; }; inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; }; influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; }; -influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; }; +influence_SEM = derive { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; }; infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; +infuser = derive { name="infuser"; version="0.2"; sha256="1x585glkffw4kq8d13md4ksbrmqvp11pr05w5pp2z6rcxldaf5vd"; depends=[]; }; infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; inline = derive { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; }; inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; }; insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; +install_load = derive { name="install.load"; version="1.0.3"; sha256="0fvync9v712r4l6053bncl8a0rgjq0nfnrnpc0yxc2m3mxf5hzvr"; depends=[]; }; insuranceData = derive { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; intReg = derive { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[miscTools maxLik sets]; }; intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; }; @@ -4094,13 +4166,13 @@ ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kq jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; }; jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; }; jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; }; -jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; }; +jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[lattice rjags coda]; }; james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; }; jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp Rcpp]; }; jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; -joint_Cox = derive { name="joint.Cox"; version="1.0"; sha256="1460i8ydwd0ix3slm9bn8jca5b1vs0w2wwx1md4npbmf5ly5x42l"; depends=[]; }; +joint_Cox = derive { name="joint.Cox"; version="1.1"; sha256="1zkj9ynxq521s23dz93m63valjf4amm19dcmcm8844fvnzbr7z4h"; depends=[]; }; jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jomo = derive { name="jomo"; version="0.2-0"; sha256="09vccbvy9y5p5w049l2v5qr1xbs915sihpddnrrjr4cc1w17ifzs"; depends=[]; }; @@ -4118,11 +4190,13 @@ kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgaz kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; }; kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; }; kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; }; -kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; }; +kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[randomForest AUC genalg kernlab]; }; kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; }; +keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; }; kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; }; kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; }; kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; }; +kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm splancs sp plotrix MASS]; }; kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; }; kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; }; kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; }; @@ -4136,11 +4210,11 @@ km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwg kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp Rcpp]; }; kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[survival mitools]; }; -kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; }; -kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; }; +kml = derive { name="kml"; version="2.3.1"; sha256="1bnd8ssbhijxd9c9x7qn96jdkj1f1jnm46nw86164issxc6ypm5a"; depends=[clv longitudinalData]; }; +kml3d = derive { name="kml3d"; version="2.3"; sha256="0dlpxp8bbrwgblrl1hnc1ip592abc6sdcl87s4m6jwgfaxjcq7a8"; depends=[clv rgl misc3d longitudinalData kml]; }; kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; -knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; }; +knitcitations = derive { name="knitcitations"; version="1.0.6"; sha256="18jfrzazbk8cy9i7qvmmrn8c5cmkxvmdd894jpvak2gplxvsdx91"; depends=[RefManageR digest httr]; }; knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[evaluate digest formatR highr markdown stringr yaml]; }; knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; }; knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; @@ -4161,12 +4235,13 @@ kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7g ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; }; kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; -kyotil = derive { name="kyotil"; version="2015.2-27"; sha256="0xx54b332bfg0b69m80d2qafcy7bwc5b7paq3x02rkh6xllsnq4y"; depends=[]; }; +kwb_hantush = derive { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[lattice hydroGOF]; }; +kyotil = derive { name="kyotil"; version="2015.5-20"; sha256="08rpprs58c100x7sjxhvxm76msy888pvr1hy40k1b8gw0yw7fks7"; depends=[]; }; kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; }; kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; -laGP = derive { name="laGP"; version="1.1-3"; sha256="11blzdnil0nw3q5vf4y1rv7l4zxjx8ilynv9jpkm14azv5dsr8jw"; depends=[tgp]; }; +laGP = derive { name="laGP"; version="1.1-5"; sha256="15p958c95a68gr2xs8aw0l0sp0appv6islfbidlvxm8ph252hw6d"; depends=[tgp]; }; labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[mgcv MASS rgl cluster]; }; label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; }; labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; @@ -4177,8 +4252,9 @@ laeken = derive { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[maptools rgdal raster rgeos sp geosphere]; }; laketemps = derive { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; +lamW = derive { name="lamW"; version="0.1-1"; sha256="1ndf3rkkp87pivhymyqa3n5ng5y1kaa79ay84p4yk4z4h2887nq3"; depends=[Rcpp Rcpp]; }; lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; }; -lambda_tools = derive { name="lambda.tools"; version="1.0.6"; sha256="13yxrgsam47adv08zl01harjq37pccfsar105b6ccf2qv3lrkdk7"; depends=[lambda_r]; }; +lambda_tools = derive { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; }; landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; }; languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; @@ -4197,6 +4273,7 @@ lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7 lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; lavaan = derive { name="lavaan"; version="0.5-18"; sha256="0ih5wvhmxln3w5h7q5w6gsmbs3w8118l9hc2afgsnzpg8a5jy1n3"; depends=[MASS mnormt pbivnorm quadprog]; }; lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; }; +lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b669s8cx61krmb97jlwjy2nb6r81i"; depends=[V8 jsonlite magrittr]; }; lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[mvtnorm VGAM Kendall Hmisc]; }; lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; }; @@ -4215,7 +4292,7 @@ ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dr ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; -leafletR = derive { name="leafletR"; version="0.3-2"; sha256="183qrfmcanb4c5n3w0vd9xb5mcygjfjc4qr1mzz5jxgjd039g28n"; depends=[brew jsonlite]; }; +leafletR = derive { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; }; leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; }; leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; }; learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; @@ -4226,15 +4303,15 @@ lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; }; -lfe = derive { name="lfe"; version="2.2-1699"; sha256="1a2y4f25isvnvk0yg6j36s729makr8b1bzwivx4x67aqg8fd09rv"; depends=[Matrix Formula xtable]; }; -lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; +lfe = derive { name="lfe"; version="2.3-1709"; sha256="0q6va05n38225a7sbk0ykdrygzjk6js6afm2vyy5fac1hbvihb05"; depends=[Matrix Formula xtable]; }; +lfl = derive { name="lfl"; version="1.1"; sha256="1hrdhp2r17qwns5hya9sl03q93h934whqyqsn8mdrsavc64i649v"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; }; lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; }; lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; -libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; +libamtrack = derive { name="libamtrack"; version="0.6.1"; sha256="0kg3lp1f40hymr2nxq7immxnqryavad91xp6l6x4qyp0cb02870a"; depends=[]; }; lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp Rcpp]; }; likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; @@ -4253,13 +4330,14 @@ lintr = derive { name="lintr"; version="0.2.0"; sha256="14jaghvd0kz271j6wl8j0y31 liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; }; lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; -list = derive { name="list"; version="7.1"; sha256="1avbps4di6rhy6rvfyky336zqab65ibfjw2hwp1r713psbmf9z16"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; }; +list = derive { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog corpcor mvtnorm coda]; }; +listenv = derive { name="listenv"; version="0.3.0"; sha256="14zi2zs6jxcq0j5knf5nlr06xk7n0vvfgbh2lqdjq0pvjbm8j08b"; depends=[]; }; llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4zfxkqksbp049v6d9xd2q14i9kphv2"; depends=[mlr rJava parallelMap ggplot2 checkmate]; }; lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; }; lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; }; lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; }; -lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; }; +lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; }; lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; }; lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[numDeriv statmod lmeNBBayes]; }; lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; @@ -4279,7 +4357,7 @@ lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zly lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; }; lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; }; lmomco = derive { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; }; -lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; }; +lmtest = derive { name="lmtest"; version="0.9-34"; sha256="0bhdfwrrwjkmlw0wwx7rh6lhdjp68p7db5zfzginnv3dxmksvvl6"; depends=[zoo]; }; loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; }; localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[ggplot2 MASS foreach matrixStats]; }; @@ -4290,10 +4368,10 @@ locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm lodGWAS = derive { name="lodGWAS"; version="1.0-3"; sha256="1fb70p2mvp742557ns44ilb9m85aqq59p5x6vdrmb22hczsjj6q4"; depends=[survival rms]; }; loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; }; log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; }; -logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; }; +logbin = derive { name="logbin"; version="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; }; logconPH = derive { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; }; logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; }; -logcondens = derive { name="logcondens"; version="2.1.2"; sha256="0lnsyjl77l9024pqncyxwivmj05f5mfa3563jql47jajaai0my8y"; depends=[ks]; }; +logcondens = derive { name="logcondens"; version="2.1.3"; sha256="0fg7dsila67k80kbh1m1l69pb0pwwr893lkian7a8abx3a1qclij"; depends=[ks]; }; logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; }; logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; }; logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; @@ -4308,11 +4386,11 @@ lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvb longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; longclust = derive { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; }; longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; }; -longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; }; +longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2saga04if2zp3ylz720q8451f7a7aiva5hpj471wxd0948592"; depends=[clv class rgl misc3d]; }; longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; }; loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; -loopr = derive { name="loopr"; version="1.0.0"; sha256="19gk3phi45ylkvdfyyr0j0r13ndz7wxl73x0znp2n59vazdgy24w"; depends=[plyr dplyr magrittr lazyeval R6]; }; +loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[plyr dplyr magrittr lazyeval R6]; }; lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; }; lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; }; @@ -4330,13 +4408,13 @@ lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; }; lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; -lsmeans = derive { name="lsmeans"; version="2.17"; sha256="0jpyqrc84w1zxgw7vbrp2263fcbk8rahxq2lqhcf8by47xcgk5kk"; depends=[estimability coda multcomp plyr mvtnorm]; }; +lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[estimability coda multcomp plyr mvtnorm]; }; lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; -ltmle = derive { name="ltmle"; version="0.9-5"; sha256="07z576ry6i73l4jp073l360gvhzfdq845x43vrpfq258h7mqhgg4"; depends=[Matrix]; }; +ltmle = derive { name="ltmle"; version="0.9-6"; sha256="0q65ha7j3q9myhsafcmjwyxjf486xw4c3d17gpdnsvq4zqgfsy16"; depends=[Matrix]; }; ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; }; ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; }; @@ -4361,21 +4439,20 @@ mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6 mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; }; madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; -magicaxis = derive { name="magicaxis"; version="1.9.3"; sha256="0dxlqpxw82v9cxfp475ppd02ywvlg96b1cfj02fjvs04xfprhar0"; depends=[MASS plotrix sm]; }; -magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; }; +magicaxis = derive { name="magicaxis"; version="1.9.4"; sha256="0kgr29q4v9aq10l6zkddgv93zl66yzwxx9jsnskkx3r0kk3rlxa3"; depends=[MASS plotrix sm]; }; magrittr = derive { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; }; makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[stringr assertthat]; }; -manifestoR = derive { name="manifestoR"; version="0.9-12"; sha256="1hz45555941b9jplac4l8l6h4dn387fp4nk873c17mds7xaxzidq"; depends=[NLP tm dplyr httr jsonlite functional]; }; +manifestoR = derive { name="manifestoR"; version="1.0-1"; sha256="1008bz2vsmhx0sx6kc55z8dhlfinbadagz4hd0p50c4q86ibl7lh"; depends=[NLP tm dplyr httr jsonlite functional zoo psych]; }; manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; }; mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; }; mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; }; mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; -mapmisc = derive { name="mapmisc"; version="1.2.1"; sha256="1sds83cbsdfb6ac2y13fy1lm7bi27qzkkpjv1cjml8yjwcazfbfj"; depends=[sp raster]; }; +mapmisc = derive { name="mapmisc"; version="1.2.4"; sha256="07h237sgsycagn61rharb09q9s8da777hzngh4py1sbv6gfyqpv8"; depends=[sp raster]; }; mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; }; @@ -4387,12 +4464,13 @@ marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; }; marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; }; -markovchain = derive { name="markovchain"; version="0.2"; sha256="03lmvnfdcn4s274ydi5i8xwwm8bl4fv64dwm8mb61nf0i5d0w6ky"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; }; +markovchain = derive { name="markovchain"; version="0.2.1"; sha256="0ix7sdcnsc4bl9diddfl4q0lmq1nq8bp1d7arxzcjj4zy35vhkv5"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; }; marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; }; marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; }; -matchingMarkets = derive { name="matchingMarkets"; version="0.1-3"; sha256="1q76sw77r90m8wrzj2d81w0fnkqfg8fz5sgpc7m64c5if82z3awa"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; }; +matchingMarkets = derive { name="matchingMarkets"; version="0.1-4"; sha256="096yknmzla2qq2vkaxna5f8mclayjn5baff3cm8ik95zy7j3lrjp"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; }; +matchingR = derive { name="matchingR"; version="1.0.1"; sha256="0qqk2zcyj0m3r9q0lclb39gdrjqqjlaxvk3cxpfah7hxhhkrk4mc"; depends=[Rcpp Rcpp RcppArmadillo]; }; mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; }; matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; }; matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; @@ -4428,13 +4506,13 @@ mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2b mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; }; mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; }; -mda = derive { name="mda"; version="0.4-6"; sha256="0v6avsq1j3vd8pmnilxcbx6v42kb5gvsy03q2srwzf3z04807n8i"; depends=[class]; }; +mda = derive { name="mda"; version="0.4-7"; sha256="1hjmjrdr6zfccsd4xln1jvkkvk25igppvnl6mqznfc7qsmk459cy"; depends=[class]; }; mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; }; mded = derive { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; }; mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; }; measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; }; -meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; }; +meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; }; medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; }; @@ -4456,24 +4534,27 @@ metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34 metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; }; metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; +metaSEM = derive { name="metaSEM"; version="0.9.4"; sha256="1d790z462g9qnrxl5p3a50abaachc2wih10zsk6jpbf10z694g13"; depends=[OpenMx Matrix MASS]; }; metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; }; metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; }; metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; }; metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; }; -metafor = derive { name="metafor"; version="1.9-6"; sha256="1bjhzkim64035xk04kc1ra4ih6gxfsn389gag21mf9zhk0mi6yd0"; depends=[Matrix]; }; +metafor = derive { name="metafor"; version="1.9-7"; sha256="1gnq9qrz3ym9az9s6pi48dx7j3znrp9knbdmh4qpdhjkdlpa55d1"; depends=[Matrix]; }; +metagear = derive { name="metagear"; version="0.1"; sha256="1c00y7p7063f3c1ar17r9ij5j4chzyispg0wprkjaaz0mx9w1hb0"; depends=[gWidgetsRGtk2 gWidgets stringr metafor MASS Matrix]; }; metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; }; metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; }; metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; }; -metaplus = derive { name="metaplus"; version="0.7-1"; sha256="17wn2x8dnfzm98bd007axq9ak38hphx08vqpk6ba0jahlfvqqdiz"; depends=[bbmle metafor boot numDeriv lme4 MASS]; }; +metaplus = derive { name="metaplus"; version="0.7-2"; sha256="1d9528z78vmkmv67s29g87kfdwydfwx4cnbcdmd0kq8rch9zjk07"; depends=[bbmle metafor boot numDeriv lme4 MASS]; }; metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; }; metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; -meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkgi50xbx3n26apdm6i29a2302vabfz0z3czafd76wkwg7"; depends=[raster sp zoo ncdf rjson]; }; +meteoForecast = derive { name="meteoForecast"; version="0.45"; sha256="0p74w5zcibzw2vpbyl4jb2wzpz0pki1n1l66hjs6dnkrn52zph95"; depends=[raster sp zoo ncdf]; }; meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; -mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5a36s2dqx42kzwbzgvp1m11z225"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; +mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; }; mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; }; mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[nlme Matrix]; }; +mglmn = derive { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; }; mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; }; mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; }; @@ -4487,7 +4568,7 @@ micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwp micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; }; micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; }; mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; }; -miceadds = derive { name="miceadds"; version="1.1-1"; sha256="1hzx9gf73kgpaa1l0889ybc8qsi703sc4z8wd8jfayhi57rigikb"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign Rcpp RcppArmadillo]; }; +miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign sjmisc multiwayvcov Rcpp RcppArmadillo]; }; microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; }; micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[maptools RColorBrewer rgdal sp ggplot2]; }; micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; }; @@ -4519,9 +4600,10 @@ missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfka missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5dx1mn4z0sd1lf9a8fp7dg29bnv82brmh"; depends=[FactoMineR]; }; mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; }; mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; }; +mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[pan haven]; }; mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; }; -mixAK = derive { name="mixAK"; version="3.10"; sha256="1mma3515p1r5nhbmdyxzvv73ni5iw4arnzq94nw9gib1dgjpm7c5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; +mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; }; mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -4538,13 +4620,15 @@ mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9 mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; mixtNB = derive { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; mixtools = derive { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; }; +mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11dawza2yslh67bj7gi9v5awzcf4n2v7"; depends=[]; }; mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; }; mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; }; mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; }; -mkin = derive { name="mkin"; version="0.9-34"; sha256="0g0r30hs5ja2x1mwj336x8y3p0b33asfql076w2krmw38xkpla44"; depends=[minpack_lm rootSolve FME deSolve]; }; +mkin = derive { name="mkin"; version="0.9-35"; sha256="0ac71wkl8b034l1bbv8qr5ynvpl8l9j31ych5v5pf6mmqs62bwnr"; depends=[minpack_lm rootSolve FME deSolve]; }; mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; }; mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; +mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[plyr lme4 arm qgraph]; }; mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[shiny XML circlize]; }; mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; }; @@ -4557,7 +4641,7 @@ mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4s mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; }; mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; }; -mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; }; +mlxR = derive { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 XML Rcpp]; }; mma = derive { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; }; mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; }; mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; @@ -4570,13 +4654,14 @@ mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gk mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; }; mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; }; -mnlogit = derive { name="mnlogit"; version="1.2.0"; sha256="0ymkm3xwm97v5f9lg2ir4czdfb47hibgrkirc2iw66fh24iah84m"; depends=[mlogit lmtest Formula]; }; +mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[mlogit lmtest Formula]; }; mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; -mnormt = derive { name="mnormt"; version="1.5-2"; sha256="0k3mj7yyh599z93iw8zhfwvj6xjl4g2wzs3hdj1df7vbz1yynp8i"; depends=[]; }; +mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; }; modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; }; modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; }; +modelObj = derive { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; }; modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; }; @@ -4586,7 +4671,7 @@ mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dp momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; }; moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; -mongolite = derive { name="mongolite"; version="0.2"; sha256="0lyq565c8xqxcm5sbg1rp3myppbw4hbqr3fiqzvcqpp72ar6ywvv"; depends=[jsonlite]; }; +mongolite = derive { name="mongolite"; version="0.4"; sha256="0jrjf9sh8y7n4lgy54y5pl9dw6z4c5qb903l0907finm749cb2w1"; depends=[jsonlite]; }; monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; }; monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; }; monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; }; @@ -4596,7 +4681,7 @@ moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fay mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; }; -mosaic = derive { name="mosaic"; version="0.9.2-2"; sha256="1fx3nbndvvif1pwl013clh91s229yg7fnr0kp842jyx03hkcinba"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; }; +mosaic = derive { name="mosaic"; version="0.10.0"; sha256="0hhln6kfxdk6z4rmi3378cs18ziwa5awi53ylnx5kva7f42m5jxr"; depends=[car dplyr lattice ggplot2 mosaicData lazyeval MASS reshape2 plyr readr latticeExtra gridExtra ggdendro]; }; mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; }; moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; }; mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; }; @@ -4606,9 +4691,10 @@ move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a5 mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; }; mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; }; mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; -mpath = derive { name="mpath"; version="0.1-17"; sha256="031mf0b32435y0cfar7zh9d1wd62ghqpspipin1cjhvnr2lyzw21"; depends=[MASS glmnet pscl numDeriv]; }; +mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[MASS glmnet pscl numDeriv]; }; mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; }; +mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[leaps foreach bestglm doParallel plyr shinydashboard shiny googleVis]; }; mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; }; mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; }; mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; }; @@ -4658,7 +4744,7 @@ multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5g multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; }; multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; }; -multiplex = derive { name="multiplex"; version="1.5"; sha256="1sc4jnmh3lfpx92cpqd8phm09dn9xaq4qdq9301dccw3f0m260md"; depends=[]; }; +multiplex = derive { name="multiplex"; version="1.6"; sha256="052qjqkwf2sp4w7hv5gj9x3vhwjpa6k10sr969283z7aw6c1yb4g"; depends=[]; }; multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; }; multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; }; @@ -4679,7 +4765,7 @@ mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7s mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; -mvabund = derive { name="mvabund"; version="3.9.3"; sha256="1vr4rw8ivkhmzrpvz2k8v594cavrw88i7nqr9g1mar76d9mpchkx"; depends=[Rcpp MASS tweedie statmod Rcpp]; }; +mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[Rcpp MASS tweedie statmod]; }; mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; }; @@ -4687,7 +4773,7 @@ mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6j mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; }; mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; }; mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; }; -mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; }; +mvmeta = derive { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; }; mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; }; mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; mvngGrAd = derive { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; }; @@ -4704,7 +4790,7 @@ mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem rJava MASS]; }; mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny Rcpp]; }; mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; -myTAI = derive { name="myTAI"; version="0.0.2"; sha256="1qnnlf8c8qkcvl5sh9qd19drlfmjhmy3grxhlnlbz7v11zcbvah8"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; }; +myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; }; mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; }; myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; @@ -4714,21 +4800,22 @@ nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6 nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; }; -nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; }; -nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; }; +nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[Rcpp Rcpp RcppEigen BH]; }; +nadiv = derive { name="nadiv"; version="2.13.3"; sha256="0ph05a1yvphij41fgm4gnvijqni29n4jx2my6s0pd9l67bwa56c8"; depends=[Matrix]; }; namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; }; nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; -nat = derive { name="nat"; version="1.6.4"; sha256="1a4wr1378y8crmpk150gmzjc12wn4q9l6nbghddizyw9827b5my1"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; }; +nat = derive { name="nat"; version="1.6.6"; sha256="0jqpj9hrz8xqikl84b9nzi1hh82cmry18vpca7s8dl4824yadkrw"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; }; nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; }; nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; }; nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; }; naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; -nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; }; +nbconvertR = derive { name="nbconvertR"; version="1.0"; sha256="1yjsw5aq68ya4k1nl2n6q5d5z5yzqskgnpj3gms67ha3dhmz78jr"; depends=[]; }; +nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; }; ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra scales gtable PerformanceAnalytics lattice knitr xtable reshape2]; }; ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; }; -ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; +ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky70max1rfhimblnqf41phndxjcsv"; depends=[]; }; ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; }; @@ -4740,12 +4827,12 @@ neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; -neotoma = derive { name="neotoma"; version="1.2-0"; sha256="0mb7b4qncn63nppq3hxl3a6hgipb413rygsm9qhira61ysnay51m"; depends=[RJSONIO RCurl plyr reshape2]; }; +neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[RJSONIO RCurl plyr reshape2]; }; nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; -nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; }; +nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; }; netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; netassoc = derive { name="netassoc"; version="0.4.3"; sha256="153zgnmk9qjcxhfdy9g1fkgjx0vpyv55gmj4spk664igvw6kicf3"; depends=[igraph]; }; -netgen = derive { name="netgen"; version="1.0"; sha256="01j5s80k658wcp8ml2kyf10dvajp4crrxcad65rs03grak1q5mkv"; depends=[BBmisc mvtnorm lhs ggplot2 lpSolve checkmate]; }; +netgen = derive { name="netgen"; version="1.1"; sha256="0wbsssskhih6fyb0xfpnd3sjp25z8h0jyy3437ykgh7g24hh0i1z"; depends=[BBmisc mvtnorm lhs checkmate ggplot2 lpSolve igraph stringr]; }; netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[cvTools corpcor glasso glmnet igraph]; }; netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; }; nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; @@ -4772,7 +4859,7 @@ nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh5 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; }; nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; }; -nleqslv = derive { name="nleqslv"; version="2.7"; sha256="1livdnwrs8vzsbhvjqf3rmnanaywsr464jb6988s6pmyc2b0q9zp"; depends=[]; }; +nleqslv = derive { name="nleqslv"; version="2.8"; sha256="1jkf02mcz16d8h8b7h5m13lpx6z2shpap5vncapszwa9js6vps67"; depends=[]; }; nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; }; nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; }; nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; @@ -4790,11 +4877,12 @@ nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfb nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; }; nnlasso = derive { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; }; nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; -nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; +nodeHarvest = derive { name="nodeHarvest"; version="0.7-2"; sha256="18lmp7mly3ad95yz2cv330bg7y9fwldvagnzvjx0zgsx81f3bncr"; depends=[quadprog randomForest]; }; nodiv = derive { name="nodiv"; version="1.0.3"; sha256="0fwx7f30qxfnhgzn5lrphwv0clvap3w887xf6316lbr86sjw4x3v"; depends=[picante raster ape sp vegan]; }; noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; +nomclust = derive { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; }; noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; -nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; }; +nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix rgl tseries TSA Rcpp Rcpp]; }; nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; }; nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; }; nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; }; @@ -4809,6 +4897,7 @@ normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40 nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; }; nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; +novelist = derive { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; }; noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; }; @@ -4849,12 +4938,15 @@ obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rd obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; oc = derive { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; }; occ = derive { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; }; -oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; }; +oce = derive { name="oce"; version="0.9-17"; sha256="0j1sj9qlcg0yrdhpqinrpaa8dv4d8c8hjl48028x75frsc784pip"; depends=[gsw]; }; ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; }; -ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; }; +ocedata = derive { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; }; +odds_converter = derive { name="odds.converter"; version="1.1"; sha256="0x57hrb54pvk1prxl87yz3mwvxf3fxranzg706vdiwkcnjc4damm"; depends=[]; }; +odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[Rcpp Rcpp BH]; }; odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp Rcpp RcppArmadillo]; }; +oglmx = derive { name="oglmx"; version="1.0.2"; sha256="1yln1ysk19mxnb0aq74xgqj0qqipqg3qbczyhdygakjd4v4ndvhg"; depends=[maxLik]; }; okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; @@ -4871,11 +4963,12 @@ openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795v openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; }; opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; }; openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; }; -operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; +operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; }; operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; }; ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; }; +optCluster = derive { name="optCluster"; version="1.0.0"; sha256="1qpymgdy4pcl5isz88m2bb734c2c2qlh77c0i8c1wy4hkrx5ndpl"; depends=[clValid RankAggreg mclust cluster gplots kohonen MBCluster_Seq]; }; optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; }; optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; }; optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; }; @@ -4894,11 +4987,12 @@ orca = derive { name="orca"; version="1.1"; sha256="138qqjklwd3g4dfg9j2438kzpsdc orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; }; ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; }; -ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; }; +ordPens = derive { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; }; orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; }; orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; }; ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; }; +ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[fastGHQuad boot ucminf]; }; ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; }; orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; }; @@ -4931,7 +5025,7 @@ pacbpred = derive { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idx pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; }; -packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; }; +packS4 = derive { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; packrat = derive { name="packrat"; version="0.4.3"; sha256="0sfv7vl9afvv2rpqk39hbrvhq6z54ilqjrff4j3parsfqvg7gaqf"; depends=[]; }; pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; }; @@ -4948,21 +5042,25 @@ paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2s paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; }; paleotree = derive { name="paleotree"; version="2.4"; sha256="1rrsxll5qcvr9a96wg5bdljvyy7zy26zd9f0b17xswmp77gxmahb"; depends=[ape phangorn]; }; palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; +palr = derive { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; }; pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; }; pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; }; pampe = derive { name="pampe"; version="1.1.1"; sha256="1ha4jbmi2j35i375ziv4rbs4rijlp6fxwvb0vfr2905d1vl3cbap"; depends=[leaps]; }; pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; }; pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; }; -pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; }; +pander = derive { name="pander"; version="0.5.2"; sha256="0zs2c00dr0vph9d4par3zcisnyqa98rqym8fpya02ka28qajjiia"; depends=[digest Rcpp Rcpp]; }; panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; }; +papeR = derive { name="papeR"; version="0.6-1"; sha256="1h3mfapn31qphaly01j5pw2ci65g4z0wh4m1wf5r808cspn0mya0"; depends=[car gmodels]; }; parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; -parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29nj4mybgh8cr0h4wsadsf2wlyzppx5hg5yi27ff2"; depends=[BBmisc checkmate]; }; +parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; }; +parallelSVM = derive { name="parallelSVM"; version="0.1-8"; sha256="19hmagv95nx8aw8xylk5vvpxw9a4fsa68r9q0x6irhq50wmah93r"; depends=[e1071 foreach doParallel]; }; parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; }; paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[mboost party iterators plyr caret glmnet doParallel]; }; parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; }; +parfm = derive { name="parfm"; version="2.5.8"; sha256="05bzmm5ahaip5apsv84fbqy8bag9pkkfsxvqw1cbcvlbr2zyxfgp"; depends=[survival eha msm]; }; parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; }; parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; }; parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; @@ -4973,14 +5071,15 @@ partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpx partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; }; +partools = derive { name="partools"; version="1.0.1"; sha256="0id6fw582ag0zwkp0yjm5vfcd2gv1bsa3zzhfx2fgiaarhnhzmda"; depends=[]; }; partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; -party = derive { name="party"; version="1.0-20"; sha256="10d4hyzc8icgb51k4dkc1bwprky7sg35vpa9s3jcl9ifw6na0bgm"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; }; +party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; }; partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; }; parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; }; pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; }; -patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; }; +patchDVI = derive { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; }; pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; }; @@ -4988,7 +5087,7 @@ pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; pathological = derive { name="pathological"; version="0.0-6"; sha256="1a6a9q15nk8rcpyz5xpndq0gbdv7y2iq4jgqiv7sgd3j1agh26c6"; depends=[assertive plyr stringr]; }; pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; -pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; }; +pavo = derive { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[rgl geometry mapproj rcdd]; }; pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; }; pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; }; pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; }; @@ -5005,14 +5104,15 @@ pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; }; pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; }; +pcaBootPlot = derive { name="pcaBootPlot"; version="0.1.0"; sha256="0h5i5qh4lhnhh7n9k1map10gvw70f7576gnxhjjc6l03sngm0yp7"; depends=[RColorBrewer]; }; pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; }; pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; }; -pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; }; +pcalg = derive { name="pcalg"; version="2.2-0"; sha256="1cgir5h9g8v3kjmdqnnjsc0z1f8wl3flnnxnk9y7km82x5pby0m7"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc fastICA clue gmp Rcpp RcppArmadillo BH]; }; pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; -pcnetmeta = derive { name="pcnetmeta"; version="2.1"; sha256="00vrlkzc6d5xgs4my8qr6f9skyjdi3i529i9sfmdcwwrwp2spr24"; depends=[rjags coda]; }; +pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[rjags coda]; }; pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; }; pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; -pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; }; +pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; }; pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; }; pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr zoo xts XML lubridate jsonlite reshape2]; }; @@ -5026,8 +5126,8 @@ pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2kl pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; }; pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; }; pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; -pedometrics = derive { name="pedometrics"; version="0.4-1"; sha256="0pzkkjp126g64q6avlk7bqrhcl6y5zz8vmfrq68k4yck34c1gn16"; depends=[car fields gstat lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; }; -pegas = derive { name="pegas"; version="0.7"; sha256="1vhlg40jz938h63isi5c8cjfqrwnh5miyl5kg2hbybw9awlp6gjj"; depends=[ape adegenet]; }; +pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; }; +pegas = derive { name="pegas"; version="0.8"; sha256="0074r6vsnvdc0gkqhb3cb4dybpgp4ryf38lrfkk8vrs3y9gb7hdh"; depends=[ape adegenet]; }; penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; }; penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; }; penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; }; @@ -5045,14 +5145,15 @@ performanceEstimation = derive { name="performanceEstimation"; version="1.0.0"; perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; }; permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; }; -permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; }; +permute = derive { name="permute"; version="0.8-4"; sha256="1z5pmq9dy93rpsdb73waqrqmnvvi9ygx1v5l81a2n1j1kb4lmksv"; depends=[]; }; perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; +perspectev = derive { name="perspectev"; version="1.0"; sha256="1qqhja7vqji9313dxxy1a9a50h5zxwxgc5s16lssczjachkqaibk"; depends=[ggplot2 foreach ape doParallel mapproj boot sp]; }; perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; }; pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; -pgirmess = derive { name="pgirmess"; version="1.6.0"; sha256="0b2sxk2q4cylsb5ch9bq1grdifp2sww7bv1bgl9zn0j6h611gif5"; depends=[boot nlme rgdal sp spdep splancs]; }; +pgirmess = derive { name="pgirmess"; version="1.6.2"; sha256="02i2jp345hyzz0s3rfxn3rpx0yl1aw6r0r0zaw471j5l9m6s85kw"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; }; pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; @@ -5079,7 +5180,7 @@ phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m5 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; }; phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; }; phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; -phylocurve = derive { name="phylocurve"; version="1.0.0"; sha256="13gfavzkkicqcmdxfh9779a81kjgffskchqm0ygqkwhy9afnsxwr"; depends=[ape geiger phytools abind phylolm]; }; +phylocurve = derive { name="phylocurve"; version="1.1.0"; sha256="03jvq9cdbch860910qjwg16y7h8jq9zn0iaak9daza65arch8fv0"; depends=[drc ape geiger phytools abind phylolm GPfit dtw]; }; phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; }; phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; }; @@ -5092,7 +5193,7 @@ pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; }; pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; }; -pipe_design = derive { name="pipe.design"; version="0.1"; sha256="0hy3n15b4a2319xn2gix9vca3qryy7hjsxlh0z8k96l24ql0r62z"; depends=[ggplot2 gtools]; }; +pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; }; pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; }; pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; @@ -5120,17 +5221,17 @@ plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; }; plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; }; -plotmo = derive { name="plotmo"; version="3.1.0"; sha256="1z735ks92d1gfx6hk29mnj18a9hpsmifjy8qgh5lv9z0mwd7igca"; depends=[plotrix TeachingDemos]; }; +plotmo = derive { name="plotmo"; version="3.1.1"; sha256="08vl41an94l3f7hkd2lzpqgzxsp4wyh24lnay3lpmc3ra2ycpbmg"; depends=[plotrix TeachingDemos]; }; plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; }; -plotrix = derive { name="plotrix"; version="3.5-11"; sha256="01vb3i7hkc3krvl9v4f8fnpfcv62p4ci2vbm2qs5w593h70bys7c"; depends=[]; }; +plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; }; pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; }; plsRbeta = derive { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[mvtnorm boot Formula plsdof MASS betareg plsRglm]; }; plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; }; plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; }; plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; -plsgenomics = derive { name="plsgenomics"; version="1.3"; sha256="0gzk7sgv6bqkay7j854xsmyr3vwsdb2dbcnffv1ygdxikj64icp4"; depends=[MASS boot]; }; -plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram tester turner]; }; +plsgenomics = derive { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[MASS boot]; }; +plspm = derive { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[tester turner diagram shape amap]; }; plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; @@ -5142,7 +5243,7 @@ pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiq pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; }; pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; }; pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; }; -pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; }; +pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; @@ -5152,7 +5253,7 @@ pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qym poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; }; -pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; }; +pointdensityP = derive { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; }; poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; }; poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; @@ -5164,14 +5265,14 @@ polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zh polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; }; polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; }; -polyclip = derive { name="polyclip"; version="1.3-0"; sha256="05bbj4hy4h1hcb4pzg1mjp8k7k91kqq5rg2x0ns4hcs1h4zrspds"; depends=[]; }; +polyclip = derive { name="polyclip"; version="1.3-2"; sha256="0gsckb5nwfq1w48g67pszk3ndzvj63r8rp7vhh77idizaczkv0r1"; depends=[]; }; polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; }; polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; }; polysat = derive { name="polysat"; version="1.3-3"; sha256="02h1lf1bk7hhphfdcql0rmiszp3b3mdfhqfwxj369389dg0q57bd"; depends=[]; }; polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; }; polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr Rcpp]; }; pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; -pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; }; +pomp = derive { name="pomp"; version="0.65-1"; sha256="1fxfbqa6lb4x0d4h29in8crhac32aw71chyjyvnhadfqynxhhv4k"; depends=[mvtnorm deSolve coda subplex nloptr]; }; pooh = derive { name="pooh"; version="0.3"; sha256="1wcv77vjjp62c5l1mplnkk4vhy2scjrq96cjx58w5jdj46lban2h"; depends=[]; }; popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; @@ -5181,12 +5282,12 @@ popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7d popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; }; popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; }; poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[dplyr DBI igraph lazyeval RSQLite]; }; -poppr = derive { name="poppr"; version="1.1.4"; sha256="13zxcclr8ar3ibjd34n23g0q0rw28gdl2q5477cmpcnypwzxsa71"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; +poppr = derive { name="poppr"; version="1.1.5"; sha256="0whk06gwm171b5j2vcfqi7rdwczv109g7bw2gfnzhz4fm46nhmfk"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; }; portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; }; portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; -potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; +potts = derive { name="potts"; version="0.5-3"; sha256="1pddz8d4p69wzr51zy3bnbwka1a2dr7civh72qi0rpdsrfm4jxl6"; depends=[]; }; poweRlaw = derive { name="poweRlaw"; version="0.30.2"; sha256="1b4ngqsh5gywksb3y9cj1yjkhxs4081svwgxwf8gpsa7fnl9c0fl"; depends=[VGAM]; }; powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; @@ -5213,11 +5314,11 @@ predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; }; presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; }; -preseqR = derive { name="preseqR"; version="1.1.1"; sha256="0hz9a7jji2k55a57l03ajkf0j7yp6dgyapyqr1ip0v18fjpfj98q"; depends=[]; }; +preseqR = derive { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; }; prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; }; prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; }; -prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; }; +prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[sp rgdal ggplot2 directlabels GenKern fields gstat foreign maptools]; }; prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[rjags coda]; }; prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; }; primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; @@ -5225,7 +5326,7 @@ primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1 princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; -probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; }; +probFDA = derive { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; }; probemod = derive { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; }; @@ -5235,6 +5336,7 @@ profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbai profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; }; proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; }; prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; +progress = derive { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; }; proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; }; propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[]; }; propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[MASS tmvtnorm Rcpp ff minpack_lm Rcpp]; }; @@ -5247,8 +5349,9 @@ proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zl protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; }; protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; }; +provenance = derive { name="provenance"; version="0.2"; sha256="07wgfb5hmdd4nddl42wpqsx9vzayvngrgmcsssilbm5qbrvgv4sr"; depends=[MASS smacof vegan shapes]; }; proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; }; -pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; }; +pryr = derive { name="pryr"; version="0.1.1"; sha256="00j81iwf2mka1a953nrgar0r4wcfi4n5nl8pidnhw51lyh2285d8"; depends=[stringr codetools Rcpp Rcpp]; }; psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; }; pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[MASS lattice]; }; @@ -5256,7 +5359,7 @@ psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; }; pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; }; psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; }; -psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; }; +psidR = derive { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table RCurl foreign SAScii]; }; pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; }; @@ -5285,7 +5388,7 @@ pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; }; pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; }; -pxweb = derive { name="pxweb"; version="0.5.5"; sha256="1rrsxis2fi1x90gj251phbrz3bbl7yyc39n20lk2rln14acdhfsy"; depends=[data_table plyr stringr RJSONIO httr]; }; +pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table plyr stringr RJSONIO httr]; }; pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; }; pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; @@ -5295,8 +5398,8 @@ qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalif qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; }; qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; }; -qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; }; -qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.5"; sha256="1nk432nyw4srz92zsikv830dpjxflrrgjhq5va6pd3ifpy3nzdrw"; depends=[]; }; +qdap = derive { name="qdap"; version="2.2.1"; sha256="0gix6l0h6q0c2pl38d3qp3pzs1m3j96rcb9n6q9k1nh0002vfnsg"; depends=[qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; +qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; }; qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; }; qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; }; qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; @@ -5315,13 +5418,13 @@ qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgv qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; }; qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; }; qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; +qrmtools = derive { name="qrmtools"; version="0.0-1"; sha256="0xjgb8clyhlrl4qdbhi85m97cbhab5q5sy2zr87gamz2y365alpr"; depends=[xts]; }; qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; }; qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; -qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; +qtbase = derive { name="qtbase"; version="1.0.9"; sha256="1jffdkv6jwxqljx6jd5n27wk9r5sg0llpf34nlr29h4shi3f2f8z"; depends=[]; }; qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; }; qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; }; qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; -qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; }; qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; }; qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; }; qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; }; @@ -5335,15 +5438,15 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; }; qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; }; quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; -quanteda = derive { name="quanteda"; version="0.7.2"; sha256="0mpalvnhqkmqczpc1qaipvqxlyqfli510p81h6mf0sq9f82nzmks"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; }; +quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; }; quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; }; quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; }; -quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; }; +quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; }; quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; }; quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; }; questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; }; -queueing = derive { name="queueing"; version="0.2.4"; sha256="03zz5437bkai2bmk9hcwf09cmyrnbs2cxlafbcf1lp6iahj66il9"; depends=[]; }; +queueing = derive { name="queueing"; version="0.2.5"; sha256="11a44aqq0s50vdbn7rhijajqw1rrcj1qnyjjd8dn1cc5nvq141k7"; depends=[]; }; quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 tidyr MPDiR]; }; quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; }; quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; }; @@ -5367,7 +5470,7 @@ rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[slam truncreg truncnorm maxLik]; }; rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; }; rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; -rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; }; +rEMM = derive { name="rEMM"; version="1.0-9"; sha256="0b3g30s8nw107y5yg113xdw1s2h96mq0j5cldj01z3j676idjgw5"; depends=[proxy igraph clusterGeneration MASS]; }; rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; }; rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; @@ -5378,11 +5481,11 @@ rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; }; rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; }; -rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.3"; sha256="1w9z0m8ddslsk4d9r8dm5npm1s8sqdjv11x0gc08awa77iwak4wh"; depends=[plyr]; }; +rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; }; rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[spatstat sp deldir plyr raster geometry rgl bitops]; }; rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; }; -rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; +rNOMADS = derive { name="rNOMADS"; version="2.1.4"; sha256="0a0knxqqbn52i4ixpv16h1hnajhwx788cmdiq78ysds7yfkjrwzy"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1s432z9v2b2rgdxvay9y5zpc2ar"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; }; @@ -5403,11 +5506,11 @@ rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; -ramify = derive { name="ramify"; version="0.2.0"; sha256="1fn2r6mr461yp00z8c7f1wsyhz3ag13q6ckf84sj11rgg6jivzjj"; depends=[]; }; +ramify = derive { name="ramify"; version="0.3.0"; sha256="1pysv802pyab06zl41b71x91527fw1smw4x2lcj2xc3p95yb4zb9"; depends=[]; }; ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; }; randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; }; randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; -random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; }; +random = derive { name="random"; version="0.2.4"; sha256="17d1gcdymgcc08hx3998vs0x70fn8gxw2a1ycm9z7xrasx03g7kn"; depends=[curl]; }; random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; }; randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; }; @@ -5421,7 +5524,7 @@ randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; }; rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; }; -rankdist = derive { name="rankdist"; version="0.3.1"; sha256="0812bw2bm9837lp5l6lwbhln61qb584f0nk2k7nc60m1ppsi0dw6"; depends=[Rcpp hash optimx Rcpp]; }; +rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[Rcpp hash optimx Rcpp]; }; rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; }; rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; }; rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; }; @@ -5446,13 +5549,14 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; -rcbalance = derive { name="rcbalance"; version="1.5"; sha256="1lqxx9ghxnskl8sy26x03d8baw8kn78mlxbh1gjjkszx4y5bm4vl"; depends=[MASS plyr]; }; +rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; }; rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; }; rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; +rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[rmarkdown knitr]; }; rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; }; rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; }; -rcorpora = derive { name="rcorpora"; version="1.0.1"; sha256="10bmsmx9pznfpddddvk7khm7klxg1c82bf85613bnpcwjyb7xcid"; depends=[jsonlite]; }; +rcorpora = derive { name="rcorpora"; version="1.1.0"; sha256="05i9zqvgg5fxgscqzmbsi84baq9cxs14k70agjy95h61fndaaarf"; depends=[jsonlite]; }; rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; @@ -5470,8 +5574,8 @@ readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fk readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; reader = derive { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; }; -readr = derive { name="readr"; version="0.1.0"; sha256="0w6576lrnwk1p90mjwsgy7hi3rk5dqmksnwnmn1gw46lh2888bc8"; depends=[Rcpp curl Rcpp BH]; }; -readstata13 = derive { name="readstata13"; version="0.6.1"; sha256="0h5x6j74m7z715nknh4s62ffs7j3ccpcvy0ws8wf3bdzfa27jvq5"; depends=[Rcpp Rcpp]; }; +readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxpg8yrhx0phwiab22sdi1vp62c8ja6"; depends=[Rcpp curl Rcpp BH]; }; +readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp Rcpp]; }; readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp Rcpp]; }; reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; }; @@ -5483,9 +5587,10 @@ recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6g recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; }; recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; }; recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; }; -reconstructr = derive { name="reconstructr"; version="0.5"; sha256="0lffi30grk88na2jmkbhs62xf3d8mzrmjsiajrpp7dsaxa650bf0"; depends=[Rcpp Rcpp]; }; -recosystem = derive { name="recosystem"; version="0.2.5"; sha256="0i5rgkmjaz50qlyi85hmr61r0iir53prrphzvnjq5bjchb1k3m09"; depends=[Rcpp Rcpp]; }; +reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp Rcpp]; }; +recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp Rcpp]; }; redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; }; +redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[Rcpp spdep sp coda Rcpp RcppArmadillo]; }; ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; }; referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; }; @@ -5500,7 +5605,7 @@ regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7w regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; }; regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; -rehh = derive { name="rehh"; version="1.12"; sha256="0qqmh48vxi1yqf6ykfsi6wighly5msf4lqx058lbn555g3vg17jp"; depends=[gplots]; }; +rehh = derive { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; }; relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; }; rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; }; @@ -5512,7 +5617,7 @@ reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfx relevent = derive { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[trust sna coda]; }; reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; relimp = derive { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; }; -relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; }; +relsurv = derive { name="relsurv"; version="2.0-5"; sha256="0lwmdz1hm46qlkvfvvyc2v592lx2crs3cxjpkph0vg5w6a0k10i4"; depends=[survival date]; }; remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; }; remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; }; @@ -5520,7 +5625,7 @@ rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffj repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; }; replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; }; replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; }; -repmis = derive { name="repmis"; version="0.4.2"; sha256="1pjf010h4rkrwarq541wh8x1267894fsdg8na41z8cp3hr5aql21"; depends=[data_table digest httr plyr R_cache]; }; +repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; }; repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; }; reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; }; reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; }; @@ -5528,20 +5633,21 @@ reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdx reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; }; repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; }; represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; -reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; }; +reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[openxlsx ggplot2 gridExtra tm wordcloud RColorBrewer xtable metafor]; }; rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[httr dplyr data_table jsonlite xml2 digest ncdf]; }; resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; }; reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr stringr Rcpp Rcpp]; }; reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; }; +restimizeapi = derive { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[som rgl geometry igraph]; }; restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; }; retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; }; retrosheet = derive { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[RCurl XML data_table stringi]; }; reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; }; -reval = derive { name="reval"; version="1.0"; sha256="14vzsg3azggfrm1cnrxigbhnpxpjifjf61r71hf73ggpspx2gj5r"; depends=[doParallel foreach]; }; +reval = derive { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; }; reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[magrittr lazyeval]; }; @@ -5551,30 +5657,31 @@ rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9 rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; }; rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; -rfoaas = derive { name="rfoaas"; version="0.1.3"; sha256="0wdb645fx2wsy4vwz43d8ynwx3divpjwbkql52zkikyr8zv21gz5"; depends=[httr]; }; +rfoaas = derive { name="rfoaas"; version="0.1.6"; sha256="0wfpf6k0xsjzpabyziqyllksj1p9n6ix1lnk02mkz0bzl97hnilq"; depends=[httr]; }; rfordummies = derive { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; }; rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; }; rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; }; rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; }; -rgbif = derive { name="rgbif"; version="0.8.0"; sha256="1sdjlymymfc5chnrc5if0fvf64mjz6sc4071xsw2ja7zcdasxb40"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr whisker magrittr jsonlite]; }; +rgbif = derive { name="rgbif"; version="0.8.4"; sha256="13rcqqa19w3gzab4xg006kj7m5zj4x1hbxpam8yg1r3n9dad1bjz"; depends=[XML ggplot2 httr data_table whisker magrittr jsonlite V8]; }; rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; -rgdal = derive { name="rgdal"; version="0.9-2"; sha256="0jzhjy3qnb9aimmwyssinbyxz49hzcfksmxhsqyz3g8868k946g5"; depends=[sp sp]; }; +rgdal = derive { name="rgdal"; version="0.9-3"; sha256="011vw2pgaxgbba0a0c5ha2n0haljbn00z5km13fhgqlvhhdhzd6n"; depends=[sp sp]; }; rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; }; -rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; }; +rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp sp]; }; rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; }; rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; rgl = derive { name="rgl"; version="0.95.1247"; sha256="1zmb09lljng1dmwd23w5ld8z9wr0xd0s365vz54il0ndwrqfhsi1"; depends=[]; }; -rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; }; +rglobi = derive { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[rjson RCurl]; }; rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; }; rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[MASS fastICA]; }; rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; }; rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; }; ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; -riceware = derive { name="riceware"; version="0.2"; sha256="1rd64saags4s7nadpbi38h8m8mw6y44lmdi8vmg58mglkfcbqf32"; depends=[random]; }; +riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; }; +ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; }; rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; }; rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; }; @@ -5589,15 +5696,16 @@ rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq8 riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; }; rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; }; -rivervis = derive { name="rivervis"; version="0.45.0"; sha256="0dc02m923l1y689rd13zxz1122l8cipr4m2cf2bw7pis7zr3m119"; depends=[]; }; +rivervis = derive { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; }; rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2 Rcpp]; }; rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive { name="rjags"; version="3-15"; sha256="02nmaqv0xddh7bgrlwrr30gb10mcz2f5lilbyzfw6wpjgi2aihx5"; depends=[coda]; }; rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; -rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; }; +rjstat = derive { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[jsonlite assertthat]; }; rkafka = derive { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava RUnit rkafkajars]; }; rkafkajars = derive { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; }; +rknn = derive { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; }; rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; }; rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; }; @@ -5635,10 +5743,10 @@ robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7 robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; }; robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; }; -robustbase = derive { name="robustbase"; version="0.92-3"; sha256="0b7rld5pa9nrnqj7600ybvzy74lxz6s41dibamwdssh36mx6ayvb"; depends=[DEoptimR]; }; +robustbase = derive { name="robustbase"; version="0.92-4"; sha256="0dyz2wwfjq8bjjwi4fhm6v3sxmlh34bawppakl4l6dv7vpjsv85k"; depends=[DEoptimR]; }; robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; }; -robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; }; +robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; }; robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; }; robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; }; @@ -5650,6 +5758,7 @@ rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80 ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RJSONIO RCurl]; }; ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; }; rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; }; +rotationForest = derive { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; }; rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; }; roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; }; rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; }; @@ -5661,13 +5770,14 @@ rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; -rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; }; +rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; }; rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; }; -rplexos = derive { name="rplexos"; version="1.0"; sha256="129izg9ipn2pfm4yq0lg597nn9rcxr8m9yslmra85jmzbisc1vfw"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; }; +rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[Rcpp dplyr RSQLite DBI data_table tidyr lubridate stringi doParallel foreach Rcpp]; }; rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; }; rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; +rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[stringr stringi plyr assertthat]; }; rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; }; rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; }; @@ -5680,22 +5790,23 @@ rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vq rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[rrcov robustbase pls spls pcaPP]; }; rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[rrcov robustbase lattice cluster norm]; }; rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; }; +rriskDistributions = derive { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[mc2d eha msm tkrplot]; }; rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; }; rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; -rscala = derive { name="rscala"; version="1.0.4"; sha256="05pgyzin0d5lfz5rjf0c0j7b2zj7b8r1blgd126kjlvjkj1spy84"; depends=[]; }; +rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[XML RCurl plyr]; }; rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; }; -rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; }; +rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[MASS lavaan]; }; rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; }; rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; }; -rsm = derive { name="rsm"; version="2.07"; sha256="0d1kymgmprp41xvax6c5k881dxjgf6bnvpl4mh9l1pnjdcq7pyi5"; depends=[]; }; +rsm = derive { name="rsm"; version="2.7-2"; sha256="0pn018n36h1xhhlsimggbfgfgl9nh5a49x8amkqy3drrnamjl577"; depends=[]; }; rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[XML rgl]; }; rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; }; -rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; }; +rspa = derive { name="rspa"; version="0.1-7"; sha256="0hmdfj1cgy9fjfbrs8qvx79fkv5v1xr6vrwjp89lq0blhsnzn5k2"; depends=[editrules]; }; rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; }; rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; @@ -5717,12 +5828,12 @@ rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qd rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; }; rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp Rcpp RcppArmadillo]; }; runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[lattice coda]; }; -ruv = derive { name="ruv"; version="0.9.4"; sha256="07bvyqrkm10vh63l8dm93spd7l0v105a87lsbjw4vg65czp1iayg"; depends=[]; }; +ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; }; rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; }; rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; }; -rversions = derive { name="rversions"; version="1.0.0"; sha256="0k9v77bpxbxxmf5bdansg074zx3cm4hhaw6vl9f6c58xzxl567nf"; depends=[RCurl XML]; }; +rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; }; rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; }; rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; }; rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; @@ -5741,7 +5852,7 @@ sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; -sadists = derive { name="sadists"; version="0.2.0"; sha256="156a1xzii2nkfismwbrfli5yxz52alpkqdi7maqlx9b1qrpybmhs"; depends=[PDQutils hypergeo orthopolynom]; }; +sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[PDQutils hypergeo orthopolynom]; }; sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; }; sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[nlme MASS]; }; sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; @@ -5750,7 +5861,7 @@ saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3 saery = derive { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; -sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; }; +sampSurf = derive { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[sp raster rasterVis boot]; }; sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; }; samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; }; sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; }; @@ -5785,25 +5896,26 @@ schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3 scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[Matrix iterators RCurl zoo digest]; }; scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; }; +score = derive { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; }; scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; }; scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; }; -scrm = derive { name="scrm"; version="1.5.0-1"; sha256="176k3qmlfs1cj8gm421p3hivs434xvm6ch3gva7x7766vz5mxi39"; depends=[Rcpp Rcpp]; }; +scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp Rcpp]; }; scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; }; scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; }; sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; }; sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[sdcMicro gWidgetsRGtk2 gWidgets cairoDevice vcd foreign Hmisc]; }; -sdcTable = derive { name="sdcTable"; version="0.18.0"; sha256="13k96ahz6vzvbnvca18p0r1pv9k6sdmxbq04cf76an7r2g4w6kji"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; +sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; }; sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; }; sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; }; sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; }; sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; }; -sdprisk = derive { name="sdprisk"; version="1.1-0"; sha256="03nbvrrgzcnczj1zsnqakjy278bg15vva6yb35clks5zyipl0qdk"; depends=[numDeriv PolynomF rootSolve]; }; +sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; }; sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; }; seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; }; @@ -5823,13 +5935,15 @@ seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj8 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; }; segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; }; +seismic = derive { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp Rcpp]; }; selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; }; selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; }; selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[XML stringr]; }; selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[spatstat ecespa]; }; +selfea = derive { name="selfea"; version="1.0"; sha256="02ncccyjgdpp9hkd278jg8x1c3566fqhfmmh423596b1slzs8gqm"; depends=[pwr MASS plyr]; }; selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; -sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; }; +sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[matrixcalc MASS boot mi DiagrammeR]; }; semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; }; semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; }; @@ -5853,18 +5967,18 @@ seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfm seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; }; -seqminer = derive { name="seqminer"; version="3.4"; sha256="1fl7mmqs3y0vpfhqss7syafwli67jwha703fyailxixq7djvwf9f"; depends=[stringr]; }; +seqminer = derive { name="seqminer"; version="4.2"; sha256="026minlmqf4n6pznkzkm6daqa7pj7hmis0i2azdy2m56a9hkj52z"; depends=[stringr]; }; seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; }; sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; }; sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[squash]; }; -seriation = derive { name="seriation"; version="1.0-14"; sha256="0a7m1x6dhk00wh6djiz75x462y06fammr7fd2z8ks32migsbbvpp"; depends=[TSP cluster gclus colorspace MASS]; }; -seroincidence = derive { name="seroincidence"; version="1.0.3"; sha256="1qk11xrv2qnw3wmcg357m9nbnc1qr3wl2nznj8xw10r3jc1736s8"; depends=[]; }; +seriation = derive { name="seriation"; version="1.1-0"; sha256="0lbkv005ws4khwp12mygrpvxxdz8g5a7q2xl62k43sz6vj7cp8cn"; depends=[TSP cluster gclus colorspace MASS gplots registry]; }; +seroincidence = derive { name="seroincidence"; version="1.0.4"; sha256="0m3hlbv3277qyhqi3liwbna7czd6kdc7gqaxc7xn5x8d2hsc45hk"; depends=[]; }; servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[mime httpuv jsonlite]; }; sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; }; session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; }; -settings = derive { name="settings"; version="0.2.1"; sha256="0dxnysa3857d141rk46pyfkbgzk6ms3fhb2bz0y41jy72bdhxmrm"; depends=[]; }; +settings = derive { name="settings"; version="0.2.2"; sha256="0bssy42kkb1aww9yndkyw3bj1jn3akvwsvhj0cz16r3a7jfcav7h"; depends=[]; }; setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; }; severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; @@ -5874,18 +5988,18 @@ sgPLS = derive { name="sgPLS"; version="1.2"; sha256="1q3pf4sfh8l2qwxm0qd3sg29kv sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[Rcpp MASS Rcpp RcppArmadillo BH]; }; sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; }; -sglasso = derive { name="sglasso"; version="1.2"; sha256="1y2ms6p792klzmy3prhsyanlbp7n004di9hscma7ih3jx9703wsr"; depends=[Matrix igraph]; }; +sglasso = derive { name="sglasso"; version="1.2.1"; sha256="18dag7wvz0l959igg4g77psi8idvqyikg676yy9ga3k69kl11hdk"; depends=[Matrix igraph]; }; sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; }; sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; }; shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; -shapeR = derive { name="shapeR"; version="0.1-3"; sha256="12j6qawnhv7i1488wkh8shm3shzi7g58r8pk9p10lm0bwi59l2l8"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; }; +shapeR = derive { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; }; shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; }; sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[aqp ape soilDB igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; }; -shiny = derive { name="shiny"; version="0.11.1"; sha256="1aplb2wvgsbg6hhjsyjjhd8qbj11yrzm10rr812lzpiavd9wjn3w"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; }; +shiny = derive { name="shiny"; version="0.12.0"; sha256="1mv2l2jlayg8jwr2710mp5awazdxbmq2vz8ld1jr2apq9irai14l"; depends=[httpuv mime jsonlite xtable digest htmltools R6]; }; shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[shiny htmltools]; }; shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[shiny htmltools RJSONIO]; }; @@ -5893,11 +6007,11 @@ shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk6 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; shinydashboard = derive { name="shinydashboard"; version="0.4.0"; sha256="0my1bz983ncnvljhz6d25q9bqc510q9dgl9wzcg8c0civyjaps39"; depends=[shiny htmltools]; }; -shinyjs = derive { name="shinyjs"; version="0.0.3.3"; sha256="1fgydm8ai0fvfqbwlkj27pa3nl242kb3xiai50lrda0ssqbrnw67"; depends=[shiny]; }; +shinyjs = derive { name="shinyjs"; version="0.0.6.2"; sha256="0z9lw680bhfzm40j1ffy6y3vfxjkz9457w62rjrw32nssv8vjqvs"; depends=[shiny]; }; shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; }; shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; }; shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; -showtext = derive { name="showtext"; version="0.4-1"; sha256="1c2wd107g2xg8khlad5vimwj7wdxk7b7i2k1ydkkd7b47c6d9zhh"; depends=[sysfonts showtextdb]; }; +showtext = derive { name="showtext"; version="0.4-2"; sha256="18r1xwyjca9ccr2yf8r786pgji38myqp35abxsvd7wv7k3avhwd9"; depends=[sysfonts showtextdb]; }; showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; }; shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; }; shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; }; @@ -5910,16 +6024,18 @@ sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; }; -signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; }; +signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; }; signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; }; +signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; }; -simPH = derive { name="simPH"; version="1.3.1"; sha256="1i4sqaiiy77a4c3aq52d0ddn3abkkqgjh5sxj2v459gck5fd9rgs"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; +simPH = derive { name="simPH"; version="1.3.2"; sha256="0zlzlan2syl51smc3wm52yiak82v1f3pjgsba3w677a37g3badls"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; }; +simcausal = derive { name="simcausal"; version="0.1"; sha256="0i39rkfmaqw0f9g3mw05rz7bf0vd4nqxwaixf8i8mvhnbn5gglv3"; depends=[data_table reshape2]; }; simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; }; simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9d0z8mkh6lc8qm4zivyk5af79mr5s0bn5"; depends=[deSolve]; }; simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; @@ -5933,15 +6049,15 @@ simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; }; siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; }; -sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; +sirt = derive { name="sirt"; version="1.7-0"; sha256="12z1gk92rll5lxycv3gvz6y5ia5pbysq5fr3y62xn3wwgm2vrpch"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix lavaan_survey survey Rcpp RcppArmadillo]; }; sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; }; sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; }; sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; }; sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; }; -sjPlot = derive { name="sjPlot"; version="1.8"; sha256="10hbm76qrlbcl384vfp9gkhlkxpvic8iq3l0k97pb7pv8k4482mx"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; }; +sjPlot = derive { name="sjPlot"; version="1.8.1"; sha256="0na5c9fd4irnf1vhqhxgdhwpqyqfsqdxz47gx65r9qq294bhwc75"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; }; sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; -sjmisc = derive { name="sjmisc"; version="1.0.1"; sha256="1a8i355jzp77d8ngyyyiw12yx2ppc2drh3qxs2n4b361vxcq8p6m"; depends=[MASS]; }; +sjmisc = derive { name="sjmisc"; version="1.0.2"; sha256="1hgmm5yjgnd2n3k0gjcv58pv0wxzx5pia38ycjix4vyjgbp01kq0"; depends=[MASS]; }; skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; @@ -5962,6 +6078,7 @@ smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwa smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; smbinning = derive { name="smbinning"; version="0.1"; sha256="1r3l8z875k5sjnbjg0dpkv3x122hn8g601025lfdpl2ndkbz4qms"; depends=[sqldf partykit Formula gsubfn]; }; smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; +smcfcs = derive { name="smcfcs"; version="1.0.0"; sha256="04r8a2p8549pq8yl92ajj893w1rj03s14q6dv14vp0873zrxkxza"; depends=[VGAM MASS survival]; }; smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; @@ -5970,16 +6087,17 @@ smds = derive { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxws sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; -smnet = derive { name="smnet"; version="1.0"; sha256="185ihq44fp00qp03lp9hz821a1ddm1bd09k3j0ii715grc91nc49"; depends=[SSN spam dfoptim RSQLite igraph DBI]; }; +smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[SSN spam RSQLite igraph DBI]; }; +smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[ParamHelpers BBmisc checkmate ggplot2 RColorBrewer plot3D emoa]; }; smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; }; -smoothSurv = derive { name="smoothSurv"; version="1.5"; sha256="145j415jr482s860c685sr815bwx7g63pkfhra1m6r2wawqb2gl5"; depends=[survival]; }; +smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj37v9sr37dgriq0a7kbmsj0n3lmxrzfjhinwnhij"; depends=[survival]; }; smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; }; sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; }; smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; }; -sn = derive { name="sn"; version="1.2-1"; sha256="0sqmabksvv13adf521mbzbi76dgbxc37xppjw4vwzmp4x6d8h0jf"; depends=[mnormt numDeriv]; }; +sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; }; sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; }; snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; }; @@ -6001,7 +6119,7 @@ soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56 soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp plyr Hmisc RCurl XML sp]; }; soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[rpanel MASS]; }; soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; -soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; }; +soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[sp MASS]; }; soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[zoo lattice latticeExtra RColorBrewer]; }; solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[plyr ggplot2 data_table]; }; @@ -6021,11 +6139,12 @@ sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6 sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; }; soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[pracma oce ineq vegan tuneR seewave]; }; source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; -sp = derive { name="sp"; version="1.1-0"; sha256="1lnc1vlxw15wk69hh7c26dc7vxydyxwi8rfpwrpn9wj4pm0hp8a5"; depends=[lattice]; }; +sp = derive { name="sp"; version="1.1-1"; sha256="1485jylvwbf99snbmp0xs13h5wlvfgwf04cbny4zgn43nipsvsik"; depends=[lattice]; }; sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; }; spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; }; spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; }; +spTDyn = derive { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; }; spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; }; spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; }; spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; }; @@ -6039,6 +6158,7 @@ spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; }; spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; }; spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; }; +spanel = derive { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; }; sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; }; sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; @@ -6069,9 +6189,9 @@ spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lr spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; }; spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; }; spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; }; -spatstat = derive { name="spatstat"; version="1.41-1"; sha256="1r2538h4arvlsn49ci84ch45wy5k9kiq4d22bd98jrh6xna3rd6x"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; }; -spatsurv = derive { name="spatsurv"; version="0.9-8"; sha256="1dsqkcmhka8yzl13jfn19ywq1bk7788amj4nrl1bz05q3vz3drpp"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; }; -spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; }; +spatstat = derive { name="spatstat"; version="1.42-1"; sha256="10889xg5l7vjmlv79dhdayifplzxhnykhhgjpsn54rncz0k0hd0p"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; }; +spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[survival sp spatstat raster iterators RandomFields fields rgl Matrix stringr rgeos RColorBrewer geostatsp]; }; +spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; }; spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; }; spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; }; spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; }; @@ -6084,8 +6204,9 @@ spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq0 speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; }; speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; }; +spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; }; spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; }; -speedglm = derive { name="speedglm"; version="0.2-1.0"; sha256="13gjij9pb65j9c52d5cxl9n6fjmcwbhja4wdl4619dy5rj9vsyi4"; depends=[Matrix]; }; +speedglm = derive { name="speedglm"; version="0.3"; sha256="07pq0ymg7x9c9pq79d476slca43jv4682iackd446glw2qffac1y"; depends=[Matrix MASS]; }; speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; }; sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; }; @@ -6116,7 +6237,7 @@ sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; }; sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; }; -spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; }; +spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[sp deldir foreign MASS rgeos]; }; spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; sptm = derive { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[survival survey kyotil]; }; spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; }; @@ -6131,28 +6252,30 @@ ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gn ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; }; ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xacmmjhpf82sbhmhvg73dc1r5jz"; depends=[lattice]; }; +ssfa = derive { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik spdep sp]; }; ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; -ssizeRNA = derive { name="ssizeRNA"; version="1.1.1"; sha256="19l7kmkc1cnggf0rcqxphifw5y6iknkxas0ik3kfd1swsgmvw587"; depends=[MASS ssize_fdr]; }; +ssizeRNA = derive { name="ssizeRNA"; version="1.1.2"; sha256="11dnc3wqj0i5blzc9ndpgl48xm5fibjgx9sxrzdcza0gbj8qpadm"; depends=[MASS ssize_fdr]; }; ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; }; sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; }; sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; -ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; }; +ssym = derive { name="ssym"; version="1.5.3"; sha256="0d8d0s9k87w7mxlvkzj307wkmxghc0qzhn7crm3fvcb1phf115p8"; depends=[GIGrvg numDeriv normalp Formula survival]; }; st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; }; staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; }; stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; }; stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; }; stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; }; +stackoverflow = derive { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; }; stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; }; -stagePop = derive { name="stagePop"; version="1.0-1"; sha256="0yb1dbgmns6km0p35wny6f4v7xl4225v8lww0wmzrvdw7l2m8m8d"; depends=[deSolve PBSddesolve]; }; +stagePop = derive { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; }; startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; }; stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; }; -statar = derive { name="statar"; version="0.1.3"; sha256="1lkbp6ki4w0gm3l683xar44vrkw69883qvr73mc179bdh31znqli"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stargazer stringr tidyr]; }; +statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; }; statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; }; statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; }; statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; }; @@ -6174,7 +6297,7 @@ stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh4 stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; }; stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; }; stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; -stochvol = derive { name="stochvol"; version="1.0.0"; sha256="1c083gmfq9ldd41235shcb5i3ggd92fxvimhaavljnr1wsls5f2b"; depends=[coda Rcpp Rcpp]; }; +stochvol = derive { name="stochvol"; version="1.1.1"; sha256="1cfav3i7w5i3rayajdybjmwvmqvqj58zk8sk0icw52r5l4ki2d6s"; depends=[coda Rcpp Rcpp]; }; stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp Rcpp]; }; stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; @@ -6186,18 +6309,18 @@ strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19f stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; }; stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; }; straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; -stream = derive { name="stream"; version="1.1-1"; sha256="0l9sywmajydmd0nkdlbhc4k5lf7qjrndjj6clw5j2mgw97cqaag5"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; }; -streamMOA = derive { name="streamMOA"; version="1.0-0"; sha256="176llkj9q0p5ym09iagaw5cag6ln94bw04pjl120jnxn6p7i22s2"; depends=[stream rJava]; }; +stream = derive { name="stream"; version="1.1-4"; sha256="1pz9ck6rxxwnzrhixs015k3sy2gl8hwxyxwr56ykpkrcn6kgzm3f"; depends=[proxy animation clue cluster clusterGeneration fpc MASS mlbench Rcpp Rcpp]; }; +streamMOA = derive { name="streamMOA"; version="1.1-0"; sha256="0h45saz5jf9jfsajy987ljpfpm2cxigyqkgmybd0m3aqyrqlljbc"; depends=[stream rJava]; }; streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; }; stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; }; stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; }; stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; }; stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; }; stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[stringi magrittr]; }; -strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; }; +strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[zoo sandwich]; }; structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[igraph rjson ggplot2 reshape2]; }; -strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; -strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; +strum = derive { name="strum"; version="0.6.1"; sha256="128xrprdmncnn2a7z6g2qzkps323qq33g3fxh1q23ys11p37dnjw"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; +strvalidator = derive { name="strvalidator"; version="1.5.0"; sha256="0b71drc80hqmqi4kspy0700wss4pm88x2gp83jsw1jrfrrrfw9jk"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; }; @@ -6212,6 +6335,7 @@ sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; }; summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander xtable rapportools rstudioapi]; }; supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; }; +supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[mvtnorm gtools]; }; superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; }; superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; }; @@ -6230,10 +6354,11 @@ survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; }; survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; }; -surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah92awpa9cafxshpvmj3d206fqn5sm7bd73q87mvbgdp"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; }; +surveillance = derive { name="surveillance"; version="1.9-0"; sha256="1v087x0y8i2b4pbikdaj3xdb0qj1lnl8yjrzcp3l0ffcbfb8a8j2"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; }; survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; }; surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; }; +surveyeditor = derive { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; survival = derive { name="survival"; version="2.38-1"; sha256="0kq0a6h1bmphp4vi1f3wzs5pddp3zw9vfi7vk6x27zglnwjhkfgm"; depends=[]; }; survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; @@ -6259,10 +6384,12 @@ svgViewR = derive { name="svgViewR"; version="1.0.0"; sha256="0js3mc5lxzfwbnc30m svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; }; svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; }; -sweidnumbr = derive { name="sweidnumbr"; version="0.2"; sha256="0zsijh9jf0pnil5n69ix408j3plbrnj0235whh9rch486ibyk779"; depends=[lubridate]; }; +sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m7nlngarimlhx9sc6wwq9pfrcijq8240mh7xwa2"; depends=[lubridate stringr]; }; swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; }; swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[stringr testthat httr yaml RCurl digest]; }; switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; }; +switchr = derive { name="switchr"; version="0.9.4"; sha256="16a8659x2r9adi3r0cqhsw8qg3jk6pkvrzgx8a50qyk4v50f2jsj"; depends=[]; }; +switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[switchr gistr httpuv RJSONIO]; }; sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; }; sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; }; sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[sybil Matrix]; }; @@ -6273,14 +6400,14 @@ symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; }; synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[parmigene GenKern igraph KernSmooth]; }; -synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; +synbreed = derive { name="synbreed"; version="0.11-8"; sha256="1d58rlys0557xs1wwd9mrvsrnx8fkcs4igxwf70rw9zy6nl9zg9k"; depends=[doBy BLR regress abind igraph lattice MASS LDheatmap qtl]; }; synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; }; synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; }; sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; }; -systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; +systemfit = derive { name="systemfit"; version="1.1-16"; sha256="0b34cpwhmsmq7dcr3gymdvanj3q493aczgz3af7b14bsp3bbwpw6"; depends=[Matrix car lmtest sandwich MASS]; }; systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; }; syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; }; taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; }; @@ -6300,13 +6427,13 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; }; tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp Rcpp]; }; tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; -tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqryd6jzjsxdyhdxvj2w83qcxa"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; +tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; }; tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; }; tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[lattice ggplot2 RColorBrewer]; }; tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; -teigen = derive { name="teigen"; version="2.0.8"; sha256="0gh5p2rwv1krrbq92wpgl1ya74vrdxhsagd7r7wvyxvxdv3j94v5"; depends=[]; }; +teigen = derive { name="teigen"; version="2.0.81"; sha256="1bssfn487dg1nc7fv73ksciiifnk1mvaqvp8a3gjmrb7bzfyzby7"; depends=[]; }; tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; }; tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; @@ -6315,12 +6442,12 @@ termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcck ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; }; tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfhwqjjdigdm1rqf88sp7435wksyv8i"; depends=[]; }; -testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; }; +testthat = derive { name="testthat"; version="0.10.0"; sha256="0b3akwcx5mv9dmi8vssbk91hr3yrrdxd2fm6zhr31fnyz8kjx4pw"; depends=[digest crayon]; }; testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; }; texreg = derive { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; }; -textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; }; +textcat = derive { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[tau slam]; }; textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; }; textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; }; @@ -6328,11 +6455,13 @@ tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm2 tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; }; tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; }; tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; }; +tgcd = derive { name="tgcd"; version="1.4"; sha256="108i7kkfkpgavs8d2c6aih9winfqhin777jn5zfxzkjd6clj857i"; depends=[]; }; tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; }; tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; }; thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; }; threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; +threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[htmlwidgets base64enc]; }; threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; }; thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; }; @@ -6341,7 +6470,7 @@ tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfd tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; }; tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; }; -tigerstats = derive { name="tigerstats"; version="0.2"; sha256="1wj4z1jj7jg3885nvfh4l812cyybjcm5r66w3l41s4c0civl4z5b"; depends=[mosaic mosaicData abd MASS ggplot2 lattice]; }; +tigerstats = derive { name="tigerstats"; version="0.2-6"; sha256="0niibqhqpjxgq3m7xp0icf98k531ncmm853scvqp5icv2yz5ivav"; depends=[abd mosaic mosaicData ggplot2 lattice MASS]; }; tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; }; tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; }; @@ -6352,7 +6481,7 @@ timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadf timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; -timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g3p2xl3zbsfiak7lagvs5sbsq84b0wpr7"; depends=[survival lava numDeriv]; }; +timereg = derive { name="timereg"; version="1.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[survival lava numDeriv]; }; timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; }; timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; }; @@ -6360,7 +6489,7 @@ timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkffl timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; }; timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; }; tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; -tis = derive { name="tis"; version="1.27"; sha256="1kgzc032qa005hzcimhbbhcs5kcvm88pfb48ac84k205f6xhdsir"; depends=[]; }; +tis = derive { name="tis"; version="1.30"; sha256="0bqvnaxqqq4962wfw4s9rf0qil613mplqcjwjlq1s9yfxl78gzzw"; depends=[]; }; titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; }; tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; }; tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; }; @@ -6376,10 +6505,10 @@ tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; }; tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; -tmap = derive { name="tmap"; version="0.7"; sha256="0lnlnnllj2bypw2cf8pgpv40w5zy4876kmjgav07ls8j11lklgwz"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; +tmap = derive { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l7hd5k9shrb1v6vkv6x5rrrkm"; depends=[sp raster gridBase rgdal rgeos classInt RColorBrewer]; }; tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; }; tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; -tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; }; +tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[R_utils R_methodsS3 R_oo MASS Matrix geometry]; }; tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; }; tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; }; toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; }; @@ -6398,7 +6527,7 @@ track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbz tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; }; traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; }; -trajectories = derive { name="trajectories"; version="0.1-2"; sha256="1d27mb5xy29j2mgb0wh5x61q1z41vjmpidzqswqmw8fbq9g64826"; depends=[lattice sp spacetime rgdal rgeos]; }; +trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; }; translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; }; translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; }; transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; }; @@ -6419,7 +6548,7 @@ trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdy trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[randomForest mlbench]; }; trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; }; trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; }; -trip = derive { name="trip"; version="1.1-19"; sha256="1353lzfgvq8236ijxy8521r7hhmgyfrvc17ga8p8c0851nx53xn3"; depends=[sp maptools MASS spatstat]; }; +trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[sp maptools MASS raster spatstat]; }; tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; }; trotter = derive { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; @@ -6497,21 +6626,21 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; -vardpoor = derive { name="vardpoor"; version="0.3.0"; sha256="0gdvnz86c96i90zvbp5a6ljq4pcnx2zcqb0rbhcqhylcyqys054w"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; +vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; -vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; +vcd = derive { name="vcd"; version="1.4-0"; sha256="0gp137hlkg1wm8bhfdpswz0g05a4biprfa5r9i1fz5w0myqgpxca"; depends=[MASS colorspace lmtest]; }; vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; }; vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 quantreg proxy gridExtra]; }; -vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; +vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; }; -vegan = derive { name="vegan"; version="2.2-1"; sha256="06rq9qrcf180isjrczscl84m3jvygz5w2gz5nc4rm1pg89rf6lrd"; depends=[permute lattice MASS cluster mgcv]; }; -vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; }; +vegan = derive { name="vegan"; version="2.3-0"; sha256="1zlz2zq0818735db4l8gfwwxxd5dc0xnx6v8cq6mfclkw1qhcdpx"; depends=[permute lattice MASS cluster mgcv]; }; +vegan3d = derive { name="vegan3d"; version="0.65-1"; sha256="03rzv7l2jjrahj3492ysalyizkv24by35nrhd1bnlb1s88sav7sr"; depends=[vegan rgl scatterplot3d]; }; vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; }; vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; }; vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; @@ -6522,7 +6651,7 @@ vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; -virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; }; +virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[raster ade4 dismo rworldmap]; }; visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; }; visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; }; visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; @@ -6563,10 +6692,11 @@ wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9ls wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[qtl lattice]; }; wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; }; whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; +whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; }; widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; }; wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; -wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi94i6xfsj4dz7g2r7ag0gbah2km9ibbmjqihbk5ccxh5kfd6"; depends=[jsonlite stringr RCurl]; }; +wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[jsonlite stringr rvest httr RCurl]; }; wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; }; windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; }; witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; }; @@ -6582,14 +6712,14 @@ wordnet = derive { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nx wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; -wppExplorer = derive { name="wppExplorer"; version="1.6-1"; sha256="1pgfh9r98yfrk8228iw5hl5pdb4ki6pz49hpf796frd86d94hw0a"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; +wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[zoo ggplot2 reshape2]; }; wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; }; write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; }; wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; }; -wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; }; +wsrf = derive { name="wsrf"; version="1.5.14"; sha256="0j0zlnazz40sv02fl8m5z7rv877m6ak2cms2q3ivy344k8ynjs0m"; depends=[Rcpp Rcpp]; }; wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; }; wux = derive { name="wux"; version="2.0-0"; sha256="04casnfx5cam5a1iqm2x6lldicv11zqxgxjb61qcivga781g5sxg"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor rworldmap]; }; x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; }; @@ -6601,23 +6731,24 @@ xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; }; xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; -xml2 = derive { name="xml2"; version="0.1.0"; sha256="0p00lg8p5naw77k2fk6wbqmqdhj9iv2zn7g00gp7g253lmm8q740"; depends=[Rcpp Rcpp BH]; }; +xml2 = derive { name="xml2"; version="0.1.1"; sha256="1k6xzgx87vqzg1lkc1jaxxlw7zyhzqsis51q5p9jn0q3pw02qf53"; depends=[Rcpp Rcpp BH]; }; xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; }; xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; }; xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; }; xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; }; -xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; }; +xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; }; -yaImpute = derive { name="yaImpute"; version="1.0-23"; sha256="11k7ab5s9zldn0py7zhgi1zcbpsw3bp2xf6s6salv68fhzdgpzp8"; depends=[]; }; +yaImpute = derive { name="yaImpute"; version="1.0-24"; sha256="0vqzcxkrnsj99kpc4fx9lbm446fjgsjcbfakm9pdk013mxiii72d"; depends=[]; }; yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; }; yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; }; ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; }; yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; }; -yuima = derive { name="yuima"; version="1.0.36"; sha256="1rz96v0c9sikjvm3i8x887v1bkiixps691vclpd6i4cchyayx63h"; depends=[zoo expm cubature mvtnorm]; }; +yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[zoo expm cubature mvtnorm]; }; zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; }; zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; +zetadiv = derive { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; }; zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; From bb3db4e6534d26b0be2d3ef8113e8b34463a80d0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Jun 2015 03:54:11 +0300 Subject: [PATCH 286/412] mueval: reapply Nix-specific patch --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1f45351a78..55a7e330aa4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -760,7 +760,7 @@ self: super: { dyre = appendPatch super.dyre ./dyre-nix.patch; # https://github.com/gwern/mueval/issues/9 - mueval = appendPatch super.mueval ./mueval-fix.patch; + mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch; # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; From b6c589b2da2b46aed1dc2950ffae07437606bbff Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 27 May 2015 06:12:26 +0000 Subject: [PATCH 287/412] Simple EC2 user-data VM test --- nixos/lib/test-driver/Machine.pm | 2 - .../scripts/ec2/amazon-base-config.nix | 2 +- nixos/release.nix | 1 + nixos/tests/ec2.nix | 96 +++++++++++++++++++ 4 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/ec2.nix diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 6df8ddb9e95..41088ed75f7 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -43,8 +43,6 @@ sub new { $startCommand .= "-bios $args->{bios} " if defined $args->{bios}; $startCommand .= $args->{qemuFlags} || ""; - } else { - $startCommand = Cwd::abs_path $startCommand; } my $tmpDir = $ENV{'TMPDIR'} || "/tmp"; diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix index d23f15e828b..097d722554c 100644 --- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix +++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix @@ -1,5 +1,5 @@ { modulesPath, ...}: { - imports = [ "${modulesPath}/virtualisation/amazon-config.nix" ]; + imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; services.journald.rateLimitBurst = 0; } diff --git a/nixos/release.nix b/nixos/release.nix index 51a58da4454..103bf9b2c5b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -247,6 +247,7 @@ in rec { tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); + tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix new file mode 100644 index 00000000000..7ea9b3d07f7 --- /dev/null +++ b/nixos/tests/ec2.nix @@ -0,0 +1,96 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with import ../lib/qemu-flags.nix; +with pkgs.lib; + +let + image = + (import ../lib/eval-config.nix { + inherit system; + modules = [ + ../maintainers/scripts/ec2/amazon-hvm-config.nix + ../../nixos/modules/testing/test-instrumentation.nix + { boot.initrd.kernelModules = [ "virtio" "virtio_blk" "virtio_pci" "virtio_ring" ]; } + ]; + }).config.system.build.amazonImage; + + makeEc2Test = { name, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }: + let + metaData = pkgs.stdenv.mkDerivation { + name = "metadata"; + buildCommand = '' + mkdir -p $out/2011-01-01 + ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data + mkdir -p $out/1.0/meta-data + echo "${hostname}" > $out/1.0/meta-data/hostname + '' + optionalString (sshPublicKey != null) '' + mkdir -p $out/1.0/meta-data/public-keys/0 + ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key + ''; + }; + in makeTest { + name = "ec2-" + name; + nodes = {}; + testScript = + '' + use File::Temp qw/ tempfile /; + my ($fh, $filename) = tempfile(); + + `qemu-img create -f qcow2 -o backing_file=${image}/nixos.img $filename`; + + my $startCommand = "qemu-kvm -m 768 -net nic -net 'user,net=169.254.0.0/16,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; + $startCommand .= " -drive file=" . Cwd::abs_path($filename) . ",if=virtio,werror=report"; + $startCommand .= " \$QEMU_OPTS"; + + my $machine = createMachine({ startCommand => $startCommand }); + ${script} + ''; + }; + + snakeOilPrivateKey = [ + "-----BEGIN EC PRIVATE KEY-----" + "MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49" + "AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN" + "r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==" + "-----END EC PRIVATE KEY-----" + ]; + + snakeOilPublicKey = pkgs.lib.concatStrings [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" + "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil" + ]; +in { + bootEc2NixOps = makeEc2Test { + name = "nixops-userdata"; + sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! + + userData = '' + SSH_HOST_DSA_KEY_PUB:${snakeOilPublicKey} + SSH_HOST_DSA_KEY:${pkgs.lib.concatStringsSep "|" snakeOilPrivateKey} + ''; + script = '' + $machine->start; + $machine->waitForFile("/root/user-data"); + $machine->waitForUnit("sshd.service"); + + # We have no keys configured on the client side yet, so this should fail + $machine->fail("ssh -o BatchMode=yes localhost exit"); + + # Let's install our client private key + $machine->succeed("mkdir -p ~/.ssh"); + ${concatMapStrings (s: "$machine->succeed('echo ${s} >> ~/.ssh/id_ecdsa');") snakeOilPrivateKey} + $machine->succeed("chmod 600 ~/.ssh/id_ecdsa"); + + # We haven't configured the host key yet, so this should still fail + $machine->fail("ssh -o BatchMode=yes localhost exit"); + + # Add the host key; ssh should finally succeed + $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"); + $machine->succeed("ssh -o BatchMode=yes localhost exit"); + + $machine->shutdown; + ''; + }; +} From 089f9d6486b9c0d5f27b116468ca131697ef8e16 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 11 Jun 2015 22:00:13 -0500 Subject: [PATCH 288/412] gnuapl: latest version doesn't require liblapack --- pkgs/development/interpreters/gnu-apl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 687b7319cf4..44462161407 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: +{ stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { name = "gnu-apl-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1"; }; - buildInputs = [ liblapack readline gettext ncurses ]; + buildInputs = [ readline gettext ncurses ]; postInstall = '' cp -r support-files/ $out/share/doc/ From da6eec001ab9437a50d4f91d8c1a3704c193647c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 11 Jun 2015 22:10:56 -0500 Subject: [PATCH 289/412] nixpkgs: z3 4.3.2 -> 4.4.0 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/z3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 2296a28444b..fb3fb959ae6 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3"; - sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci"; + rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; + sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; }; buildInputs = [ python ]; From 4b758e374e19774509a5c93726d79dde4744a8bc Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 10 Apr 2015 06:06:52 +0200 Subject: [PATCH 290/412] Initial attempt at configuring from EC2 userdata (with input from cstrahan). Now with VM tests! --- .../scripts/ec2/amazon-base-config.nix | 2 +- nixos/modules/virtualisation/amazon-init.nix | 52 +++++++++++++++++++ nixos/release.nix | 3 +- nixos/tests/ec2.nix | 25 ++++++++- 4 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/virtualisation/amazon-init.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix index 097d722554c..28317317eab 100644 --- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix +++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix @@ -1,5 +1,5 @@ { modulesPath, ...}: { - imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; + imports = [ "${modulesPath}/virtualisation/amazon-init.nix" ]; services.journald.rateLimitBurst = 0; } diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix new file mode 100644 index 00000000000..c5dfb3643e1 --- /dev/null +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -0,0 +1,52 @@ +{ config, pkgs, modulesPath, ... }: + +# This attempts to pull a nix expression from this EC2 instance's user-data. + +let + bootScript = pkgs.writeScript "bootscript.sh" '' + #!${pkgs.stdenv.shell} -eux + + echo "attempting to fetch configuration from user-data..." + + export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH + export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels + + userData="$(mktemp)" + wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData" + + if [[ $? -eq 0 ]]; then + echo "user-data fetched" + # If the user-data looks like it could be a nix expression, + # copy it over. Also, look for a magic three-hash comment and set + # that as the channel. + if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then + channels="$(grep '^###' "$userData" | sed 's|###\s*||')" + printf "%s" "$channels" | while read channel; do + echo "writing channel: $channel" + done + + if [[ -n "$channels" ]]; then + printf "%s" "$channels" > /root/.nix-channels + nix-channel --update + fi + + echo "setting configuration" + cp "$userData" /etc/nixos/configuration.nix + else + echo "user-data does not appear to be a nix expression; ignoring" + fi + else + echo "failed to fetch user-data" + fi + + type -f nixos-rebuild + + nixos-rebuild switch + ''; +in { + imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; + ec2.metadata = true; + boot.postBootCommands = '' + ${bootScript} & + ''; +} diff --git a/nixos/release.nix b/nixos/release.nix index 103bf9b2c5b..6afcdbff3e1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -247,7 +247,8 @@ in rec { tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); - tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps; + tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; + tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 7ea9b3d07f7..1296ff4e8e3 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -62,7 +62,7 @@ let "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil" ]; in { - bootEc2NixOps = makeEc2Test { + boot-ec2-nixops = makeEc2Test { name = "nixops-userdata"; sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! @@ -93,4 +93,27 @@ in { $machine->shutdown; ''; }; + + boot-ec2-config = makeEc2Test { + name = "config-userdata"; + sshPublicKey = snakeOilPublicKey; + + userData = '' + ### http://nixos.org/channels/nixos-unstable nixos + { + imports = [ + + + ]; + environment.etc.testFile = { + text = "whoa"; + }; + } + ''; + script = '' + $machine->start; + $machine->waitForFile("/etc/testFile"); + $machine->succeed("cat /etc/testFile | grep -q 'whoa'"); + ''; + }; } From 214aae46c79186d4d96fd434b55cdf701cb48307 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2015 10:32:36 +0200 Subject: [PATCH 291/412] emacs-monky: add an Mercurial mode that's inspired by Magit --- .../editors/emacs-modes/monky/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/monky/default.nix diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix new file mode 100644 index 00000000000..8e35a4e2b57 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/monky/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + name = "emacs-monky-20150404"; + + src = fetchurl { + url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip"; + sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj"; + }; + + buildInputs = [ emacs unzip ]; + + buildPhase = "emacs -L . --batch -f batch-byte-compile *.el"; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2630b2f79b..a6a6ed3aeeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10934,6 +10934,8 @@ let metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; + monky = callPackage ../applications/editors/emacs-modes/monky { }; + notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; From 4d404fd6a48e67db0c9da507d6dbf829cb47e3de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2015 10:50:40 +0200 Subject: [PATCH 292/412] ihaskell-wrapper: avoid use of /bin/sh https://github.com/NixOS/nixpkgs/issues/183 --- pkgs/development/tools/haskell/ihaskell/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 035ad738a82..c00f46577a8 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -7,7 +7,7 @@ let self.ihaskell-display ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' - #!/bin/sh + #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin" ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell From 69829dd4ff0248a3b96970e9e2b94790c738bf30 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 11:22:59 +0200 Subject: [PATCH 293/412] Debian: Update to 8.1 --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 53a01365435..c4fefe4d501 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1710,22 +1710,22 @@ rec { }; debian8i386 = { - name = "debian-8.0-jessie-i386"; - fullName = "Debian 8.0 Jessie (i386)"; + name = "debian-8.1-jessie-i386"; + fullName = "Debian 8.1 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d"; + sha256 = "e658c2aebc3c0bc529e89de3ad916a71372f0a80161111d86a7dab1026644507"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.0-jessie-amd64"; - fullName = "Debian 8.0 Jessie (amd64)"; + name = "debian-8.1-jessie-amd64"; + fullName = "Debian 8.1 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4"; + sha256 = "265907f3cb05aff5f653907e9babd4704902f78cd5e355d4cd4ae590e4d5b043"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 248a1b4d51555ce1ca5c3d8d496ec4ee9ef07f54 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 12 Jun 2015 11:45:58 +0200 Subject: [PATCH 294/412] nixos-artwork: only download the necessary artwork --- pkgs/data/misc/nixos-artwork/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index 99f3e8b1177..b35a96fff82 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "nixos-artwork-2015-02-27"; # Remember to check the default lightdm wallpaper when updating - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixos-artwork"; - rev = "e71b6846023919136795ede22b16d73b2cf1693d"; - sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + GnomeDark = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; + sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; }; + unpackPhase = "true"; + installPhase = '' - mkdir -p $out/share/artwork - cp -r * $out/share/artwork - find $out -name \*.xcf -exec rm {} \; + mkdir -p $out/share/artwork/gnome + ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png ''; meta = with stdenv.lib; { - homepage = "https://github.com/NixOS/nixos-artwork"; + homepage = https://github.com/NixOS/nixos-artwork; platforms = platforms.all; }; } From 69f4fc4be6e799fbd7aa3bafa8849e24e8f1d4fb Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Jun 2015 11:53:33 +0200 Subject: [PATCH 295/412] Add hicolor_icon_theme dependency This avoids having icon-theme.cache generated. --- pkgs/applications/audio/gmpc/default.nix | 4 ++-- pkgs/tools/misc/gparted/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 7cc8aeda367..4da235dd8a9 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite +, libSM, libICE, sqlite, hicolor_icon_theme }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup - libunique libmpd gob2 vala libSM libICE sqlite + libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index dd2798de272..464e40ec014 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid -, pkgconfig, gtkmm, libxml2 }: +, pkgconfig, gtkmm, libxml2, hicolor_icon_theme +}: stdenv.mkDerivation rec { name = "gparted-0.22.0"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-doc"; buildInputs = [ - parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 + parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme ]; meta = with stdenv.lib; { From 0a7c5e4f686ade2cfac329afdaee5da05a366556 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Jun 2015 10:34:00 +0200 Subject: [PATCH 296/412] cygwin: libedit patch for cygwin --- .../libraries/libedit/01-cygwin.patch | 25 +++++++++++++++++++ .../development/libraries/libedit/default.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libedit/01-cygwin.patch diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/development/libraries/libedit/01-cygwin.patch new file mode 100644 index 00000000000..33bd39ed61e --- /dev/null +++ b/pkgs/development/libraries/libedit/01-cygwin.patch @@ -0,0 +1,25 @@ +--- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 ++++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 +@@ -56,9 +56,11 @@ + /* Oh for a with char32_t and __STDC_UTF_32__ in it... + * ref: ISO/IEC DTR 19769 + */ ++#ifndef __CYGWIN__ + #if WCHAR_MAX < INT32_MAX + #warning Build environment does not support non-BMP characters + #endif ++#endif + + #ifndef HAVE_WCSDUP + wchar_t *wcsdup(const wchar_t *s); +--- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 ++++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 +@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; + + #ifndef CTRL + #include +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__) + #include + #endif + #ifndef CTRL diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 61bb15dde7d..dc2f5842b28 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; + patches = if stdenv.isCygwin then [ + ./01-cygwin.patch + ] else null; + postInstall = '' sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; From 85b7673e92029853311c84aabec677092024d898 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Jun 2015 15:47:32 +0200 Subject: [PATCH 297/412] cygwin: turn off tests for swig since they depend on tcl (which i havent yet figure out how to build) --- pkgs/development/tools/misc/swig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index c4fcd315845..e10fd25d046 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - doCheck = true; + doCheck = !stdenv.isCygwin; # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; From d5087119c63ce8820c564e392ddb8e3c1865855e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Jun 2015 15:49:11 +0200 Subject: [PATCH 298/412] cygwin: remove kerberos from builsInputs for serf --- pkgs/development/libraries/serf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index df8749622be..580460d5fc0 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c"; }; - buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ]; + buildInputs = [ apr scons openssl aprutil zlib ] + ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos + ++ [ pkgconfig ]; configurePhase = '' ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { APU="$(echo "${aprutil}"/bin/*-config)" CC="${ if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc" }" ${ - if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\"" + if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" } ''; From 7c67c350a3cd1d3074efb826f70d5017d2f28cf8 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Jun 2015 15:50:14 +0200 Subject: [PATCH 299/412] cygwin: turn off ldap and crypt for apr-util to make it build --- pkgs/development/libraries/apr-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 0f21af94c64..bceb10e3355 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? false, db -, ldapSupport ? true, openldap +, ldapSupport ? !stdenv.isCygwin, openldap , libiconv }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = '' --with-apr=${apr} --with-expat=${expat} - --with-crypto + ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"} From fac474080f4f71fd751c718d24d0cec88a3538e4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 9 Jun 2015 14:49:39 +0200 Subject: [PATCH 300/412] cygwin: patchShebangs fails without proper findutils --- pkgs/development/libraries/libevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 74524164dd0..19878a24e95 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, python }: +{ stdenv, fetchFromGitHub, autoreconfHook, python, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ python ]; + buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; patchPhase = '' patchShebangs event_rpcgen.py From 277c263c1e2497a9c0009be242939ed4f7615a24 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 14:08:12 +0200 Subject: [PATCH 301/412] cygwin: update patch for cmake 3.2.2 --- .../build-managers/cmake/3.2.2-cygwin.patch | 274 ++++++++++++++++++ .../tools/build-managers/cmake/default.nix | 7 +- 2 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch new file mode 100644 index 00000000000..982aba17e87 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch @@ -0,0 +1,274 @@ +--- cmake-3.2.2/Source/cmFileCommand.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/ccmFileCommand.cxx 2015-06-10 11:02:27.345598700 +0200 +@@ -1179,7 +1179,7 @@ + MatchProperties CollectMatchProperties(const char* file) + { + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string lower = cmSystemTools::LowerCase(file); + const char* file_to_match = lower.c_str(); + #else +--- cmake-3.2.2/Source/cmInstallCommand.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/cmInstallCommand.cxx 2015-06-10 11:04:19.257935200 +0200 +@@ -1138,7 +1138,7 @@ + { + literal_args += " REGEX \""; + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string regex = cmSystemTools::LowerCase(args[i]); + #else + std::string regex = args[i]; +--- cmake-3.2.2/Source/kwsys/Glob.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/Glob.cxx 2015-06-10 11:05:51.602674000 +0200 +@@ -37,7 +37,7 @@ + #include + namespace KWSYS_NAMESPACE + { +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + // On Windows and apple, no difference between lower and upper case + # define KWSYS_GLOB_CASE_INDEPENDENT + #endif +--- cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-06-10 11:13:00.308303500 +0200 +@@ -911,7 +911,7 @@ + // Hide implementation details in an anonymous namespace. + namespace { + // ***************************************************************************** +-#if defined(__linux) || defined(__APPLE__) ++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + int LoadLines( + FILE *file, + kwsys_stl::vector &lines) +@@ -947,7 +947,7 @@ + return nRead; + } + +-# if defined(__linux) ++# if defined(__linux) || defined(__CYGWIN__) + // ***************************************************************************** + int LoadLines( + const char *fileName, +@@ -986,7 +986,7 @@ + } + #endif + +-#if defined(__linux) ++#if defined(__linux) || defined(__CYGWIN__) + // **************************************************************************** + template + int GetFieldsFromFile( +@@ -3132,7 +3132,6 @@ + pos = buffer.find("processor\t",pos+1); + } + +-#ifdef __linux + // Find the largest physical id. + int maxId = -1; + kwsys_stl::string idc = +@@ -3165,14 +3164,6 @@ + atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str()); + } + +-#else // __CYGWIN__ +- // does not have "physical id" entries, neither "cpu cores" +- // this has to be fixed for hyper-threading. +- kwsys_stl::string cpucount = +- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); +- this->NumberOfPhysicalCPU= +- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); +-#endif + // gotta have one, and if this is 0 then we get a / by 0n + // better to have a bad answer than a crash + if(this->NumberOfPhysicalCPU <= 0) +@@ -3370,7 +3361,7 @@ + GlobalMemoryStatusEx(&statex); + return statex.ullTotalPhys/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memTotal=0; + int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); + if (ierr) +@@ -3501,7 +3492,7 @@ + GlobalMemoryStatusEx(&statex); + return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + const char *names[3]={"MemTotal:","MemFree:",NULL}; + SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; + int ierr=GetFieldsFromFile("/proc/meminfo",names,values); +@@ -3560,7 +3551,7 @@ + return -2; + } + return pmc.WorkingSetSize/1024; +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memUsed=0; + int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); + if (ierr) +@@ -3612,7 +3603,7 @@ + { + #if defined(_WIN32) + return GetCurrentProcessId(); +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + return getpid(); + #else + return -1; +--- cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-06-10 11:21:58.980443200 +0200 +@@ -93,19 +93,12 @@ + # if defined(_MSC_VER) && _MSC_VER >= 1800 + # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx + # endif +-#elif defined (__CYGWIN__) +-# include +-# undef _WIN32 + #endif + + #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H + extern char **environ; + #endif + +-#ifdef __CYGWIN__ +-# include +-#endif +- + // getpwnam doesn't exist on Windows and Cray Xt3/Catamount + // same for TIOCGWINSZ + #if defined(_WIN32) || defined (__LIBCATAMOUNT__) +@@ -1148,15 +1141,7 @@ + { + return false; + } +-#if defined(__CYGWIN__) +- // Convert filename to native windows path if possible. +- char winpath[MAX_PATH]; +- if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath)) +- { +- return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES); +- } +- return access(filename.c_str(), R_OK) == 0; +-#elif defined(_WIN32) ++#if defined(_WIN32) + return (GetFileAttributesW( + SystemTools::ConvertToWindowsExtendedPath(filename).c_str()) + != INVALID_FILE_ATTRIBUTES); +@@ -1190,28 +1175,6 @@ + } + + //---------------------------------------------------------------------------- +-#ifdef __CYGWIN__ +-bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) +-{ +- SystemToolsTranslationMap::iterator i = +- SystemTools::Cyg2Win32Map->find(path); +- +- if (i != SystemTools::Cyg2Win32Map->end()) +- { +- strncpy(win32_path, i->second.c_str(), MAX_PATH); +- } +- else +- { +- if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) +- { +- win32_path[0] = 0; +- } +- SystemToolsTranslationMap::value_type entry(path, win32_path); +- SystemTools::Cyg2Win32Map->insert(entry); +- } +- return win32_path[0] != 0; +-} +-#endif + + bool SystemTools::Touch(const kwsys_stl::string& filename, bool create) + { +@@ -4307,7 +4270,7 @@ + + bool SystemTools::FileIsFullPath(const char* in_name, size_t len) + { +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + // On Windows, the name must be at least two characters long. + if(len < 2) + { +@@ -5078,9 +5041,6 @@ + static unsigned int SystemToolsManagerCount; + SystemToolsTranslationMap *SystemTools::TranslationMap; + SystemToolsTranslationMap *SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; +-#endif + + // SystemToolsManager manages the SystemTools singleton. + // SystemToolsManager should be included in any translation unit +@@ -5126,9 +5086,6 @@ + // Allocate the translation map first. + SystemTools::TranslationMap = new SystemToolsTranslationMap; + SystemTools::LongPathMap = new SystemToolsTranslationMap; +-#ifdef __CYGWIN__ +- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; +-#endif + + // Add some special translation paths for unix. These are not added + // for windows because drive letters need to be maintained. Also, +@@ -5183,9 +5140,6 @@ + { + delete SystemTools::TranslationMap; + delete SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +- delete SystemTools::Cyg2Win32Map; +-#endif + } + + +--- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-06-10 11:24:24.271286600 +0200 +@@ -298,15 +298,6 @@ + static bool FileExists(const kwsys_stl::string& filename); + + /** +- * Converts Cygwin path to Win32 path. Uses dictionary container for +- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll +- * for actual translation. Returns true on success, else false. +- */ +-#ifdef __CYGWIN__ +- static bool PathCygwinToWin32(const char *path, char *win32_path); +-#endif +- +- /** + * Return file length + */ + static unsigned long FileLength(const kwsys_stl::string& filename); +@@ -942,9 +933,6 @@ + */ + static SystemToolsTranslationMap *TranslationMap; + static SystemToolsTranslationMap *LongPathMap; +-#ifdef __CYGWIN__ +- static SystemToolsTranslationMap *Cyg2Win32Map; +-#endif + friend class SystemToolsManager; + }; + +--- cmake-3.2.2/Modules/FindCurses.cmake 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Modules/FindCurses.cmake 2015-06-10 12:10:19.682030300 +0200 +@@ -60,15 +60,6 @@ + if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) + set(CURSES_USE_NCURSES TRUE) + endif() +-# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html +-# cygwin ncurses stopped providing curses.h symlinks see above +-# message. Cygwin is an ncurses package, so force ncurses on +-# cygwin if the curses.h is missing +-if(CYGWIN) +- if(NOT EXISTS /usr/include/curses.h) +- set(CURSES_USE_NCURSES TRUE) +- endif() +-endif() + + + # Not sure the logic is correct here. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9f2ed0a7352..e882f47cfe3 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch; + }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ] - ++ optional (jsoncpp != null) jsoncpp + ++ optional (jsoncpp != null && !stdenv.isCygwin) jsoncpp ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -53,8 +53,7 @@ stdenv.mkDerivation rec { "--docdir=/share/doc/${name}" "--mandir=/share/man" ] - ++ optional (!stdenv.isCygwin) "--system-libs" - ++ optional (jsoncpp == null) "--no-system-jsoncpp" + ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp" ++ optional useQt4 "--qt-gui" ++ ["--"] ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; From b980b7445f7335e59b32bf6265e865ccde039625 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 14:09:44 +0200 Subject: [PATCH 302/412] cygwin: skip ssl support for postgresql (temporary) --- pkgs/servers/sql/postgresql/9.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index e04309fc466..5c51a7c578a 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - configureFlags = [ "--with-openssl" ]; + configureFlags = stdenv.lib.optionals (!stdenv.isCygwin) [ "--with-openssl" ]; patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; From 0860826795dddb0f00a975f54f2e71521fac6770 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jun 2015 14:37:46 +0200 Subject: [PATCH 303/412] cygwin: cmake expression should not change for linux --- pkgs/development/tools/build-managers/cmake/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index e882f47cfe3..8cdf231729f 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { "--docdir=/share/doc/${name}" "--mandir=/share/man" ] + ++ optional (!stdenv.isCygwin) "--system-libs" ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp" ++ optional useQt4 "--qt-gui" ++ ["--"] From 617c16f8f68088b78e815dd539eda0d3f1241da7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jun 2015 16:25:56 +0200 Subject: [PATCH 304/412] cygwin: python27 gdbm module needs gettext --- pkgs/development/interpreters/python/2.7/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index e67c2682998..4ad4679bd6e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, self, callPackage -, bzip2, openssl +, bzip2, openssl, gettext , includeModules ? false , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true +, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi }: @@ -224,7 +224,7 @@ let gdbm = buildInternalPythonModule { moduleName = "gdbm"; internalName = "gdbm"; - deps = [ gdbm ]; + deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext; }; sqlite3 = buildInternalPythonModule { From 36a1d2d4f8c74a58ca6c56b7d768753c0dac0752 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 12 Jun 2015 13:49:28 +1200 Subject: [PATCH 305/412] Update tor to 0.2.6.9 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index c6a5917640e..bfa1a0ab9f4 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.6.8"; + name = "tor-0.2.6.9"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq"; + sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a"; }; # Note: torsocks is specified as a dependency, as the distributed From a6e12c23fcb5890e44094b95a91ddb6c3e9cc081 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 8 Jun 2015 19:56:37 +0200 Subject: [PATCH 306/412] Link Xen scripts to /etc/xen --- nixos/modules/virtualisation/xen-dom0.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index ea9f61aad6a..65efdabb3b4 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -6,7 +6,6 @@ with lib; let cfg = config.virtualisation.xen; - xen = pkgs.xen; in { @@ -88,9 +87,9 @@ in message = "Xen currently does not support EFI boot"; } ]; - virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored"; + virtualisation.xen.stored = mkDefault "${pkgs.xen}/bin/oxenstored"; - environment.systemPackages = [ xen ]; + environment.systemPackages = [ pkgs.xen ]; # Make sure Domain 0 gets the required configuration #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; }; @@ -122,7 +121,7 @@ in system.extraSystemBuilderCmds = '' - ln -s ${xen}/boot/xen.gz $out/xen.gz + ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz echo "${toString cfg.bootParams}" > $out/xen-params ''; @@ -158,13 +157,16 @@ in environment.etc = - [ { source = "${xen}/etc/xen/xl.conf"; + [ { source = "${pkgs.xen}/etc/xen/xl.conf"; target = "xen/xl.conf"; } + { source = "${pkgs.xen}/etc/xen/scripts"; + target = "xen/scripts"; + } ]; # Xen provides udev rules. - services.udev.packages = [ xen ]; + services.udev.packages = [ pkgs.xen ]; services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; From 399b5496119d1f81fb64dc1a86143adade698129 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 9 Jun 2015 15:08:06 +0200 Subject: [PATCH 307/412] Fix: xen-bridge systemd service --- nixos/modules/virtualisation/xen-dom0.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 65efdabb3b4..7b5d714622c 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -262,16 +262,13 @@ in wantedBy = [ "multi-user.target" ]; before = [ "xen-domains.service" ]; serviceConfig.RemainAfterExit = "yes"; - serviceConfig.ExecStart = '' - ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge} - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up - ''; - serviceConfig.ExecStop = '' - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down - ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge} - ''; + serviceConfig.ExecStart = "${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}"; + postStart = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up"; + serviceConfig.ExecStop = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down"; + postStop = "${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}"; }; + systemd.services.xen-domains = { description = "Xen domains - automatically starts, saves and restores Xen domains"; wantedBy = [ "multi-user.target" ]; From dbac15d66c887689e7701837ffb462fa5820025d Mon Sep 17 00:00:00 2001 From: Robbin C Date: Tue, 9 Jun 2015 17:07:11 +0800 Subject: [PATCH 308/412] aacgain: Add package. This adds aacgain which is a normalizer for AAC (.m4a) audio files. --- pkgs/applications/audio/aacgain/default.nix | 72 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/audio/aacgain/default.nix diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix new file mode 100644 index 00000000000..4cfc51970aa --- /dev/null +++ b/pkgs/applications/audio/aacgain/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }: + +stdenv.mkDerivation { + name = "aacgain-1.9"; + srcs = [ + (fetchgit { + url = "https://github.com/mecke/aacgain.git"; + rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8"; + sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4"; + }) + mp3gain.src + mp4v2.src + faad2.src + ]; + + buildInputs = [ unzip m4 libtool automake autoconf ]; + + setSourceRoot = "sourceRoot=`pwd`"; + + postUnpack = '' + cd $sourceRoot + # mp3gain does not unzip to its own directory, so move files accordingly. + mkdir mp3gain + find . -type f -maxdepth 1 -exec mv {} mp3gain/ \; + mv mpglibDBL mp3gain/ + + mv aacgain-* aacgain + mv faad2-* faad2 + mv mp4v2-* mp4v2 + ''; + + patchPhase = '' + cd $sourceRoot + patch -p2 -N < aacgain/linux/mp3gain.patch + ''; + + configurePhase = '' + cd $sourceRoot/mp4v2 + ./configure + + cd $sourceRoot/faad2 + ./configure + ''; + + buildPhase = '' + cd $sourceRoot/mp4v2 + make libmp4v2.la + + cd $sourceRoot/faad2/libfaad + make + + cd $sourceRoot/aacgain/linux + sh prepare.sh + mkdir build + cd build + ../../../configure + make + ''; + + installPhase = '' + strip -s aacgain/aacgain + install -vD aacgain/aacgain "$out/bin/aacgain" + ''; + + meta = { + description = "ReplayGain for AAC files"; + homepage = https://github.com/mecke/aacgain.git; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6a6ed3aeeb..093c9d15540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10404,6 +10404,8 @@ let a2jmidid = callPackage ../applications/audio/a2jmidid { }; + aacgain = callPackage ../applications/audio/aacgain { }; + aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; From 681cbedd4a522b0ef99f49cba4c5e53b3920d718 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Wed, 10 Jun 2015 17:43:34 +0800 Subject: [PATCH 309/412] aacgain: Use fetchFromGitHub instead of fetchgit. --- pkgs/applications/audio/aacgain/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 4cfc51970aa..3f1c67a2a61 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }: +{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }: stdenv.mkDerivation { name = "aacgain-1.9"; srcs = [ - (fetchgit { - url = "https://github.com/mecke/aacgain.git"; + (fetchFromGitHub { + owner = "mecke"; + repo = "aacgain"; rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8"; sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4"; }) From c07fb11cd2c7495780200f26ac798574ea0dd111 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Thu, 11 Jun 2015 00:12:46 +0800 Subject: [PATCH 310/412] aacgain: Use more up-to-date upstream repository. Use more up-to-date upstream repostiory, which allows for a cleaner build. It includes mp4v2 and faad, which will be built statically and linked to the resulting binary. --- pkgs/applications/audio/aacgain/default.nix | 65 ++++++--------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 3f1c67a2a61..69cc798ec0f 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,61 +1,34 @@ -{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "aacgain-1.9"; - srcs = [ - (fetchFromGitHub { - owner = "mecke"; - repo = "aacgain"; - rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8"; - sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4"; - }) - mp3gain.src - mp4v2.src - faad2.src - ]; - - buildInputs = [ unzip m4 libtool automake autoconf ]; - - setSourceRoot = "sourceRoot=`pwd`"; - - postUnpack = '' - cd $sourceRoot - # mp3gain does not unzip to its own directory, so move files accordingly. - mkdir mp3gain - find . -type f -maxdepth 1 -exec mv {} mp3gain/ \; - mv mpglibDBL mp3gain/ - - mv aacgain-* aacgain - mv faad2-* faad2 - mv mp4v2-* mp4v2 - ''; - - patchPhase = '' - cd $sourceRoot - patch -p2 -N < aacgain/linux/mp3gain.patch - ''; + name = "aacgain-1.9.0"; + src = fetchFromGitHub { + owner = "mulx"; + repo = "aacgain"; + rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; + sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0"; + }; configurePhase = '' - cd $sourceRoot/mp4v2 + cd mp4v2 ./configure - cd $sourceRoot/faad2 + cd ../faad2 + ./configure + + cd .. ./configure ''; buildPhase = '' - cd $sourceRoot/mp4v2 + cd mp4v2 make libmp4v2.la - cd $sourceRoot/faad2/libfaad - make + cd ../faad2 + make LDFLAGS=-static - cd $sourceRoot/aacgain/linux - sh prepare.sh - mkdir build - cd build - ../../../configure - make + cd .. + make ''; installPhase = '' @@ -65,7 +38,7 @@ stdenv.mkDerivation { meta = { description = "ReplayGain for AAC files"; - homepage = https://github.com/mecke/aacgain.git; + homepage = https://github.com/mulx/aacgain; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; From da7748a6fc47e9efec56470ec01f9a137c14816f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 12 Jun 2015 13:02:06 +0200 Subject: [PATCH 311/412] nixos: set high fs.inotify.max_user_watches when xserver is enabled --- nixos/modules/services/x11/xserver.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 5198864ef6e..9fddc6a7210 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -469,6 +469,11 @@ in environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; + # The default max inotify watches is 8192. + # Nowadays most apps require a good number of inotify watches, + # the value below is used by default on several other distros. + boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288; + systemd.defaultUnit = mkIf cfg.autorun "graphical.target"; systemd.services.display-manager = From 4e9327e7acbab44f7b562cfe37daf894106c7286 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Wed, 27 May 2015 17:57:26 +0000 Subject: [PATCH 312/412] add qt decrypt ssl traffic option this introduces an argument to qt5 that if enabled allows e.g. wireshark to show decrypted ssl traffic from a qt application --- pkgs/development/libraries/qt-5/5.4/0100-ssl.patch | 13 +++++++++++++ pkgs/development/libraries/qt-5/5.4/default.nix | 3 ++- pkgs/development/libraries/qt-5/5.4/qtbase.nix | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.4/0100-ssl.patch diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch new file mode 100644 index 00000000000..4607274de74 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch @@ -0,0 +1,13 @@ +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +index 8833e3f..c56d381 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -47,7 +47,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index c7e3a5c6123..139bba2db89 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -20,6 +20,7 @@ # options , developerBuild ? false +, decryptSslTraffic ? false }: with autonix; @@ -61,7 +62,7 @@ let # GNOME dependencies are not used unless gtkStyle == true inherit (gnome) libgnomeui GConf gnome_vfs; bison = bison2; # error: too few arguments to function 'int yylex(... - inherit developerBuild srcs version; + inherit developerBuild srcs version decryptSslTraffic; }; connectivity = callPackage diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 9e11dcdde86..7ef39a40860 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -20,6 +20,7 @@ , buildTests ? false , developerBuild ? false , gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, decryptSslTraffic ? false }: with stdenv.lib; @@ -68,7 +69,8 @@ stdenv.mkDerivation { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-xdg_config_dirs.patch - ]; + ] + ++ (optional decryptSslTraffic ./0100-ssl.patch); preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" From cbbefbdabb698b69357f4b758cfa525170f36e7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Jun 2015 13:08:14 +0200 Subject: [PATCH 313/412] mcelog -> 120 Fix potential NULL reference while parsing kernel efi files --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 1706b8b87fa..63bab2ddd76 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "119"; in +let version = "120"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp"; + sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 192d20e8203dfac526add4da26c5076c60d82e23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 13:19:35 +0200 Subject: [PATCH 314/412] nix: Update to 1.9 --- pkgs/tools/package-management/nix/default.nix | 12 +++++------- pkgs/tools/package-management/nix/xfs.patch | 13 ------------- pkgs/top-level/all-packages.nix | 7 +++++-- 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 pkgs/tools/package-management/nix/xfs.patch diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2d105113133..d64e194e93e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc, perlPackages, libsodium , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.8"; + name = "nix-1.9"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c"; + sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1"; }; - patches = [ ./xfs.patch ]; - nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl sqlite ]; + buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium; propagatedBuildInputs = [ boehmgc ]; diff --git a/pkgs/tools/package-management/nix/xfs.patch b/pkgs/tools/package-management/nix/xfs.patch deleted file mode 100644 index 62ee9189ac1..00000000000 --- a/pkgs/tools/package-management/nix/xfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc -index 119e71a..422ec97 100644 ---- a/src/libexpr/primops.cc -+++ b/src/libexpr/primops.cc -@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val - for (auto & ent : entries) { - Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name)); - if (ent.type == DT_UNKNOWN) -- ent.type = getFileType(path); -+ ent.type = getFileType(path + "/" + ent.name); - mkStringNoCopy(*ent_val, - ent.type == DT_REG ? "regular" : - ent.type == DT_DIR ? "directory" : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 093c9d15540..22ff26e098e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14431,10 +14431,13 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { + nixUnstable = nixStable; + /* + nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - }; + }); + */ nixops = callPackage ../tools/package-management/nixops { }; From 07aa0f7f2165ac0dcab2441cc54940bc4a28e6ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 13:20:18 +0200 Subject: [PATCH 315/412] Revert "Use nixUnstable by default" This reverts commit 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120. --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 42a9d46f1d6..6d25fef4576 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -63,7 +63,7 @@ in package = mkOption { type = types.package; - default = pkgs.nixUnstable; + default = pkgs.nix; description = '' This option specifies the Nix package instance to use throughout the system. ''; From e982ac10177a67ea460928096edb43f65801ec70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 13:47:30 +0200 Subject: [PATCH 316/412] php: Update to 5.4.42, 5.6.10 CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- pkgs/development/interpreters/php/5.6.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c10425631b3..c1ba35a9134 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.4.41"; - sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v"; + phpVersion = "5.4.42"; + sha = "1yg03b6a88i7hg593m9zmmcm4kr59wdrhz9xk1frx9ps9gkb51b2"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 425f51ce5c6..e05f1ae10bd 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.6.9"; - sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr"; + phpVersion = "5.6.10"; + sha = "0iccgibmbc659z6dh6c58l1b7vnqly7al37fbs0l3si4qy0rqmqa"; apacheHttpd = apacheHttpd; } From cb6daa036bf4de47fc73ad4a9ce218d845902a5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 13:50:37 +0200 Subject: [PATCH 317/412] sqlite: Update to 3.8.10.2 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ee8aec79af1..963566e27fa 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.10.1"; + name = "sqlite-3.8.10.2"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz"; - sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0"; + url = "http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz"; + sha1 = "c2f2c17d3dc4c4e179d35cc04e4420636d48a152"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; From 74e4f6befab4514c6ee5bef7a4f3cfdae302ce68 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 Jun 2015 07:26:47 -0500 Subject: [PATCH 318/412] ipopt: build with openblas --- .../development/libraries/science/math/ipopt/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 4dd1ca46e95..89d2a242f96 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }: +{ stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { version = "3.12.3"; @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO" ''; + configureFlags = [ + "--with-blas-lib=-lopenblas" + "--with-lapack-lib=-lopenblas" + ]; + nativeBuildInputs = [ unzip ]; - buildInputs = [ gfortran blas liblapack ]; + buildInputs = [ gfortran openblas ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c46414c9e..937c404d74f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13883,7 +13883,7 @@ let suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_4_4; - ipopt = callPackage ../development/libraries/science/math/ipopt { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; ### SCIENCE/MOLECULAR-DYNAMICS From 4fb98dd6a760315f5219e15d599200271d890ef3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 Jun 2015 07:56:04 -0500 Subject: [PATCH 319/412] jags: build with openblas --- pkgs/applications/science/math/jags/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 785c2460bb4..9d70d268691 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, liblapack, blas}: +{stdenv, fetchurl, gfortran, openblas}: stdenv.mkDerivation rec { name = "JAGS-3.4.0"; @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; - buildInputs = [gfortran liblapack blas]; + buildInputs = [gfortran openblas]; + configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; meta = { description = "Just Another Gibbs Sampler"; From c02dd4a7260f36901088830ae23d9723968ed066 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 Jun 2015 08:04:02 -0500 Subject: [PATCH 320/412] Update release notes about OpenBLAS --- nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index cf67014a69d..fcbf6ed0add 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -153,6 +153,19 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + + The OpenBLAS library has been updated to version + 0.2.14. Support for the + x86_64-darwin platform was added. Dynamic + architecture detection was enabled; OpenBLAS now selects + microarchitecture-optimized routines at runtime, so optimal + performance is achieved without the need to rebuild OpenBLAS + locally. OpenBLAS has replaced ATLAS in most packages which use an + optimized BLAS or LAPACK implementation. + + + From 32ed6018831954a5c2345ddff7de640521c620a5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 29 May 2015 12:46:49 +0200 Subject: [PATCH 321/412] init ladspaPlugins-git at git-2015-03-04 --- .../applications/audio/ladspa-plugins/git.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/ladspa-plugins/git.nix diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix new file mode 100644 index 00000000000..e9ab932a88e --- /dev/null +++ b/pkgs/applications/audio/ladspa-plugins/git.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }: + +stdenv.mkDerivation { + name = "swh-plugins-git-2015-03-04"; + + src = fetchgit { + url = https://github.com/swh/ladspa.git; + rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686"; + sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e"; + }; + + buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; + + patchPhase = '' + patchShebangs . + patchShebangs ./metadata/ + cp ${automake}/share/automake-*/mkinstalldirs . + ''; + + configurePhase = '' + autoreconf -i + ./configure --prefix=$out + ''; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk/; + description = "LADSPA format audio plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b55478313a5..a1bec97f066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11622,6 +11622,10 @@ let fftw = fftwSinglePrec; }; + ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix { + fftw = fftwSinglePrec; + }; + ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; caps = callPackage ../applications/audio/caps { }; From 90f0bb83c3e77cc9548e68845df251f2c7015290 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 12 Jun 2015 17:06:32 +0200 Subject: [PATCH 322/412] dotnet: Add FSharpDataSQLProvider, FsPickler and Suave --- pkgs/top-level/dotnet-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 852856d4c69..3aca091f0df 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -14,6 +14,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { + # BINARY PACKAGES + Autofac = fetchNuGet { baseName = "Autofac"; version = "3.5.2"; @@ -44,6 +46,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpDataSQLProvider = fetchNuGet { + baseName = "SQLProvider"; + version = "0.0.9-alpha"; + sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w"; + outputFiles = [ "lib/net40/*" ]; + }; + FsCheck = fetchNuGet { baseName = "FsCheck"; version = "1.0.4"; @@ -58,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsPickler = fetchNuGet { + baseName = "FsPickler"; + version = "1.2.9"; + sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4"; + outputFiles = [ "lib/net45/*" ]; + }; + FsUnit = fetchNuGet { baseName = "FsUnit"; version = "1.3.0.1"; @@ -87,6 +103,15 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + Suave = fetchNuGet { + baseName = "Suave"; + version = "0.29.0"; + sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln"; + outputFiles = [ "lib/net40/*" ]; + }; + + # SOURCE PACKAGES + ExtCore = buildDotnetPackage rec { baseName = "ExtCore"; version = "0.8.46"; @@ -492,4 +517,5 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { platforms = with stdenv.lib.platforms; linux; }; }; + }; in self From 5c8a993a422bd649a1493917a062ccb077ea583f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 12 Jun 2015 17:13:21 +0200 Subject: [PATCH 323/412] fetchnuget: run fixupPhase to honor propagatedBuildInputs --- pkgs/build-support/fetchnuget/default.nix | 2 +- pkgs/top-level/dotnet-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 803db27c9d5..95bb7b7cd8d 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -18,7 +18,7 @@ attrs @ buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; preInstall = '' function traverseRename () { diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3aca091f0df..e08af379da8 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -106,6 +106,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Suave = fetchNuGet { baseName = "Suave"; version = "0.29.0"; + propagatedBuildInputs = [ FsPickler ]; sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln"; outputFiles = [ "lib/net40/*" ]; }; From fd187980c71dc44a134f4ebcbb0f9f9e93c47870 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 12 Jun 2015 16:18:42 +0000 Subject: [PATCH 324/412] Put dysnomia in system environment if Disnix is enabled --- nixos/modules/services/misc/disnix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 48bb9e4293e..c439efe9f8e 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -67,7 +67,7 @@ in ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; + environment.systemPackages = [ pkgs.disnix pkgs.dysnomia ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ]; From 093b2de396c7f6a6ea1fab1dc5f3b527bf672bc9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 12 Jun 2015 16:19:26 +0000 Subject: [PATCH 325/412] dysnomia: fix compatibility with mariadb derivation --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 021225c1b4d..0507ff45dc7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql.lib + ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb; From d7f36310d03a418ea43278b76de559c6fbfa2a8c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 12 Jun 2015 00:17:53 +0200 Subject: [PATCH 326/412] Remove use of builderDefsPackage in font packages. With this change they now use `stdenv.mkDerivation` instead. Also some minor cleanups such as URL fixes, adding version numbers, adding descriptions, etc. --- pkgs/data/fonts/andagii/default.nix | 74 +++++++---------------- pkgs/data/fonts/anonymous-pro/default.nix | 70 +++++++++------------ pkgs/data/fonts/cm-unicode/default.nix | 54 +++++++---------- pkgs/data/fonts/eb-garamond/default.nix | 64 +++++++------------- pkgs/data/fonts/gentium/default.nix | 63 +++++++------------ pkgs/data/fonts/inconsolata/default.nix | 63 ++++++------------- pkgs/data/fonts/oldstandard/default.nix | 67 +++++++------------- pkgs/data/fonts/theano/default.nix | 67 +++++++------------- 8 files changed, 181 insertions(+), 341 deletions(-) diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 8143d284120..562aa8be4ef 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,59 +1,31 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - url="http://www.i18nguy.com/unicode/andagii.zip"; - name="andagii"; - version="1.0.2"; - hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "andagii-${version}"; + version = "1.0.2"; + + src = fetchzip { + url = http://www.i18nguy.com/unicode/andagii.zip; + sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k"; + stripRoot = false; curlOpts = "--user-agent 'Mozilla/5.0'"; - sha256 = sourceInfo.hash; }; - name = "${sourceInfo.name}-${sourceInfo.version}"; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doInstall"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + ''; - doUnpack = a.fullDepEntry '' - unzip "${src}" - '' ["addInputs"]; - - doInstall = a.fullDepEntry ('' - mkdir -p "$out"/share/fonts/ttf/ - cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf - '') ["defEnsureDir" "minInit"]; - - meta = { + # There are multiple claims that the font is GPL, so I include the + # package; but I cannot find the original source, so use it on your + # own risk Debian claims it is GPL - good enough for me. + meta = with stdenv.lib; { + homepage = http://www.i18nguy.com/unicode/unicode-font.HTML; description = "Unicode Plane 1 Osmanya script font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - hydraPlatforms = []; - # There are multiple claims that the font is GPL, - # so I include the package; but I cannot find the - # original source, so use it on your own risk - # Debian claims it is GPL - good enough for me. + maintainers = with maintainers; [ raskin rycee ]; + license = "unknown"; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.i18nguy.com/unicode/unicode-font.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 5b51ee36c5c..da34a2f43aa 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,50 +1,36 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, unzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version = "1.002"; - name="anonymousPro"; - url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip"; +stdenv.mkDerivation rec { + name = "anonymousPro-${version}"; + version = "1.002"; + + src = fetchurl { + url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.sha256; - }; - name = "${sourceInfo.name}-${sourceInfo.version}"; - inherit buildInputs; + nativeBuildInputs = [ unzip ]; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; + find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + ''; - doUnpack = a.fullDepEntry ('' - unzip ${src} - cd AnonymousPro*/ - '') ["addInputs"]; - - meta = { + meta = with stdenv.lib; { + homepage = http://www.marksimonson.com/fonts/view/anonymous-pro; description = "TrueType font set intended for source code"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; - license = with a.lib.licenses; ofl; - hydraPlatforms = []; - homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro"; - downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html"; - inherit (sourceInfo) version; + longDescription = '' + Anonymous Pro (2009) is a family of four fixed-width fonts + designed with coding in mind. Anonymous Pro features an + international, Unicode-based character set, with support for + most Western and Central European Latin-based languages, plus + Greek and Cyrillic. It is designed by Mark Simonson. + ''; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; -}) x - +} diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index d8f6f7f8351..ed7ce93e189 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,40 +1,28 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version = "0.7.0"; - baseName="cm-unicode"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "cm-unicode-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v *.otf $out/share/fonts/opentype/ + cp -v README FontLog.txt $out/share/doc/${name} + ''; - meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; - downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/"; - inherit version; + meta = with stdenv.lib; { + homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; + description = "Computer Modern Unicode fonts"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; -}) x - +} diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 99c9b53217e..0956250e36c 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,50 +1,28 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.016"; - name="EBGaramond"; - url="https://bitbucket.org/georgd/eb-garamond/downloads/${name}-${version}.zip"; - hash="0y630khn5zh70al3mm84fs767ac94ffyz1w70zzhrhambx07pdx0"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "eb-garamond-${version}"; + version = "0.016"; + + src = fetchzip { + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z"; }; - name = "eb-garamond-${sourceInfo.version}"; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "otf/"*.otf $out/share/fonts/opentype/ + cp -v Changes README.markdown README.xelualatex $out/share/doc/${name} + ''; - # This will clean up if/when 8263996 lands. - doUnpack = a.fullDepEntry ('' - unzip ${src} - cd ${sourceInfo.name}* - mv {ttf,otf}/* . - '') ["addInputs"]; - - meta = with a.lib; { - description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; - maintainers = with maintainers; [ relrod ]; - platforms = platforms.all; - license = licenses.ofl; + meta = with stdenv.lib; { homepage = http://www.georgduffner.at/ebgaramond/; + description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; + maintainers = with maintainers; [ relrod rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/georgd/EB-Garamond/releases"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index a4e8099db96..d0af6ce0eb0 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,46 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="1.504"; - baseName="GentiumPlus"; - name="${baseName}-${version}"; - url="http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${name}.zip&filename=${name}"; - hash="04kslaqbscpfrc6igkifcv1nkrclrm35hqpapjhw9102wpq12fpr"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - name = "${sourceInfo.name}.zip"; +stdenv.mkDerivation rec { + name = "gentium-${version}"; + version = "1.504"; + + src = fetchzip { + name = "${name}.zip"; + url = "http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-${version}.zip&filename=${name}.zip"; + sha256 = "1xdx80dfal0b8rkrp1janybx2hki7algnvkx4hyghgikpjcjkdh7"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["addInputs" "doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + ''; - meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=Gentium"; + description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_download"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 887f37c241b..caa67256a1f 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,51 +1,26 @@ -x@{builderDefsPackage - , fontforge - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - name="inconsolata"; - url="http://www.levien.com/type/myfonts/Inconsolata.sfd"; - hash="1cd29c8396adb18bfeddb1abf5bdb98b677649bb9b09f126d1335b123a4cfddb"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "inconsolata-${version}"; + version = "1.010"; + + src = fetchurl { + url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; + sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"; }; - inherit (sourceInfo) name; - inherit buildInputs; + phases = [ "installPhase" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["copySrc" "generateFontsFromSFD" "installFonts"]; - - copySrc = a.fullDepEntry ('' - cp ${src} inconsolata.sfd - '') ["minInit"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v $src $out/share/fonts/opentype/inconsolata.otf + ''; - generateFontsFromSFD = a.generateFontsFromSFD // {deps=["addInputs"];}; - - meta = { + meta = with stdenv.lib; { + homepage = http://www.levien.com/type/myfonts/inconsolata.html; description = "A monospace font for both screen and print"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.levien.com/type/myfonts/inconsolata.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index ad25ac7fd95..125a4b636a9 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,50 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="2.2"; - baseName="oldstandard"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip"; - hash="0xhbksrh9mv1cs6dl2mc8l6sypialy9wirkjr54nf7s9bcynv1h6"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "oldstandard-${version}"; + version = "2.2"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; + sha256 = "1hl78jw5szdjq9dhbcv2ln75wpp2lzcxrnfc36z35v5wk4l7jc3h"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v *.otf $out/share/fonts/opentype/ + cp -v FONTLOG.txt $out/share/doc/${name} + ''; - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - - meta = { - description = "An old-style font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = https://github.com/akryukov/oldstand; + description = "An attempt to revive a specific type of Modern style of serif typefaces"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index ca560c72a8e..c385c3d40a9 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,50 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="2.0"; - baseName="theano"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip"; - hash="1xiykqbbiawvfk33639awmgdn25b8s2k7vpwncl17bzlk887b4z6"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "theano-${version}"; + version = "2.0"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + ''; - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - - meta = { - description = "An old-style font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = https://github.com/akryukov/theano; + description = "An old-style font designed from historic samples"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; - }; -}) x - +} From 42ccd3cd983a88527cbe29630b18a665ae5d248f Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Fri, 12 Jun 2015 20:50:37 +0200 Subject: [PATCH 327/412] Bump rust package index to more recent version --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 0de95d59c8e..fe723a038e2 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-05-19"; - rev = "6280837d21e5a241d961daf968f5379e6e2e392f"; + version = "2015-06-12"; + rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91"; + sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6"; }; in From 5ee75e236c0cf758ed6b1188e10448acfcbc93b4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Jun 2015 15:56:06 -0400 Subject: [PATCH 328/412] apache-kafka: Enable overriding the kafka package --- nixos/modules/services/misc/apache-kafka.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 90555ebc468..5314a096fe0 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -116,11 +116,19 @@ in { ]; }; + package = mkOption { + description = "The kafka package to use"; + + default = pkgs.apacheKafka; + + type = types.package; + }; + }; config = mkIf cfg.enable { - environment.systemPackages = [pkgs.apacheKafka]; + environment.systemPackages = [cfg.package]; users.extraUsers = singleton { name = "apache-kafka"; @@ -136,7 +144,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.jre}/bin/java \ - -cp "${pkgs.apacheKafka}/libs/*:${configDir}" \ + -cp "${cfg.package}/libs/*:${configDir}" \ ${toString cfg.jvmOptions} \ kafka.Kafka \ ${configDir}/server.properties From bf91d04c51e92abd5204bd858053c89f421e96f4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Jun 2015 22:56:53 +0200 Subject: [PATCH 329/412] Update pharo-vm to 2015.04.30 --- pkgs/development/pharo/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b8a09492eab..8fa1bc12646 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2014.11.29-2"; + version = "2015.04.30"; name = "pharo-vm-core-i386-${version}"; system = "x86_32-linux"; src = fetchurl { url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2"; - md5 = "529cff4639cee313ddf55fd377bd6fb3"; + sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv"; }; sources10Zip = fetchurl { From 52a1ae743bdcc946cdbde147c70621fc04cec978 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Fri, 12 Jun 2015 17:58:27 -0400 Subject: [PATCH 330/412] makemkv: 1.9.2 -> 1.9.3 --- pkgs/applications/video/makemkv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 583c800a8b4..7220402f2ad 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.2"; + ver = "1.9.3"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj"; + sha256 = "1rlg7phkhzhzbb1zk8mb5qsd4zcsw20glga31npaxxy8vyfkjcxc"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6"; + sha256 = "1vn4wbxii1vn7mss2ydikhwp8hkizii7arg7a1cnpvmwp7pd952v"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; From 8f60f45eb69fa6814b5624ecc7fb5a4410c5ce6a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 12 Jun 2015 15:40:38 -0700 Subject: [PATCH 331/412] mdadm: add gcc5 compat --- pkgs/os-specific/linux/mdadm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index a7965a70b1c..042c2225ff3 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; + # Attempt removing if building with gcc5 when updating + NIX_CFLAGS_COMPILE = "-std=gnu89"; + preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; # Force mdadm to use /var/run/mdadm.map for its map file (or From 84aad77f54d673cd047d51b8cd5194507a6e4395 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 12 Jun 2015 15:40:48 -0700 Subject: [PATCH 332/412] trousers: Add gcc5 compat --- pkgs/tools/security/trousers/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 9d15b16a188..e910241113b 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-usercheck" ]; - NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; + # Attempt to remove -std=gnu89 when updating if using gcc5 + NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE"; NIX_LDFLAGS = "-lgcc_s"; # Fix broken libtool file From 7e38ad08e764c6f0c10e1d676af046d876d47adb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jun 2015 12:38:35 +0200 Subject: [PATCH 333/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/008236bc31f0113ee2a50ee1149843a6c7a75395 with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e --- .../haskell-modules/hackage-packages.nix | 430 ++++++++++++------ 1 file changed, 286 insertions(+), 144 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4794ec73879..e5cdabbed67 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19370,8 +19370,8 @@ self: { }: mkDerivation { pname = "angel"; - version = "0.5.2"; - sha256 = "0h2nyxv56cshkxlbq5j54220w7x2y0m1aaqzqz6dhipff29pmr39"; + version = "0.6.0"; + sha256 = "0625r8jy9v6x5v5y5vrz2z7bqag9hwjnxr7ir35bq18xd5fpr9kf"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -28020,8 +28020,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9.3"; - sha256 = "0r8ayxsfx7z4hivknshj2sybssn3hjwprxpyqw4yv3w26gv7d82j"; + version = "0.9.4"; + sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -35752,21 +35752,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs_1_18_9" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.18.9"; - sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base directory old-locale old-time polyparse ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - "cpphs" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: @@ -36413,17 +36398,19 @@ self: { "cron" = callPackage ({ mkDerivation, attoparsec, base, derive, hspec - , hspec-expectations, mtl, old-locale, QuickCheck, text, time - , transformers + , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text + , time, transformers-compat }: mkDerivation { pname = "cron"; - version = "0.2.6"; - sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg"; - buildDepends = [ attoparsec base mtl old-locale text time ]; + version = "0.3.0"; + sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k"; + buildDepends = [ + attoparsec base mtl mtl-compat old-locale text time + ]; testDepends = [ attoparsec base derive hspec hspec-expectations QuickCheck text - time transformers + time transformers-compat ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; @@ -43249,6 +43236,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "dozens" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default-class + , http-client, http-types, reflection, scientific, text + , transformers + }: + mkDerivation { + pname = "dozens"; + version = "0.1.1"; + sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky"; + buildDepends = [ + aeson base bytestring data-default-class http-client http-types + reflection scientific text transformers + ]; + homepage = "https://github.com/philopon/apiary"; + description = "dozens api library"; + license = stdenv.lib.licenses.mit; + }) {}; + "dph-base" = callPackage ({ mkDerivation, array, base, ghc-prim, pretty, random, vector }: mkDerivation { @@ -46041,24 +46046,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "equivalence_0_2_5" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "equivalence"; - version = "0.2.5"; - sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3"; - buildDepends = [ base containers mtl STMonadTrans ]; - testDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell - test-framework test-framework-quickcheck2 - ]; - homepage = "https://bitbucket.org/paba/equivalence/"; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "equivalence" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, test-framework, test-framework-quickcheck2 @@ -48255,17 +48242,25 @@ self: { }) {}; "feldspar-signal" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, base-compat, feldspar-compiler + , feldspar-compiler-shim, feldspar-language, imperative-edsl + , mainland-pretty, monadic-edsl-priv + }: mkDerivation { pname = "feldspar-signal"; - version = "0.0.0.1"; - sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; - buildDepends = [ base ]; + version = "0.0.1.0"; + sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd"; + buildDepends = [ + base base-compat feldspar-compiler feldspar-compiler-shim + feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv + ]; jailbreak = true; homepage = "https://github.com/markus-git/feldspar-signal"; description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; - }) {}; + broken = true; + }) { feldspar-compiler-shim = null; imperative-edsl = null; + monadic-edsl-priv = null;}; "fen2s" = callPackage ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode @@ -48341,19 +48336,19 @@ self: { }) {}; "fficxx" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , either, errors, filepath, hashable, HStringTemplate, lens, mtl - , process, pureMD5, split, template-haskell, transformers - , unordered-containers + ({ mkDerivation, base, bytestring, Cabal, containers, data-default + , directory, either, errors, filepath, hashable, HStringTemplate + , lens, mtl, process, pureMD5, split, template-haskell + , transformers, unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.2"; - sha256 = "0512v9xhli6qdz46gvn8lj15rp30919pf982fjcgklw22qmci69q"; + version = "0.2.1"; + sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d"; buildDepends = [ - base bytestring Cabal containers directory either errors filepath - hashable HStringTemplate lens mtl process pureMD5 split - template-haskell transformers unordered-containers + base bytestring Cabal containers data-default directory either + errors filepath hashable HStringTemplate lens mtl process pureMD5 + split template-haskell transformers unordered-containers ]; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; @@ -48364,8 +48359,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fficxx-runtime"; - version = "0.2"; - sha256 = "0czh7in30369c8c4ls3m3r61w6zb1p0p0jy2yi5j9521f61q588a"; + version = "0.2.1"; + sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk"; buildDepends = [ base ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; @@ -52312,11 +52307,10 @@ self: { ({ mkDerivation, base, ieee754, QuickCheck }: mkDerivation { pname = "geom2d"; - version = "0.1.2.1"; - sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj"; + version = "0.1.3.1"; + sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5"; buildDepends = [ base ieee754 QuickCheck ]; testDepends = [ base ieee754 QuickCheck ]; - jailbreak = true; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -53294,7 +53288,7 @@ self: { , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client + , git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client , http-conduit, http-types, IfElse, json, lsof, MissingH , monad-control, monad-logger, mtl, network, network-info , network-multicast, network-protocol-xmpp, network-uri, openssh @@ -53330,7 +53324,7 @@ self: { yesod-static ]; buildTools = [ - bup curl git gnupg1 lsof openssh perl rsync wget which + bup curl git gnupg lsof openssh perl rsync wget which ]; configureFlags = [ "-fassistant" "-fproduction" ]; preConfigure = "export HOME=$TEMPDIR"; @@ -53342,7 +53336,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; }) { inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg1; inherit (pkgs) lsof; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; @@ -67451,8 +67445,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.3.0"; - sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25"; + version = "0.3.1"; + sha256 = "178pdk9rhqiyzjpdvkfvjs4gfc27k1limi7qpnpqyxzlcrcsplvb"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -71698,9 +71692,9 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; - revision = "1"; + revision = "2"; sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; - editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7"; + editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76"; buildDepends = [ base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; @@ -71916,8 +71910,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.3.2"; - sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk"; + version = "0.8.3.3"; + sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -76998,19 +76992,19 @@ self: { ({ mkDerivation, arrows, base, bytestring, cmdargs , data-default-class, data-default-instances-base, Diff, directory , filepath, HTTP, http-encodings, hxt, hxt-tagsoup - , language-ecmascript, network, random, tasty, tasty-golden - , transformers + , language-ecmascript, network, network-uri, random, tasty + , tasty-golden, transformers }: mkDerivation { pname = "jespresso"; - version = "1.0.1"; - sha256 = "0rl4k1vn5q23rjylpyya6dmp6pwdbdvrlxgkczxwy84j9xm665zg"; + version = "1.0.1.1"; + sha256 = "0lxkn0zd4y7b36y42hxpfan5jcy910ksl044yvmrk634p7s3996h"; isLibrary = true; isExecutable = true; buildDepends = [ arrows base bytestring cmdargs data-default-class data-default-instances-base HTTP http-encodings hxt hxt-tagsoup - language-ecmascript network random + language-ecmascript network network-uri random ]; testDepends = [ arrows base Diff directory filepath hxt tasty tasty-golden @@ -80459,8 +80453,8 @@ self: { ({ mkDerivation, base, mtl, parsers, text, trifecta }: mkDerivation { pname = "language-thrift"; - version = "0.1.0.1"; - sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk"; + version = "0.2.0.0"; + sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw"; buildDepends = [ base mtl parsers text trifecta ]; homepage = "https://github.com/abhinav/language-thrift"; description = "Parser for the Thrift IDL format"; @@ -81198,14 +81192,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-regex" = callPackage + ({ mkDerivation, array, base, directory, doctest, filepath, lens + , regex-base, regex-posix, template-haskell + }: + mkDerivation { + pname = "lens-regex"; + version = "0.1.0"; + sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; + isLibrary = true; + isExecutable = true; + buildDepends = [ array base lens regex-base template-haskell ]; + testDepends = [ base directory doctest filepath regex-posix ]; + homepage = "https://github.com/himura/lens-regex"; + description = "Lens powered regular expression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, transformers }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.4"; - sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3"; + version = "0.1.0.5"; + sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839"; buildDepends = [ base lens-family lens-family-core lens-family-th transformers ]; @@ -81283,10 +81294,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.0.2"; - revision = "2"; - sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v"; - editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c"; + version = "0.1.1.2"; + sha256 = "06k0vvxp8vd43bbslm78lmmmc89q3b9ghwfj0chvaw32m0hd8l0z"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -82405,7 +82414,9 @@ self: { mkDerivation { pname = "linear"; version = "1.18.1.1"; + revision = "2"; sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p"; + editedCabalFile = "8c57bd840e0c9ab84b032d65a2a48ed6d20da4fb780f0d89d8c53adccc632ba4"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -82455,13 +82466,13 @@ self: { }) {}; "linear-grammar" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "linear-grammar"; - version = "0.0.0.5"; - sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry"; - buildDepends = [ base ]; - testDepends = [ base hspec QuickCheck quickcheck-instances ]; + version = "0.0.1.6"; + sha256 = "05mzxv1ixdxirmm31jqwd8w749dpy113pyw1mfr6ck3ksva5g1ap"; + buildDepends = [ base QuickCheck ]; + testDepends = [ base hspec QuickCheck ]; description = "A simple grammar for building linear equations and inclusive inequalities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -87952,14 +87963,19 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, directory, hspec, logging-facade, temporary + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , logging-facade, temporary }: mkDerivation { pname = "mockery"; - version = "0.2.0"; - sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj"; - buildDepends = [ base directory logging-facade temporary ]; - testDepends = [ base directory hspec logging-facade temporary ]; + version = "0.3.0"; + sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x"; + buildDepends = [ + base bytestring directory filepath logging-facade temporary + ]; + testDepends = [ + base bytestring directory filepath hspec logging-facade temporary + ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; }) {}; @@ -90102,13 +90118,16 @@ self: { mkDerivation { pname = "mueval"; version = "0.9.1.1"; + revision = "2"; sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz"; + editedCabalFile = "26147e2bbac6b9afea949ab81c6072fc89bbff6b7e6678f3ce57c77d26264832"; isLibrary = true; isExecutable = true; buildDepends = [ base Cabal containers directory extensible-exceptions filepath hint mtl process show simple-reflect unix utf8-string ]; + jailbreak = true; homepage = "https://github.com/gwern/mueval"; description = "Safely evaluate pure Haskell expressions"; license = stdenv.lib.licenses.bsd3; @@ -90341,12 +90360,12 @@ self: { }) {}; "multiset-comb" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "multiset-comb"; - version = "0.2.3"; - sha256 = "0qkl6csnl1g6wbsyxirdq8hdbbbkp3dfsjix76yx242wdyh1j6pq"; - buildDepends = [ base ]; + version = "0.2.4"; + sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99"; + buildDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91174,6 +91193,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "namelist" = callPackage + ({ mkDerivation, base, case-insensitive, data-default-class, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "namelist"; + version = "0.1.0"; + sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s"; + buildDepends = [ base case-insensitive data-default-class parsec ]; + testDepends = [ + base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/philopon/namelist-hs"; + description = "fortran90 namelist parser/pretty printer"; + license = stdenv.lib.licenses.mit; + }) {}; + "names" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -94305,8 +94341,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "old-version"; - version = "1.0.1"; - sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv"; + version = "1.1.0"; + sha256 = "1vlh6wz9khcamlb5pv5gy5bss7bws7b92j8kkyqf6cp22x4dxdlc"; buildDepends = [ base ]; jailbreak = true; description = "Basic versioning library"; @@ -95846,6 +95882,22 @@ self: { license = "unknown"; }) {}; + "pagure-hook-receiver" = callPackage + ({ mkDerivation, base, containers, scotty, shelly, text + , transformers, unix + }: + mkDerivation { + pname = "pagure-hook-receiver"; + version = "0.1.0.0"; + sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl"; + buildDepends = [ + base containers scotty shelly text transformers unix + ]; + homepage = "https://pagure.io/pagure-hook-receiver"; + description = "Receive hooks from pagure and do things with them"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -103299,8 +103351,8 @@ self: { }: mkDerivation { pname = "quantfin"; - version = "0.1.0.2"; - sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany"; + version = "0.2.0.0"; + sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103613,6 +103665,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.0.1.0"; + sha256 = "04r5nqm7g5wp13k6d109yykky9i121f65bxlv5ji5sk35yp650c4"; + buildDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -104225,14 +104288,14 @@ self: { }: mkDerivation { pname = "range"; - version = "0.1.0.1"; - sha256 = "04nzxjgjnql6bq30pkkmlxcj0cxmw3hlzb6y1fhb052rxmpaq8mk"; + version = "0.1.1.0"; + sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2"; buildDepends = [ base parsec ]; testDepends = [ base Cabal QuickCheck random test-framework test-framework-quickcheck2 ]; - jailbreak = true; + homepage = "https://bitbucket.org/robertmassaioli/range"; description = "This has a bunch of code for specifying and managing ranges in your code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -104942,20 +105005,15 @@ self: { }) {}; "record" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, template-haskell, text, transformers + ({ mkDerivation, base, base-prelude, basic-lens, template-haskell }: mkDerivation { pname = "record"; - version = "0.3.1.2"; - sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp"; - buildDepends = [ - attoparsec base base-prelude template-haskell text transformers - ]; - testDepends = [ base base-prelude directory doctest filepath ]; - jailbreak = true; + version = "0.4.0.0"; + sha256 = "0ml0rmqscdkp4zp430q206lrnah3j5d4bbra7ka526gagmrvpnmb"; + buildDepends = [ base base-prelude basic-lens template-haskell ]; homepage = "https://github.com/nikita-volkov/record"; - description = "First class records implemented with quasi-quotation"; + description = "Anonymous records"; license = stdenv.lib.licenses.mit; }) {}; @@ -104998,6 +105056,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-preprocessor" = callPackage + ({ mkDerivation, base, base-prelude, conversion, conversion-text + , record-syntax, text + }: + mkDerivation { + pname = "record-preprocessor"; + version = "0.1.0.0"; + sha256 = "0ign3zvpnz4zrzfqglf34xbcrb21dq8hyzwkzlq9y26r9g3nmbd5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base base-prelude conversion conversion-text record-syntax text + ]; + homepage = "https://github.com/nikita-volkov/record-preprocessor"; + description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; + license = stdenv.lib.licenses.mit; + }) {}; + + "record-syntax" = callPackage + ({ mkDerivation, base, base-prelude, conversion, conversion-text + , directory, doctest, filepath, haskell-src-exts, hspec, parsec + , record, template-haskell, text, transformers + }: + mkDerivation { + pname = "record-syntax"; + version = "0.1.0.0"; + sha256 = "115z96ific9n3612yzkfmj7hxnbjc8xjz5nmfiddklx9zjih7h40"; + buildDepends = [ + base base-prelude conversion conversion-text haskell-src-exts + parsec record template-haskell text transformers + ]; + testDepends = [ + base base-prelude directory doctest filepath hspec record + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/record-syntax"; + description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; + license = stdenv.lib.licenses.mit; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -107630,6 +107728,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "riemann" = callPackage + ({ mkDerivation, base, cereal, containers, data-default, either + , errors, HUnit, lens, network, protobuf, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers + }: + mkDerivation { + pname = "riemann"; + version = "0.1.0.1"; + sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa"; + buildDepends = [ + base cereal containers data-default either errors lens network + protobuf text time transformers + ]; + testDepends = [ + base either errors HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/telser/riemann-hs"; + description = "A Riemann client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "riff" = callPackage ({ mkDerivation, base, binary, bytestring, either, filepath , transformers @@ -110562,8 +110684,8 @@ self: { }: mkDerivation { pname = "second-transfer"; - version = "0.5.3.1"; - sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv"; + version = "0.5.3.2"; + sha256 = "0qc6xm7c37n2r9xnqc6njkm2d8lkwmripcr3q1q4m7q97qsvjbdl"; buildDepends = [ attoparsec base base16-bytestring binary bytestring conduit containers exceptions hashable hashtables hslogger http2 lens @@ -112310,8 +112432,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.3"; - sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; + version = "0.6.4"; + sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -113124,8 +113246,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.20"; - sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3"; + version = "0.2.21"; + sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1"; buildDepends = [ base bytestring network unix ]; testDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -115141,8 +115263,8 @@ self: { }: mkDerivation { pname = "snaplet-sass"; - version = "0.1.0.0"; - sha256 = "0wv9a7pa6r7nzgppbywasqy38zk79ann2ivwyyh2b9dny95mx5yd"; + version = "0.1.1.0"; + sha256 = "05vif2rz0dj2b3vm0yh0bwj234xjnjpiaf2fk8vlv00jirgrdr40"; buildDepends = [ base bytestring configurator directory filepath mtl process snap snap-core transformers @@ -116234,8 +116356,8 @@ self: { }: mkDerivation { pname = "species"; - version = "0.3.2.4"; - sha256 = "1ka5pd876iddaah9ay2ihcifhfh0f5rd19bn6yh42wlx6mdarfbq"; + version = "0.3.3"; + sha256 = "0cy6l4gvzydl9k2ijxkxhr6jqjbf85z71v6zrvbdajc3xip99w6i"; buildDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -124752,8 +124874,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "tip-lib"; - version = "0.1.1"; - sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi"; + version = "0.1.2"; + sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125898,22 +126020,21 @@ test/package-dump/ghc-7.10.txt"; }) {}; "trurl" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hastache - , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, directory, filemanip + , hastache, http-conduit, MissingH, scientific, tar, tasty + , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "trurl"; - version = "0.1.0.0"; - sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5"; + version = "0.2.0.0"; + sha256 = "167f7wrvrva7764z35l48rxbcnnajm343gqw2b67jh14d5kj6fz9"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring directory hastache http-conduit MissingH - scientific tar text unordered-containers + aeson base bytestring directory filemanip hastache http-conduit + MissingH scientific tar text unordered-containers ]; testDepends = [ base hastache tasty tasty-hunit ]; - jailbreak = true; homepage = "http://github.com/dbushenko/trurl"; description = "Haskell template code generator"; license = stdenv.lib.licenses.bsd3; @@ -126062,12 +126183,12 @@ test/package-dump/ghc-7.10.txt"; }) {}; "tubes" = callPackage - ({ mkDerivation, base, free, mtl, transformers }: + ({ mkDerivation, base, comonad, free, mtl, transformers }: mkDerivation { pname = "tubes"; - version = "0.1.0.0"; - sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k"; - buildDepends = [ base free mtl transformers ]; + version = "0.2.1.0"; + sha256 = "1j1pzsmr4djjvhmix6ffsapm30lv4iim1jvcq454r1kxi0yid76z"; + buildDepends = [ base comonad free mtl transformers ]; homepage = "https://github.com/gatlin/tubes"; description = "Effectful, iteratee-inspired stream processing based on a free monad"; license = stdenv.lib.licenses.gpl3; @@ -127573,7 +127694,9 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "uhc-light"; version = "1.1.9.0"; + revision = "1"; sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj"; + editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -127581,7 +127704,6 @@ test/package-dump/ghc-7.10.txt"; hashable mtl network old-locale primitive process syb transformers uhc-util uulib vector ]; - jailbreak = true; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; @@ -128827,8 +128949,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.4"; - sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv"; + version = "0.1.5"; + sha256 = "0pl00n40b1nc3rnvayk8jz9lgv0s1lp33czyg962jdbffwhqgszj"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base blaze-builder bytestring derive HUnit lens @@ -131599,8 +131721,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "wai-middleware-crowd"; - version = "0.1.1.1"; - sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj"; + version = "0.1.1.2"; + sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -131708,6 +131830,26 @@ test/package-dump/ghc-7.10.txt"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-metrics" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck + , scotty, tasty, tasty-hunit, tasty-quickcheck, time, transformers + , wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-metrics"; + version = "0.2.0"; + sha256 = "0vqpp7fqjmhknvmizvbzzay3ixk0a5jqq9y80al62hc2yb75pz0w"; + buildDepends = [ base ekg-core http-types time wai ]; + testDepends = [ + base bytestring ekg-core http-types QuickCheck scotty tasty + tasty-hunit tasty-quickcheck time transformers wai wai-extra + ]; + jailbreak = true; + homepage = "https://github.com/Helkafen/wai-middleware-metrics"; + description = "A WAI middleware to collect EKG request metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-preprocessor" = callPackage ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai , wai-middleware-static, warp From cd7b1ca0002b393a7fe00b36506a402fbc9432ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2015 15:02:39 +0200 Subject: [PATCH 334/412] haskell-configuration-ghc-7.8.x: drop obsolete override for 'equivalence' --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 28c74f61925..f2e0fb056e7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -225,7 +225,6 @@ self: super: { cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; containers_0_4_2_1 = markBroken super.containers_0_4_2_1; control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3; - equivalence_0_2_5 = markBroken super.equivalence_0_2_5; haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2; optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0; QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 4fbb5056837..9696ccddcc5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -59,7 +59,6 @@ self: super: { # Newer versions require mtl 2.2.x. mtl-prelude = self.mtl-prelude_1_0_3; - equivalence = super.equivalence_0_2_5; # required by Agda # purescript requires mtl 2.2.x. purescript = overrideCabal (super.purescript.overrideScope (self: super: { From 5fae046771a5166430669816a88f7c27dfbecf88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Jun 2015 00:30:46 +0200 Subject: [PATCH 335/412] darcs: remove all run-time dependencies on GHC and other Haskell libraries --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1bec97f066..8fedb29ee59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10721,7 +10721,10 @@ let darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; enableSharedExecutables = false; + enableSharedLibraries = false; isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share"; }); darktable = callPackage ../applications/graphics/darktable { From ea3382bb69e542b7af7cdc1407abd9e0dc757c68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Jun 2015 11:09:38 +0200 Subject: [PATCH 336/412] haskell-record doesn't pass the Haddock phase. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 52a0e29c7d4..d42c05fad28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -166,6 +166,7 @@ self: super: { types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; + record = dontHaddock super.record; # https://github.com/nikita-volkov/record/issues/22 # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = (overrideCabal super.darcs (drv: { From 3754de550f8cb0d1b8f79b40d2865db07c8cdf53 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 13 Jun 2015 15:00:43 +0200 Subject: [PATCH 337/412] nixos/grub: allow customization of the nix store path --- nixos/modules/system/boot/loader/grub/grub.nix | 10 ++++++++++ nixos/modules/system/boot/loader/grub/install-grub.pl | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0b6333ab573..e7494161cb3 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -36,6 +36,7 @@ let grubEfi = f grubEfi; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; bootPath = args.path; + storePath = config.boot.loader.grub.storePath; efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; @@ -163,6 +164,15 @@ in ''; }; + storePath = mkOption { + default = "/nix/store"; + type = types.str; + description = '' + Path to the Nix store when looking for kernels at boot. + Only makes sense when copyKernels is false. + ''; + }; + extraPrepareConfig = mkOption { default = ""; type = types.lines; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index fcf5871203d..9db6249c450 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -55,6 +55,7 @@ my $fsIdentifier = get("fsIdentifier"); my $grubEfi = get("grubEfi"); my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); +my $storePath = get("storePath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); $ENV{'PATH'} = get("path"); @@ -210,7 +211,7 @@ sub GrubFs { my $grubBoot = GrubFs($bootPath); my $grubStore; if ($copyKernels == 0) { - $grubStore = GrubFs("/nix/store"); + $grubStore = GrubFs($storePath); } # Generate the header. From c3e832b323deced79b49ecf42a06714e2aa661e9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 13 Jun 2015 15:02:41 +0200 Subject: [PATCH 338/412] stage-1: mkdir -p /mnt-root, it may be created earlier by some hooks --- nixos/modules/system/boot/stage-1-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 5af644279e5..e8d276920a8 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -317,7 +317,7 @@ mountFS() { # Try to find and mount the root device. -mkdir /mnt-root +mkdir -p $targetRoot exec 3< @fsInfo@ From 481a764f8f860dde4d664ec9d83724fd4a9631e6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 13 Jun 2015 15:22:47 +0200 Subject: [PATCH 339/412] dconf-editor: fix icons on non-nixos --- pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix index 06c01d305f8..e69bcd39032 100644 --- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88"; }; - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; preFixup = '' wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From ccb32c96c4f00f5296e697e7c316f8a72e216355 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 13 Jun 2015 15:27:42 +0200 Subject: [PATCH 340/412] gnome-bluetooth: fix icons on non-nixos --- .../gnome-3/3.16/core/gnome-bluetooth/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix index ab8f380f672..5b7d7c19d29 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2 }: +, udev, itstool, libxml2, makeWrapper }: stdenv.mkDerivation rec { name = "gnome-bluetooth-${gnome3.version}.1"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz"; }; - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 - gsettings_desktop_schemas itstool ]; + buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + makeWrapper gsettings_desktop_schemas itstool ]; + + preFixup = '' + wrapProgram "$out/bin/bluetooth-sendto" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; From 5ee56b642401349960d2691cfa838e69e6324733 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 13 Jun 2015 08:33:51 -0500 Subject: [PATCH 341/412] julia03: fix evaluation on x86_64-darwin --- pkgs/development/compilers/julia/0.3.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 42b296c7b85..4566752340f 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -127,10 +127,6 @@ stdenv.mkDerivation rec { "-lz" ]; - preConfigure = '' - export PATH="$PATH:${stdenv.cc.libc}/sbin" - ''; - dontStrip = true; dontPatchELF = true; From 9f5b9de5595534d52d278de9d3d2781c63ea0a31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2015 16:13:52 +0200 Subject: [PATCH 342/412] hplip 3.15.4 -> 3.15.6 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 8558d1f7dee..09fa67d7dcd 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.15.4"; + name = "hplip-3.15.6"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; + sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h"; }; hplip_state = @@ -31,7 +31,7 @@ let plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; + sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx"; }; in From c8c15ba95d2250a4047428fa1235cb3b2660fe1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2015 16:34:01 +0200 Subject: [PATCH 343/412] stress-ng -> 0.04.06 - stess-sysfs: Do not read sysfs files when running as root --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 2a0b2816ba7..af09b7af030 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.05"; in +let version = "0.04.06"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg"; + sha256 = "1iwl16gzxl1gq7gkn6pwhk6ss641n11wgf37yd47jcdr5pac6z9s"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 64a507bd9b5d29cb72ddc37c4e366c2708dcbba6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 Jun 2015 19:32:11 -0500 Subject: [PATCH 344/412] plasma53.plasma-workspace: fix missing paths --- pkgs/desktops/plasma-5.3/default.nix | 22 ++++++++-------- .../0001-startkde-NixOS-patches.patch | 26 +++++++++++++------ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index c4fb624a377..39ccb4e3c30 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -12,7 +12,7 @@ # make a copy of this directory first. After copying, be sure to delete ./tmp # if it exists. Then follow the minor update instructions. -{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }: +{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }: with stdenv.lib; with autonix; @@ -143,19 +143,19 @@ let }; plasma-workspace = with pkgs; super.plasma-workspace // { - patches = [ - (substituteAll { - src = ./plasma-workspace/0001-startkde-NixOS-patches.patch; - inherit (pkgs) bash gnused gnugrep socat; - inherit (kf5) kconfig kinit kservice; - inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; - qt5tools = qt5.tools; - dbus_tools = pkgs.dbus.tools; - }) - ]; + patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; buildInputs = with xlibs; super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + + inherit (pkgs) bash gnused gnugrep socat; + inherit (kf5) kconfig kinit kservice; + inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; + kde_workspace = kdeApps.kde-workspace; + qt5tools = qt5.tools; + dbus_tools = pkgs.dbus.tools; + postPatch = '' + substituteAllInPlace startkde/startkde.cmake substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch index a542fb7b87d..86c6dd857be 100644 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001 +From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jun 2015 11:21:43 -0500 Subject: [PATCH] startkde: NixOS patches --- - startkde/startkde.cmake | 214 ++++++++++++++++++++---------------------------- - 1 file changed, 87 insertions(+), 127 deletions(-) + startkde/startkde.cmake | 218 ++++++++++++++++++++---------------------------- + 1 file changed, 89 insertions(+), 129 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 24e5c1b..787d719 100644 +index 24e5c1b..e7bdd32 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -93,7 +93,7 @@ index 24e5c1b..787d719 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys </dev/null 2>/dev/null; then + : # ok @@ -189,6 +192,13 @@ index 24e5c1b..787d719 100644 ksplash_pid= if test -z "$dl"; then # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) +- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` ++ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` + ;; + None) + ;; @@ -205,8 +194,7 @@ fi # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fedb29ee59..000027a9125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13846,6 +13846,7 @@ let plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { kf5 = kf510; + kdeApps = kdeApps_15_04; }); plasma5_latest = plasma53; plasma5_stable = plasma53; From af6c270b6df187ca123d54cf28955341854fedd3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 8 Jun 2015 09:25:58 -0500 Subject: [PATCH 345/412] pinentry: find moc when qt4 enabled --- pkgs/tools/security/pinentry/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f5345..b4ff0b77f38 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; + # configure cannot find moc on its own + preConfigure = stdenv.lib.optionalString (qt4 != null) '' + export QTDIR="${qt4}" + export MOC="${qt4}/bin/moc" + ''; + configureFlags = [ (mkWith (libcap != null) "libcap") (mkWith (hasX) "x") @@ -36,8 +42,9 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; longDescription = '' - Pinentry provides a console and a GTK+ GUI that allows users to - enter a passphrase when `gpg' or `gpg2' is run and needs it. + Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } From 95b02f6459c9812a8d68a24ae92171667158ab14 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 13 Jun 2015 10:11:01 -0500 Subject: [PATCH 346/412] kf510.kinit: fix library path --- .../libraries/kde-frameworks-5.10/default.nix | 2 +- ...libpath.patch => 0001-kinit-libpath.patch} | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.10/kinit/{kinit-libpath.patch => 0001-kinit-libpath.patch} (72%) diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index 4423f9c157d..f4c98c7da33 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -178,7 +178,7 @@ let + " -I${ilmbase}/include/OpenEXR"; }; - kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; + kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; }; kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch similarity index 72% rename from pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch index a6ccb2085d3..9c76079a382 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch @@ -1,8 +1,17 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 3c3c913..f510620 100644 +index 9e775b6..0ac5646 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp -@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args, +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!libpath.isEmpty()) { if (!l.load()) { if (libpath_relative) { @@ -15,10 +24,10 @@ index 3c3c913..f510620 100644 - libpath = install_lib_dir + libpath; - l.setFileName(libpath); + // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/plugins, so the kdeinit5 -+ // shared libraries should be in /lib/plugins/../ ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ + const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../"); ++ const QString up = QString::fromLocal8Bit("/../../"); + const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); + Q_FOREACH (const QString &path, paths) { + l.setFileName(path + up + libpath); @@ -28,3 +37,6 @@ index 3c3c913..f510620 100644 } } if (!l.isLoaded()) { +-- +2.4.2 + From 2434ee4aab06d2c6a5835bbc5a0e49cc78949429 Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Sat, 13 Jun 2015 15:14:47 +0000 Subject: [PATCH 347/412] Allow setting mediatomb interface --- nixos/modules/services/misc/mediatomb.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 3f70bceb23b..40ec2831ff0 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -230,6 +230,13 @@ in { ''; }; + interface = mkOption { + default = ""; + description = '' + A specific interface to bind to. + ''; + }; + uuid = mkOption { default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687"; description = '' @@ -256,7 +263,7 @@ in { after = [ "local-fs.target" "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.mediatomb ]; - serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}"; + serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}"; serviceConfig.User = "${cfg.user}"; }; From fc964a15cbac5d8a3aeda806bf09cbbeab2862f3 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Sat, 13 Jun 2015 23:19:04 +0200 Subject: [PATCH 348/412] mpg123: 1.19.0 -> 1.22.2 --- pkgs/applications/audio/mpg123/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 3edb7ae6793..eb1f8f4faa8 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: -stdenv.mkDerivation { - name = "mpg123-1.19.0"; +stdenv.mkDerivation rec { + name = "mpg123-1.22.2"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.19.0.tar.bz2; - sha256 = "06xhd68mj9yp0r6l771aq0d7xgnl402a3wm2mvhxmd3w3ph29446"; + url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; + sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; @@ -16,8 +16,9 @@ stdenv.mkDerivation { }; meta = { - description = "Command-line MP3 player"; - homepage = http://mpg123.sourceforge.net/; - license = "LGPL"; + description = "Fast console MPEG Audio Player and decoder library"; + homepage = http://mpg123.org; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; }; } From 8811724ec9915d1d708d5e4671392623ff25b22f Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Sat, 13 Jun 2015 23:24:19 +0200 Subject: [PATCH 349/412] The user specified in the conf should run MPD --- nixos/modules/services/audio/mpd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 06ba4b9b5ac..5515f827b29 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -118,7 +118,7 @@ in { preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; serviceConfig = { - User = "mpd"; + User = "${cfg.user}"; PermissionsStartOnly = true; }; }; From 6fa931421ed02ce6ee5dd13e2f7eccd795216c27 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 12 Jun 2015 16:31:15 +0100 Subject: [PATCH 350/412] add package for django-pipeline --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 703560b7758..f80df2edfcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4815,6 +4815,26 @@ let }; + django_pipeline = buildPythonPackage rec { + name = "django-pipeline-${version}"; + version = "1.5.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz"; + md5 = "dff8a4abb2895ee5df335c3fb2775a02"; + sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; + }; + + propagatedBuildInputs = with self; [ django futures ]; + + meta = with stdenv.lib; { + description = "Pipeline is an asset packaging library for Django."; + homepage = https://github.com/cyberdelia/django-pipeline; + license = stdenv.lib.licenses.mit; + }; + }; + + djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; From ebde5fd9d48e79b4ee9fabf51440f09d27f3fc5f Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 13 Jun 2015 21:26:50 -0400 Subject: [PATCH 351/412] Use the right nix when doing things in our amazoninit --- nixos/modules/virtualisation/amazon-init.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index c5dfb3643e1..6058a7019e8 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -8,7 +8,7 @@ let echo "attempting to fetch configuration from user-data..." - export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH + export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData="$(mktemp)" From 10e75453b2cc1406d9d53aab46c88025505dd169 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 13 Jun 2015 21:55:29 -0400 Subject: [PATCH 352/412] Factor the NixOS channel building code out into its own file, so I can use it elsewhere --- nixos/lib/make-channel.nix | 31 +++++++++++++++++++++++++++++++ nixos/release.nix | 32 +------------------------------- 2 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 nixos/lib/make-channel.nix diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix new file mode 100644 index 00000000000..7764527ffa7 --- /dev/null +++ b/nixos/lib/make-channel.nix @@ -0,0 +1,31 @@ +{ pkgs, nixpkgs, version, versionSuffix }: + +pkgs.releaseTools.makeSourceTarball { + name = "nixos-channel"; + + src = nixpkgs; + + officialRelease = false; # FIXME: fix this in makeSourceTarball + inherit version versionSuffix; + + buildInputs = [ pkgs.nixUnstable ]; + + expr = builtins.readFile ./channel-expr.nix; + + distPhase = '' + rm -rf .git + echo -n $VERSION_SUFFIX > .version-suffix + echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision + releaseName=nixos-$VERSION$VERSION_SUFFIX + mkdir -p $out/tarballs + mkdir ../$releaseName + cp -prd . ../$releaseName/nixpkgs + chmod -R u+w ../$releaseName + ln -s nixpkgs/nixos ../$releaseName/nixos + echo "$expr" > ../$releaseName/default.nix + NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null + cd .. + chmod -R u+w $releaseName + tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName + ''; +} diff --git a/nixos/release.nix b/nixos/release.nix index 6afcdbff3e1..a8b6d275f1d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -93,37 +93,7 @@ let in rec { - channel = - pkgs.releaseTools.makeSourceTarball { - name = "nixos-channel"; - - src = nixpkgs; - - officialRelease = false; # FIXME: fix this in makeSourceTarball - inherit version versionSuffix; - - buildInputs = [ pkgs.nixUnstable ]; - - expr = builtins.readFile lib/channel-expr.nix; - - distPhase = '' - rm -rf .git - echo -n $VERSION_SUFFIX > .version-suffix - echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision - releaseName=nixos-$VERSION$VERSION_SUFFIX - mkdir -p $out/tarballs - mkdir ../$releaseName - cp -prd . ../$releaseName/nixpkgs - chmod -R u+w ../$releaseName - ln -s nixpkgs/nixos ../$releaseName/nixos - echo "$expr" > ../$releaseName/default.nix - NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null - cd .. - chmod -R u+w $releaseName - tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName - ''; # */ - }; - + channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux; From 2fe7bf8d55d05023e67c94a84950fbc4181fbdbb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:21:27 +0300 Subject: [PATCH 353/412] Update CL-Launch --- pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 755e8001e88..40c4085adab 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1.3.1"; + version="4.1.3.3"; name="${baseName}-${version}"; - hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz"; - sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; + hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz"; + sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; }; buildInputs = [ ]; From b32174dcc6671779f4f0d4ff6057795f3ec01e2a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:21:36 +0300 Subject: [PATCH 354/412] Update SlimerJS --- pkgs/development/tools/slimerjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 7c6cf82d741..a35816e2511 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.5"; + version="0.9.6"; name="${baseName}-${version}"; - hash="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s"; - url="http://download.slimerjs.org/releases/0.9.5/slimerjs-0.9.5.zip"; - sha256="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s"; + hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; + url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; + sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; }; buildInputs = [ unzip zip From 59cbed7a02b99580afe09a0d2f1afc709f54b0a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:21:44 +0300 Subject: [PATCH 355/412] Update eudev --- pkgs/os-specific/linux/eudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index e2bcf9837e7..de8ad00acc8 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.0"; + version = "3.1.1"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl"; + sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k"; }; buildInputs = [ glib pkgconfig gperf utillinux From dc84b5118eb7f542715a81f98b392d16bde98a36 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:21:55 +0300 Subject: [PATCH 356/412] Update qpdfview --- pkgs/applications/misc/qpdfview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 1cf6d76b892..574b73f5672 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version = "0.4.14"; + version = "0.4.15"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; + sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52"; }; buildInputs = [ qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript From 59126fb3f8ccec44cd2cead144b57045f6ea3c2d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:22:07 +0300 Subject: [PATCH 357/412] Update golly --- pkgs/applications/science/misc/golly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 63a0be47c47..bf6eabef909 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="golly"; - version="2.6"; + version="2.7"; name="${baseName}-${version}"; - hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; - url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz"; - sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; + hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; + url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz"; + sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; }; buildInputs = [ wxGTK perl python zlib From ed145cb07f846489b1d333cd4ad8f4421c557ba7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:22:23 +0300 Subject: [PATCH 358/412] Update Nginx unstable --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index d9d9857e33b..ae8e2785d5f 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.9.0"; + version = "1.9.1"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1"; + sha256 = "1b8xikrr19p07n28xnar8p8l0vgm7795lmrb2x7r9h4lwvx5bx89"; }; rtmp-ext = fetchFromGitHub { From de7c3eef17db55ff34399872d6779ff520cdd978 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:22:32 +0300 Subject: [PATCH 359/412] Update Asymptote --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 90a7ce9efad..01f3947cdfa 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -7,11 +7,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.32"; + version="2.35"; name="${baseName}-${version}"; - hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; - url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz"; - sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; + hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; + url="http://softlayer-ams.dl.sourceforge.net/project/asymptote/2.35/asymptote-2.35.src.tgz"; + sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; }; buildInputs = [ freeglut ghostscriptX imagemagick fftw From 9c726f502dd3d3da050afd564031be44de318617 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:22:40 +0300 Subject: [PATCH 360/412] Update getmail --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index dbd3c631c29..a05b3ccfa9a 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - version = "4.47.0"; + version = "4.48.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb"; + sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29"; }; doCheck = false; From 000162daed5e6a854d1e034409002aee80e6d8ac Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:22:56 +0300 Subject: [PATCH 361/412] Update FreeIPMI --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 346bbef0bdf..7e3ec2358c7 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.8"; + version = "1.4.9"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "06smdsri1v5v2smrd3jxq3n135x7cx0npcimc37lb144gzgyk9wz"; + sha256 = "0v2xfwik2mv6z8066raiypc4xymjvr8pb0mv3mc3g4ym4km132qp"; }; buildInputs = [ libgcrypt readline ]; From 2b35cccc5b161d95e09150a5f82ecef8d231bb97 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:23:18 +0300 Subject: [PATCH 362/412] Update dd_rescue and switch to bzip2 releases --- pkgs/tools/system/dd_rescue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 7b3e62a1bc0..a0ff9b063dd 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.46"; + version = "1.98"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy"; - url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; + sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b"; + url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; dd_rhelp_src = fetchurl { From f39c3ebf047c3fc7274a7f83f204ef1d94de6898 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:23:42 +0300 Subject: [PATCH 363/412] Update GlusterFS, adding new dependencies --- pkgs/tools/filesystems/glusterfs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index bfab9454d6d..57b36875a51 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,18 +1,21 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2}: + autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite + , liburcu, attr +}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.3"; + version="3.7.1"; name="${baseName}-${version}"; - hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz"; - sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; + hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz"; + sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 + acl sqlite liburcu attr ]; in stdenv.mkDerivation From 14e7d5440bf22f059dc943d06afe6b10b4225530 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:23:56 +0300 Subject: [PATCH 364/412] Update Sysdig, adding new dependencies --- pkgs/os-specific/linux/sysdig/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 5a7d0700004..9478e07468e 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, cmake, luajit, kernel, zlib}: +{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}: let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.99"; + version = "0.1.101"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76"; + sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9"; }; buildInputs = [ - cmake zlib luajit + cmake zlib luajit ncurses ]; in stdenv.mkDerivation { @@ -22,6 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DUSE_BUNDLED_LUAJIT=OFF" "-DUSE_BUNDLED_ZLIB=OFF" + "-DUSE_BUNDLED_NCURSES=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; preConfigure = '' export INSTALL_MOD_PATH="$out" From 5d5bb7156771cbca73ea4bb46af2716dd60e9000 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 11:37:33 +0300 Subject: [PATCH 365/412] Update PostgreSQL to latest point-releases --- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.4.x.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index f1abfa3fb0f..ef7e5d3797f 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.0.20"; in +let version = "9.0.22"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; + sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 93bf5e1e716..7616f92ca62 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.1.16"; in +let version = "9.1.18"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; + sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 5c51a7c578a..51a265da785 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.2.11"; in +let version = "9.2.13"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; + sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 71f3d7a826f..3e0b7d4a76e 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.7"; in +let version = "9.3.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; + sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp"; }; buildInputs = [ zlib readline openssl ] diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index f1834d301de..5c795329b2d 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.4.2"; in +let version = "9.4.4"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; + sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk"; }; buildInputs = [ zlib readline openssl ] From c72bbc5b8eb135d13fa38a5ad7754df19c8d7f66 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 14 Jun 2015 18:17:03 +0300 Subject: [PATCH 366/412] teamviewer: add option to accept license --- .../networking/remote/teamviewer/10.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix index cd1833261f4..4b919d36fb6 100644 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, +wineUnstable, makeWrapper, libXau , bash, patchelf, config, +acceptLicense ? false }: + +with stdenv.lib; let topath = "${wineUnstable}/bin"; @@ -37,11 +40,18 @@ stdenv.mkDerivation { patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ + ${optionalString acceptLicense " + cat > $out/share/teamviewer/config/global.conf << EOF + [int32] EulaAccepted = 1 + [int32] EulaAcceptedRevision = 6 + EOF + "} ''; meta = { homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; + maintainers = with maintainers; [ jagajaga ]; }; } From 8ae4d0b1e1d3a00a60b2649da20c568c4d63967b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 14 Jun 2015 18:31:48 +0200 Subject: [PATCH 367/412] Add mailnag package --- .../mailreaders/mailnag/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/mailnag/default.nix diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix new file mode 100644 index 00000000000..e4253f5bff5 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -0,0 +1,46 @@ +{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages +, gdk_pixbuf, libnotify, gst_all_1 +, libgnome_keyring3 ? null, networkmanager ? null +}: + +buildPythonPackage rec { + name = "mailnag-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; + sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r"; + }; + + # Sometimes the generated output isn't identical. It seems like there's a + # race condtion while patching the Mailnag/commons/dist_cfg.py file. This is + # a small workaround to produce deterministic builds. + # For more information see https://github.com/NixOS/nixpkgs/pull/8279 + setupPyBuildFlags = [ "--build-base=$PWD" ]; + + buildInputs = [ + gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus + pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager + ]; + + preFixup = '' + for script in mailnag mailnag-config; do + wrapProgram $out/bin/$script \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with stdenv.lib; { + description = "An extensible mail notification daemon"; + homepage = https://github.com/pulb/mailnag; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000027a9125..f8ae7936797 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2061,6 +2061,8 @@ let maildrop = callPackage ../tools/networking/maildrop { }; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; + mailsend = callPackage ../tools/networking/mailsend { }; mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; From 279c426f05e8ab7f09ac095446eaedd25a3add9e Mon Sep 17 00:00:00 2001 From: Phil Scott Date: Sun, 14 Jun 2015 17:44:38 +0100 Subject: [PATCH 368/412] Add Tales of Maj'eyal game. --- pkgs/games/tome4/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/games/tome4/default.nix diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix new file mode 100644 index 00000000000..8ff82767cb7 --- /dev/null +++ b/pkgs/games/tome4/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}: + +stdenv.mkDerivation rec { + version = "1.3.1"; + name = "tome4-${version}"; + src = fetchurl { + url = "http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2"; + sha256 = "9b6658e29ad3be9f8469a61e724350f4dfec676777e471f633d616443dfbc7e7"; + }; + buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ]; + preConfigure = '' + sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua + premake4 gmake + ''; + makeFlags = [ "config=release" ]; + installPhase = '' + install -Dm755 t-engine $out/opt/tome4/t-engine + echo "cd $out/opt/tome4" >> tome4 + echo "./t-engine &" >> tome4 + install -Dm755 tome4 $out/bin/tome4 + cp -r bootstrap $out/opt/tome4 + cp -r game $out/opt/tome4 + ''; + meta = { + homepage = "http://te4.org/"; + description = "Tales of Maj'eyal (rogue-like game)"; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000027a9125..3e377bde4e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13467,6 +13467,8 @@ let tintin = callPackage ../games/tintin { }; + tome4 = callPackage ../games/tome4 { }; + tpm = callPackage ../games/thePenguinMachine { }; tremulous = callPackage ../games/tremulous { }; From 74d5adcb4d114e2d159d4ed4a5f0ef35352465a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 10 Apr 2015 22:41:55 +0200 Subject: [PATCH 369/412] nixos: move environment.{variables => sessionVariables}.MODULE_DIR This solves the problem that modprobe does not know about $MODULE_DIR when run via sudo, and instead wrongly tries to read /lib/modules/: $ sudo strace -efile modprobe foo |& grep modules open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) Without this patch, one would have to use sudo -E (preserves environment vars). But that option is reserved for sudo users with extra rights (SETENV), so it's not a solution. environment.sessionVariables are set by PAM, so they are included in the environment used by sudo. --- nixos/modules/system/boot/modprobe.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index a1feaad6132..a3b616ff3ef 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -101,7 +101,7 @@ with lib; echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe ''; - environment.variables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; + environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; }; From 903183d9e467c2bfe9c102f28328cbff2c95fe19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 4 Feb 2015 07:39:19 +0100 Subject: [PATCH 370/412] gtkglextmm: unbreak build * Add missing build inputs: pangox_compat, libXmu * Add patch from debian to fix build with newer gtk --- .../gnome-2/platform/gtkglextmm/default.nix | 15 ++- .../gtkglextmm/fix_ftbfs_gtk_2_36.patch | 121 ++++++++++++++++++ 2 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index bf09bd93eeb..97bad111ca7 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf +, pangox_compat, libXmu +}: stdenv.mkDerivation rec { name = "gtkglextmm-${minVer}.0"; @@ -9,7 +11,16 @@ stdenv.mkDerivation rec { sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea"; }; - patches = [ ./gdk.patch ]; + patches = [ + ./gdk.patch + + # From debian, fixes build with newer gtk "[...] by switching #includes + # around so that the G_DISABLE_DEPRECATED trick in glibmm still works". + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356 + ./fix_ftbfs_gtk_2_36.patch + ]; + + buildInputs = [ pangox_compat libXmu ]; nativeBuildInputs = [pkgconfig]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch new file mode 100644 index 00000000000..88e271e3eb7 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch @@ -0,0 +1,121 @@ +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -1,15 +1,8 @@ +- +-#include +- + // Disable the 'const' function attribute of the get_type() functions. + // GCC would optimize them out because we don't use the return value. + #undef G_GNUC_CONST + #define G_GNUC_CONST /* empty */ + +-#include +-#include +-#include +- + // #include the widget headers so that we can call the get_type() static methods: + + #include "tokens.h" +@@ -19,6 +12,12 @@ + #include "pixmap.h" + #include "window.h" + ++#include ++ ++#include ++#include ++#include ++ + extern "C" + { + +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include +- + #include "query.h" + ++#include ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "pixmapext.h" ++ + #include + #include + +-#include "pixmapext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "windowext.h" ++ + #include + #include + +-#include "windowext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include +- + #include "font.h" + ++#include ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 +@@ -19,11 +19,11 @@ + + #include + +-#include +- + #include "wrap_init.h" + #include "init.h" + ++#include ++ + namespace Gdk + { + namespace GL From a9c339283663527818f5a0309b54675275306a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Jun 2015 20:40:35 +0200 Subject: [PATCH 371/412] bmon: fix build by including a proper header --- pkgs/tools/misc/bmon/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 1a24ba70051..4416c3e1625 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q"; }; + # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887 + postPatch = "sed '1i#include ' -i src/in_netlink.c"; + buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; preConfigure = "sh ./autogen.sh"; From 23393964bb7d166694adf7c07dccac57d69c3aea Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Jun 2015 21:23:37 +0200 Subject: [PATCH 372/412] intel-gpu-tools: update from 1.10 to 1.11 --- .../misc/intel-gpu-tools/compile-fix.patch | 37 ------------------- .../tools/misc/intel-gpu-tools/default.nix | 12 +++--- 2 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch deleted file mode 100644 index 8285867d8ed..00000000000 --- a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 18 Mar 2015 08:36:37 +0000 -Subject: lib/batch: Trivial compile fix for 32-bit builds - -intel_batchbuffer.c: In function 'fill_object': -intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - obj->relocs_ptr = (uint64_t)relocs; - ^ -intel_batchbuffer.c: In function 'exec_blit': -intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - exec.buffers_ptr = (uint64_t)objs; - -Signed-off-by: Chris Wilson - -diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c -index 666c323..c1c27a6 100644 ---- a/lib/intel_batchbuffer.c -+++ b/lib/intel_batchbuffer.c -@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, - memset(obj, 0, sizeof(*obj)); - obj->handle = gem_handle; - obj->relocation_count = count; -- obj->relocs_ptr = (uint64_t)relocs; -+ obj->relocs_ptr = (uintptr_t)relocs; - } - - static void exec_blit(int fd, -@@ -557,7 +557,7 @@ static void exec_blit(int fd, - { - struct drm_i915_gem_execbuffer2 exec; - -- exec.buffers_ptr = (uint64_t)objs; -+ exec.buffers_ptr = (uintptr_t)objs; - exec.buffer_count = count; - exec.batch_start_offset = 0; - exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 997f1bfc012..b675565d053 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: +{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev +, libX11, libXext, libXv, libXrandr, glib, bison, libunwind }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.10"; + name = "intel-gpu-tools-1.11"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd"; + sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8"; }; - buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; - - patches = [ ./compile-fix.patch ]; + buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 + libXext libXv libXrandr glib bison libunwind ]; meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; From 1ee742b0ef2904788e1775d73de42c00492e8c4f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 14:27:46 -0500 Subject: [PATCH 373/412] nixpkgs: afl 1.80b -> 1.83b Signed-off-by: Austin Seipp --- .../tools/analysis/infer/default.nix | 33 +++++++++++++++++++ pkgs/tools/security/afl/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/analysis/infer/default.nix diff --git a/pkgs/development/tools/analysis/infer/default.nix b/pkgs/development/tools/analysis/infer/default.nix new file mode 100644 index 00000000000..35dbd08a870 --- /dev/null +++ b/pkgs/development/tools/analysis/infer/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "infer-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz"; + sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m"; + }; + + buildInputs = [ python ]; + buildPhase = "true"; + installPhase = '' + mkdir -p $out/libexec $out/bin; + cp -R facebook-clang-plugin $out/libexec + cp -R infer $out/libexec + for x in `ls $out/libexec/infer/infer/bin`; do + ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x; + done + ''; + fixupPhase = '' + patchShebangs $out + ''; + + meta = { + description = "Scalable static analyzer for Java, C and Objective-C"; + homepage = http://fbinfer.com; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 2aed8df3260..ff9798b3f75 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.80b"; + version = "1.83b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0"; + sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000027a9125..7db22233024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5302,6 +5302,8 @@ let csslint = callPackage ../development/web/csslint { }; + infer = callPackage ../development/tools/analysis/infer { }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; From 4e0fb6578af581f375c21820bd94bcba3e279eb1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Jun 2015 21:44:18 +0200 Subject: [PATCH 374/412] strongswan: update from 5.2.1 to 5.3.2, fixes CVE-2015-4171 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 871cd3e8f47..d65f1ac4335 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: stdenv.mkDerivation rec { - name = "strongswan-5.2.1"; + name = "strongswan-5.3.2"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga"; + sha256 = "09gjrd5f8iykh926y35blxlm2hlzpw15m847d8vc9ga29s6brad4"; }; dontPatchELF = true; From cf9e72369edc32919f2647f31be3a9363b5d574f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 14 Jun 2015 19:37:55 +0000 Subject: [PATCH 375/412] add libebur128 package --- .../libraries/libebur128/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libebur128/default.nix diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix new file mode 100644 index 00000000000..e11e2b1db85 --- /dev/null +++ b/pkgs/development/libraries/libebur128/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "libebur128-${version}"; + + src = fetchFromGitHub { + owner = "jiixyj"; + repo = "libebur128"; + rev = "v${version}"; + sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + }; + + buildInputs = [ cmake speexdsp pkgconfig ]; + + meta = with stdenv.lib; { + description = "Implementation of the EBU R128 loudness standard"; + homepage = https://github.com/jiixyj/libebur128; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db22233024..e487756e350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6727,6 +6727,8 @@ let libebml = callPackage ../development/libraries/libebml { }; + libebur128 = callPackage ../development/libraries/libebur128 { }; + libedit = callPackage ../development/libraries/libedit { }; libelf = callPackage ../development/libraries/libelf { }; From 14695867cb54887ac622ea7c0e3ab6c7108398b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 22:26:13 +0300 Subject: [PATCH 376/412] Add ratmen X11 menu generator --- pkgs/tools/X11/ratmen/default.nix | 35 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/X11/ratmen/default.nix diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix new file mode 100644 index 00000000000..c438381d712 --- /dev/null +++ b/pkgs/tools/X11/ratmen/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, perl, xproto, libX11}: +let + s = # Generated upstream information + rec { + baseName="ratmen"; + version="2.2.3"; + name="${baseName}-${version}"; + hash="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; + url="http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-2.2.3.tar.gz"; + sha256="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; + }; + buildInputs = [ + perl xproto libX11 + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + makeFlags = [ + "PREFIX=$(out)" + ]; + meta = { + inherit (s) version; + description = ''A minimalistic X11 menu creator''; + license = stdenv.lib.licenses.free ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://www.update.uu.se/~zrajm/programs/"; + downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; + updateWalker = true; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d32149e67f..fb283ac087a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12241,6 +12241,8 @@ let rapidsvn = callPackage ../applications/version-management/rapidsvn { }; + ratmen = callPackage ../tools/X11/ratmen {}; + ratox = callPackage ../applications/networking/instant-messengers/ratox { }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; From a6d54b3fdd23ae540de9061575dba882fdc92d18 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 22:40:17 +0300 Subject: [PATCH 377/412] A comment about the license --- pkgs/tools/X11/ratmen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index c438381d712..19e5fe69da5 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A minimalistic X11 menu creator''; - license = stdenv.lib.licenses.free ; + license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; homepage = "http://www.update.uu.se/~zrajm/programs/"; From 649b0affe139e5b60b414d988a7d8a2950e99e1d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 22:53:25 +0300 Subject: [PATCH 378/412] Adding Skippy-XD window switcher --- pkgs/tools/X11/skippy-xd/default.nix | 30 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/X11/skippy-xd/default.nix diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix new file mode 100644 index 00000000000..b3e9ad759f1 --- /dev/null +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, xproto, libX11, libXft, libXcomposite, libXdamage +, libXext, xextproto, libXinerama, libjpeg, giflib, pkgconfig +}: +let + buildInputs = [ + xproto libX11 libXft libXcomposite libXdamage libXext xextproto + libXinerama libjpeg giflib pkgconfig + ]; +in +stdenv.mkDerivation rec { + version = "git-2015-03-01"; + name = "skippy-xd-${version}"; + inherit buildInputs; + src = fetchgit { + url = "https://github.com/richardgv/skippy-xd/"; + rev = "397216ca67"; + sha256 = "19lvy5888j7rl52dsxv1wwxxijdlk8d7qn1zzzy0b8wvqknhxypm"; + }; + makeFlags = ["PREFIX=$(out)"]; + preInstall = '' + sed -e "s@/etc/xdg@$out&@" -i Makefile + ''; + meta = { + inherit version; + description = ''Expose-style compositing-based standalone window switcher''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb283ac087a..75ef22131e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2856,6 +2856,8 @@ let simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; + skydns = callPackage ../servers/dns/skydns { }; sleuthkit = callPackage ../tools/system/sleuthkit {}; From d9354c6a2a33a751bb1533b653985563af50eac3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jun 2015 23:09:32 +0300 Subject: [PATCH 379/412] Add xwinmosaic window switcher --- pkgs/tools/X11/xwinmosaic/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/X11/xwinmosaic/default.nix diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix new file mode 100644 index 00000000000..95f35129754 --- /dev/null +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchgit, gtk2, cmake, pkgconfig}: +let + buildInputs = [ + gtk2 cmake pkgconfig + ]; +in +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "xwinmosaic-${version}"; + inherit buildInputs; + src = fetchgit { + url = "https://github.com/soulthreads/xwinmosaic/"; + rev = "refs/tags/v0.4.2"; + sha256 = "0ddriqx4idyp55v8js5xazmhl09jwkmnv5nlfzhs2cpvshcj56ri"; + }; + meta = { + inherit version; + description = ''X window switcher drawing a colourful grid''; + license = stdenv.lib.licenses.bsd2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75ef22131e4..6371b636b30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3414,6 +3414,8 @@ let inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep; }; + xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; From 853e87909f342f18161a875eb91e2cf964e37ab2 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Sun, 14 Jun 2015 16:31:29 -0400 Subject: [PATCH 380/412] makemkv: 1.9.3 -> 1.9.4 --- pkgs/applications/video/makemkv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 7220402f2ad..7d604101f4b 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.3"; + ver = "1.9.4"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1rlg7phkhzhzbb1zk8mb5qsd4zcsw20glga31npaxxy8vyfkjcxc"; + sha256 = "0xr5bfbpzd1s9fyxbwj0crpgi57hm4wrm1dybx13lv4n6xdj2ww0"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "1vn4wbxii1vn7mss2ydikhwp8hkizii7arg7a1cnpvmwp7pd952v"; + sha256 = "0gpmyp2g44piaj47a52ik5i3sk5flbs8kqlqmjxnqkv16s01vfra"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; From faa90fad3fa97161e55ea28262ede574477db5e6 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Sun, 14 Jun 2015 16:28:55 -0400 Subject: [PATCH 381/412] mr: update from 1.20141024 to 1.20150503 --- pkgs/applications/version-management/mr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index d52802e42f1..68bef621bc2 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "1.20141024"; + version = "1.20150503"; name = "mr-${version}"; src = fetchurl { url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; - sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a"; + sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf"; }; buildInputs = [ perl ]; From 6cfc2caaeb94a3fb3c789e6f8853bf69c5e3858a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 14:35:29 -0500 Subject: [PATCH 382/412] nixpkgs/cvc4: touchups, add myself as maintainer Signed-off-by: Austin Seipp --- .../science/logic/cvc4/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 5b2e9c54d6f..5d2968e42a6 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl, gmp, libantlr3c, boost}: +{ stdenv, fetchurl, gmp, libantlr3c, boost }: + +stdenv.mkDerivation rec { + name = "cvc4-${version}"; + version = "1.4"; -stdenv.mkDerivation { - name = "cvc4-1.4"; src = fetchurl { - url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz; + url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz"; sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn"; }; buildInputs = [ gmp libantlr3c boost ]; - preConfigure = "patchShebangs ./src/"; - doChecks = true; meta = with stdenv.lib; { - description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems"; - homepage = http://cvc4.cs.nyu.edu/web/; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ vbgl ]; + description = "A high-performance theorem prover and SMT solver"; + homepage = http://cvc4.cs.nyu.edu/web/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl thoughtpolice ]; }; } From 3d181a3175d67b30a8a9a8add51a953c06a5e273 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 14:39:13 -0500 Subject: [PATCH 383/412] nixpkgs: abc-verifier 20150406 -> 20150614 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/abc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 174dfe8f2b2..236045fa335 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "abc-verifier-${version}"; - version = "20150406"; + version = "20150614"; src = fetchhg { url = "https://bitbucket.org/alanmi/abc"; - rev = "7d9c50a17d8676ad0c9792bb87102d7cb4b10667"; - sha256 = "1gg5jjfjjnv0fl7jsz37hzd9dpv58r8p0q8qvms0r289fcdxalcx"; + rev = "38661894bc1287cad9bd35978bd252dbfe3e6c56"; + sha256 = "04v0hkvj501r10pj3yrqrk2463d1d7lhl8dzfjwkmlbmlmpjlvvv"; }; buildInputs = [ readline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Sequential Logic Synthesis and Formal Verification"; + description = "A tool for squential logic synthesis and ormal verification"; homepage = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; From da76434dbd5e727ab21b04e87ad219eedae2c183 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 14:56:49 -0500 Subject: [PATCH 384/412] nixpkgs: yices 2.2.1 -> 2.3.1, now with source It's still under a non-commercial license, but the source build is waay better than the binary build. Can probably work on OS X too now. Signed-off-by: Austin Seipp --- .../science/logic/yices/default.nix | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 4e3b9b2a76b..5daaa444c12 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,36 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gmp, gperf, autoreconfHook }: -assert stdenv.isLinux; - -let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; -in stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.2.1"; + version = "2.3.1"; - src = - if stdenv.system == "i686-linux" - then fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept"; - name = "yices-${version}-i686.tar.gz"; - sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra"; - } - else fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept"; - name = "yices-${version}-x86_64.tar.gz"; - sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj"; - }; + src = fetchurl { + url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree"; + name = "yices-${version}-src.tar.gz"; + sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs"; + }; - buildPhase = false; - installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cd bin && mv * $out/bin && cd .. - cd lib && mv * $out/lib && cd .. - cd include && mv * $out/include && cd .. - - patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version} - ''; + configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a" + "--with-static-gmp-include-dir=${gmp}/include" + ]; + buildInputs = [ gmp gperf autoreconfHook ]; meta = { description = "A high-performance theorem prover and SMT solver"; From 44ef5a3ab00bb96476b0cdb6a3768a78132df62d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 15:05:24 -0500 Subject: [PATCH 385/412] cvc4: regenerate ./configure on rebuild Otherwise some absurd error from ./configure crops up. Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/cvc4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 5d2968e42a6..769f86d5d77 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, libantlr3c, boost }: +{ stdenv, fetchurl, gmp, libantlr3c, boost, autoreconfHook }: stdenv.mkDerivation rec { name = "cvc4-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn"; }; - buildInputs = [ gmp libantlr3c boost ]; + buildInputs = [ gmp libantlr3c boost autoreconfHook ]; preConfigure = "patchShebangs ./src/"; doChecks = true; From 2dfb657b94fd4f0421447715a693acc39da09244 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 14 Jun 2015 15:55:08 -0500 Subject: [PATCH 386/412] nixpkgs: picosat 936 -> 960, add myself as a maintainer Signed-off-by: Austin Seipp --- .../science/logic/picosat/default.nix | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 6c2cce0ea4b..fb5acc64c4d 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -1,41 +1,33 @@ -{stdenv, fetchurl }: - -let - version = "936"; - pname = "picosat"; - -in +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "picosat-${version}"; + version = "960"; src = fetchurl { url = "http://fmv.jku.at/picosat/${name}.tar.gz"; - sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n"; + sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd"; }; dontAddPrefix = true; - - # configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :( - patchPhase = '' - sed -e 's/^shared=no/shared=yes/' -i configure - ''; + configureFlags = "--shared"; installPhase = '' - mkdir -p "$out"/bin + mkdir -p $out/bin $out/lib $out/include/picosat cp picomus "$out"/bin cp picosat "$out"/bin - mkdir -p "$out"/lib + cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib - mkdir -p "$out"/include/picosat + cp picosat.h "$out"/include/picosat ''; meta = { - homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + homepage = http://fmv.jku.at/picosat/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; }; } From f4d7b23a680ed497cfd64b3430cd33d458b4fc85 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Jun 2015 11:07:02 +0200 Subject: [PATCH 387/412] tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111 Using the prerelease version, because there was no response on when a new official release will happen, see http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html --- .../http/apache-modules/tomcat-connectors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 0e908acd74b..90d0fb899c3 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - name = "tomcat-connectors-1.2.40"; + name = "tomcat-connectors-1.2.41-dev-1613051"; src = fetchurl { - url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; - sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9"; + url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; + sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; From 6c382151fb86fdd34d3dacfc86c5fe98dd6ac3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Jun 2015 11:28:38 +0200 Subject: [PATCH 388/412] imagemagick: remove mirrors that don't work /cc #8302. --- pkgs/build-support/fetchurl/mirrors.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 0e2a6e756f6..2a3dbb40a2b 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -151,10 +151,9 @@ rec { # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php. imagemagick = [ - ftp://ftp.nluug.nl/pub/ImageMagick/ + http://www.imagemagick.org/download/ + ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors ftp://ftp.imagemagick.org/pub/ImageMagick/ - ftp://ftp.imagemagick.net/pub/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ ]; # CPAN mirrors. From cc5663de0c17d7b76418b570a459ecb8c33dc49d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 15 Jun 2015 11:47:32 +0200 Subject: [PATCH 389/412] gnome3: easier to override packages --- pkgs/desktops/gnome-3/3.16/default.nix | 19 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index be60a58db26..89f4ea86829 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -1,6 +1,16 @@ -{ callPackage, pkgs, self }: +{ pkgs }: + +let + + pkgsFun = overrides: + let + self = self_ // overrides; + self_ = with self; { + + overridePackages = f: pkgsFun (f self); + + callPackage = pkgs.newScope self; -rec { corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus pkgs.shared_mime_info # for update-mime-database @@ -293,4 +303,7 @@ rec { gtkhtml = callPackage ./misc/gtkhtml { }; -} + }; + in self; # pkgsFun + +in pkgsFun {} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f326977b8f..62622cd8a0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13614,10 +13614,7 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { - callPackage = pkgs.newScope pkgs.gnome3_16; - self = pkgs.gnome3_16; - }); + gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { }); gnome3 = gnome3_16; From b36629d8212527f72d7a5f7b8adf05fcdec1b77f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 15 Jun 2015 11:52:26 +0200 Subject: [PATCH 390/412] gnome3: also pass self to overridePackages function --- pkgs/desktops/gnome-3/3.16/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 89f4ea86829..2dee0cefd92 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -7,7 +7,9 @@ let self = self_ // overrides; self_ = with self; { - overridePackages = f: pkgsFun (f self); + overridePackages = f: + let newself = pkgsFun (f newself self); + in newself; callPackage = pkgs.newScope self; From 6c213c6e44e27abbb965ff59c94c5ebfcc142ddb Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 10 Jun 2015 13:55:52 +0000 Subject: [PATCH 391/412] rmlint: 2.1.0 -> 2.2.0 (closes #8268) --- pkgs/tools/misc/rmlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 9e61a5c195e..392734e2256 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g"; + sha256 = "1wg6br30ccvxl2189a75lb3d03kg8spfkkp9qlf3whl0xirsm15n"; }; configurePhase = "scons config"; From c2116191d36ca0df26a8e2f0ccd7dbd187f154d4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 15 Jun 2015 10:54:53 +0200 Subject: [PATCH 392/412] gnupg 2.1.4 -> 2.1.5 According to someone on #gnupg, the patch is not necessary anymore. --- pkgs/tools/security/gnupg/21.nix | 6 +- .../gnupg/socket-activate-2.1.1.patch | 170 ------------------ 2 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 pkgs/tools/security/gnupg/socket-activate-2.1.1.patch diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 31a6bd2c460..34561c3c33d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,15 +13,13 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.4"; + name = "gnupg-2.1.5"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4"; + sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m"; }; - patches = [ ./socket-activate-2.1.1.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; diff --git a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch b/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch deleted file mode 100644 index 2c2d7b54250..00000000000 --- a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch +++ /dev/null @@ -1,170 +0,0 @@ -Port Shea Levy's socket activation patch to version 2.1.1. - -diff -Naur gnupg-2.1.1-upstream/agent/gpg-agent.c gnupg-2.1.1/agent/gpg-agent.c ---- gnupg-2.1.1-upstream/agent/gpg-agent.c 2014-12-01 05:04:57.000000000 -0430 -+++ gnupg-2.1.1/agent/gpg-agent.c 2014-12-23 17:13:48.029286035 -0430 -@@ -125,7 +125,9 @@ - oPuttySupport, - oDisableScdaemon, - oDisableCheckOwnSocket, -- oWriteEnvFile -+ oWriteEnvFile, -+ oAgentFD, -+ oSSHAgentFD - }; - - -@@ -143,6 +145,8 @@ - ARGPARSE_group (301, N_("@Options:\n ")), - - ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")), -+ ARGPARSE_s_i (oAgentFD, "agent-fd", "@"), -+ ARGPARSE_s_i (oSSHAgentFD, "ssh-agent-fd", "@"), - ARGPARSE_s_n (oServer, "server", N_("run in server mode (foreground)")), - ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")), - ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")), -@@ -627,6 +631,31 @@ - return 1; /* handled */ - } - -+/* Handle agent socket(s) */ -+static void -+handle_agent_socks(int fd, int fd_extra, int fd_ssh) -+{ -+#ifndef HAVE_W32_SYSTEM -+ if (chdir("/")) -+ { -+ log_error ("chdir to / failed: %s\n", strerror (errno)); -+ exit (1); -+ } -+ -+ { -+ struct sigaction sa; -+ -+ sa.sa_handler = SIG_IGN; -+ sigemptyset (&sa.sa_mask); -+ sa.sa_flags = 0; -+ sigaction (SIGPIPE, &sa, NULL); -+ } -+#endif /*!HAVE_W32_SYSTEM*/ -+ -+ log_info ("%s %s started\n", strusage(11), strusage(13) ); -+ handle_connections (fd, fd_extra, fd_ssh); -+ assuan_sock_close (fd); -+} - - /* The main entry point. */ - int -@@ -643,6 +672,8 @@ - int default_config =1; - int pipe_server = 0; - int is_daemon = 0; -+ int fd_agent = GNUPG_INVALID_FD; -+ int fd_ssh_agent = GNUPG_INVALID_FD; - int nodetach = 0; - int csh_style = 0; - char *logfile = NULL; -@@ -850,6 +881,8 @@ - case oSh: csh_style = 0; break; - case oServer: pipe_server = 1; break; - case oDaemon: is_daemon = 1; break; -+ case oAgentFD: fd_agent = pargs.r.ret_int; break; -+ case oSSHAgentFD: fd_ssh_agent = pargs.r.ret_int; break; - - case oDisplay: default_display = xstrdup (pargs.r.ret_str); break; - case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break; -@@ -940,7 +973,8 @@ - bind_textdomain_codeset (PACKAGE_GT, "UTF-8"); - #endif - -- if (!pipe_server && !is_daemon && !gpgconf_list) -+ if (!pipe_server && !is_daemon && !gpgconf_list && -+ fd_agent == GNUPG_INVALID_FD) - { - /* We have been called without any options and thus we merely - check whether an agent is already running. We do this right -@@ -1090,6 +1124,10 @@ - agent_deinit_default_ctrl (ctrl); - xfree (ctrl); - } -+ else if (fd_agent != GNUPG_INVALID_FD) -+ { -+ handle_agent_socks(fd_agent, GNUPG_INVALID_FD, fd_ssh_agent); -+ } - else if (!is_daemon) - ; /* NOTREACHED */ - else -@@ -1287,26 +1325,8 @@ - log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); - opt.running_detached = 1; - } -- -- if (chdir("/")) -- { -- log_error ("chdir to / failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- { -- struct sigaction sa; -- -- sa.sa_handler = SIG_IGN; -- sigemptyset (&sa.sa_mask); -- sa.sa_flags = 0; -- sigaction (SIGPIPE, &sa, NULL); -- } --#endif /*!HAVE_W32_SYSTEM*/ -- -- log_info ("%s %s started\n", strusage(11), strusage(13) ); -- handle_connections (fd, fd_extra, fd_ssh); -- assuan_sock_close (fd); -+#endif /*!HAVE_W32_SYSTEM*/ -+ handle_agent_socks(fd, fd_extra, fd_ssh); - } - - return 0; -diff -Naur gnupg-2.1.1-upstream/doc/gpg-agent.texi gnupg-2.1.1/doc/gpg-agent.texi ---- gnupg-2.1.1-upstream/doc/gpg-agent.texi 2014-12-05 09:56:37.000000000 -0430 -+++ gnupg-2.1.1/doc/gpg-agent.texi 2014-12-23 16:26:38.366391186 -0430 -@@ -43,7 +43,15 @@ - .IR file ] - .RI [ options ] - .B \-\-daemon --.RI [ command_line ] -+.br -+.B gpg-agent -+.RB [ \-\-homedir -+.IR dir ] -+.RB [ \-\-options -+.IR file ] -+.RI [ options ] -+.B \-\-agent-fd -+.IR fd - @end ifset - - @mansect description -@@ -186,6 +194,11 @@ - a new process as a child of gpg-agent: @code{gpg-agent --daemon - /bin/sh}. This way you get a new shell with the environment setup - properly; if you exit from this shell, gpg-agent terminates as well. -+ -+@item --agent-fd @var{fd} -+@opindex agent-fd -+Start the gpg-agent using @var{fd} as the listening socket. This is useful for -+socket activation a la systemd and launchd. - @end table - - @mansect options -@@ -545,6 +558,12 @@ - remote machine. - - -+@item --ssh-agent-fd @var{fd} -+@opindex ssh-agent-fd -+ -+When starting the agent with @option{--agent-fd}, use this to pass in a socket -+to be used for the OpenSSH agent protocol. -+ - @anchor{option --enable-ssh-support} - @item --enable-ssh-support - @opindex enable-ssh-support From 5a5a5ade0fcc9317a7c75bde424aab3f32065e30 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 May 2015 01:40:26 +0300 Subject: [PATCH 393/412] libx86: Add patch from debian to fix build on ARM Without this, the build fails even with x86emu: make LIBRARY=static static make[1]: Entering directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1' gcc -O2 -Wall -DDEBUG -g -c -o x86-common.o x86-common.c gcc -O2 -Wall -DDEBUG -g -c -o thunk.o thunk.c thunk.c: In function 'x_inb': thunk.c:40:9: error: impossible constraint in 'asm' __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \ ^ thunk.c:44:1: note: in expansion of macro '__BUILDIO' __BUILDIO(b,b,char) ^ : recipe for target 'thunk.o' failed make[1]: *** [thunk.o] Error 1 make[1]: Leaving directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1' Makefile:17: recipe for target 'default' failed make: *** [default] Error 2 --- pkgs/development/libraries/libx86/default.nix | 4 +- .../libraries/libx86/non-x86.patch | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libx86/non-x86.patch diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 09cc623cbb1..011e936548a 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -12,13 +12,13 @@ rec { inherit buildInputs; phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"]; - patches = [./constants.patch]; + patches = [./constants.patch ./non-x86.patch]; # using BACKEND=x86emu on 64bit systems fixes: # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$out" - ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ]; + ] ++ a.stdenv.lib.optionals ( a.stdenv.isx86_64 || a.stdenv.isArm ) [ "BACKEND=x86emu" ]; fixX86Def = a.fullDepEntry ('' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch new file mode 100644 index 00000000000..0d41cd737f0 --- /dev/null +++ b/pkgs/development/libraries/libx86/non-x86.patch @@ -0,0 +1,38 @@ +diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile +--- libx86-1.1+ds1.orig/Makefile 2008-05-19 12:28:59.000000000 +0300 ++++ libx86-1.1+ds1/Makefile 2012-02-20 01:32:03.750068423 +0200 +@@ -5,6 +5,7 @@ + ifeq ($(BACKEND),x86emu) + OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ + x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o ++ CFLAGS += -DX86EMU + else + OBJECTS += lrmi.o + endif +diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c +--- libx86-1.1+ds1.orig/thunk.c 2008-04-03 03:48:00.000000000 +0300 ++++ libx86-1.1+ds1/thunk.c 2012-02-20 01:12:56.468820192 +0200 +@@ -32,6 +32,7 @@ + #define TRUE 1 + #define FALSE 0 + ++#ifndef X86EMU + #define __BUILDIO(bwl,bw,type) \ + static inline void out##bwl##_local(unsigned long port, unsigned type value) { __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \ + }\ +@@ -44,6 +45,15 @@ + __BUILDIO(b,b,char) + __BUILDIO(w,w,short) + __BUILDIO(l,,int) ++#else ++/* use libc functions */ ++#define inb_local inb ++#define inw_local inw ++#define inl_local inl ++#define outb_local outb ++#define outw_local outw ++#define outl_local outl ++#endif /* X86EMU */ + + + char *mmap_addr = SHMERRORPTR; From 7233ca0488707c23bac26914f41dea2513cd9ab3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 May 2015 01:42:18 +0300 Subject: [PATCH 394/412] read-edid: New package at version 3.0.2 --- pkgs/os-specific/linux/read-edid/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/read-edid/default.nix diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix new file mode 100644 index 00000000000..fdf2c4c9f12 --- /dev/null +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, libx86 }: + +stdenv.mkDerivation rec { + name = "read-edid-${version}"; + version = "3.0.2"; + + src = fetchurl { + url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz"; + sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; + }; + + buildInputs = [ cmake libx86 ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' + ''; + + meta = with stdenv.lib; { + description = "Tool for reading and parsing EDID data from monitors"; + homepage = http://www.polypux.org/projects/read-edid/; + license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like." + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62622cd8a0d..ce83ce492aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2684,6 +2684,8 @@ let privateer = callPackage ../games/privateer { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; + redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; From 2c9b93b01c471a4d933ae05e36504c6f26d1f08b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 18 May 2015 01:43:13 +0300 Subject: [PATCH 395/412] i2c-tools: New package at version 3.1.1 --- pkgs/os-specific/linux/i2c-tools/default.nix | 31 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/i2c-tools/default.nix diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix new file mode 100644 index 00000000000..5cac6069e72 --- /dev/null +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, perl, read-edid }: + +stdenv.mkDerivation rec { + name = "i2c-tools-${version}"; + version = "3.1.1"; + + src = fetchurl { + url = "http://dl.lm-sensors.org/i2c-tools/releases/${name}.tar.bz2"; + sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid" + substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" "" + ''; + + installPhase = '' + make install prefix=$out + rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers + ''; + + meta = with stdenv.lib; { + description = "Set of I2C tools for Linux"; + homepage = http://www.lm-sensors.org/wiki/I2CTools; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce83ce492aa..bcf02133be7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1792,6 +1792,8 @@ let hwinfo = callPackage ../tools/system/hwinfo { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; + i2p = callPackage ../tools/networking/i2p {}; i2pd = callPackage ../tools/networking/i2pd {}; From a4925bcfa8ba5517dda7fa5369b2493f363936af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:07:18 +0200 Subject: [PATCH 396/412] Remove obsolete stuff --- lib/options.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index eed43daaecc..a30397c7216 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -59,20 +59,6 @@ rec { else if all isInt list && all (x: x == head list) list then head list else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; - /* Obsolete, will remove soon. Specify an option type or apply - function instead. */ - mergeTypedOption = typeName: predicate: merge: loc: list: - let list' = map (x: x.value) list; in - if all predicate list then merge list' - else throw "Expected a ${typeName}."; - - mergeEnableOption = mergeTypedOption "boolean" - (x: true == x || false == x) (fold lib.or false); - - mergeListOption = mergeTypedOption "list" isList concatLists; - - mergeStringOption = mergeTypedOption "string" isString lib.concatStrings; - mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." else if length defs != 1 then From e212e07cf6aac9d9e1c46db34b17fd16be2399c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:04:27 +0200 Subject: [PATCH 397/412] Make types.bool complain on conflicting definitions Previously, conflicting definitions would merge to "true". Now they give an error, e.g. error: The option `hardware.enableAllFirmware' has conflicting definitions, in `/etc/nixos/configurations/misc/eelco/stuff.nix' and `/etc/nixos/configurations/misc/eelco/mandark.nix'. --- lib/options.nix | 9 +++++++++ lib/types.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/options.nix b/lib/options.nix index a30397c7216..bfc5b5fa2ae 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -65,6 +65,15 @@ rec { throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." else (head defs).value; + /* "Merge" option definitions by checking that they all have the same value. */ + mergeEqualOption = loc: defs: + if defs == [] then abort "This case should never happen." + else fold (def: val: + if def.value != val then + throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + else + val) (head defs).value defs; + getValues = map (x: x.value); getFiles = map (x: x.file); diff --git a/lib/types.nix b/lib/types.nix index f22c7661634..0a54a5598f1 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -54,7 +54,7 @@ rec { bool = mkOptionType { name = "boolean"; check = isBool; - merge = loc: fold (x: y: x.value || y) false; + merge = mergeEqualOption; }; int = mkOptionType { From 9366af1b94ed42b5e92a776b1ddc4ecd46e69ad1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 17:42:55 +0200 Subject: [PATCH 398/412] "types.uniq types.string" -> "types.str" --- nixos/modules/services/networking/atftpd.nix | 2 +- nixos/modules/services/x11/redshift.nix | 8 ++++---- nixos/modules/services/x11/unclutter.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix index 47465ba948a..a9fd1e3ef8e 100644 --- a/nixos/modules/services/networking/atftpd.nix +++ b/nixos/modules/services/networking/atftpd.nix @@ -26,7 +26,7 @@ in root = mkOption { default = "/var/empty"; - type = types.uniq types.string; + type = types.str; description = '' Document root directory for the atftpd. ''; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index d73b58de6c0..4ccb9153526 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -14,12 +14,12 @@ in { services.redshift.latitude = mkOption { description = "Your current latitude"; - type = types.uniq types.string; + type = types.str; }; services.redshift.longitude = mkOption { description = "Your current longitude"; - type = types.uniq types.string; + type = types.str; }; services.redshift.temperature = { @@ -39,12 +39,12 @@ in { day = mkOption { description = "Screen brightness to apply during the day (between 0.1 and 1.0)"; default = "1"; - type = types.uniq types.string; + type = types.str; }; night = mkOption { description = "Screen brightness to apply during the night (between 0.1 and 1.0)"; default = "1"; - type = types.uniq types.string; + type = types.str; }; }; }; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index 556d9e187fd..6e8719e1053 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -13,7 +13,7 @@ in { services.unclutter.arguments = mkOption { description = "Arguments to pass to unclutter command"; default = "-idle 1"; - type = types.uniq types.string; + type = types.str; }; }; From c738b309eea83669bbd590f7293db5d725233193 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:10:26 +0200 Subject: [PATCH 399/412] types.uniq types.bool -> types.bool --- lib/modules.nix | 2 +- nixos/modules/services/databases/influxdb.nix | 2 +- nixos/modules/services/databases/neo4j.nix | 2 +- nixos/modules/services/misc/apache-kafka.nix | 2 +- nixos/modules/services/misc/mesos-master.nix | 2 +- nixos/modules/services/misc/mesos-slave.nix | 2 +- nixos/modules/services/misc/zookeeper.nix | 2 +- nixos/modules/services/monitoring/apcupsd.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 14 +++++++------- nixos/modules/services/monitoring/statsd.nix | 2 +- .../modules/services/network-filesystems/samba.nix | 2 +- nixos/modules/services/networking/atftpd.nix | 2 +- nixos/modules/services/networking/freenet.nix | 2 +- nixos/modules/services/networking/iodined.nix | 4 ++-- nixos/modules/services/networking/kippo.nix | 2 +- nixos/modules/services/networking/notbit.nix | 8 ++++---- nixos/modules/services/networking/unifi.nix | 2 +- nixos/modules/services/scheduling/chronos.nix | 2 +- nixos/modules/services/scheduling/marathon.nix | 2 +- nixos/modules/services/search/elasticsearch.nix | 2 +- nixos/modules/services/torrent/peerflix.nix | 2 +- nixos/modules/services/torrent/transmission.nix | 2 +- .../modules/services/web-servers/lighttpd/cgit.nix | 2 +- .../services/web-servers/lighttpd/default.nix | 6 +++--- .../services/web-servers/lighttpd/gitweb.nix | 2 +- 25 files changed, 37 insertions(+), 37 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 3561dd0d1d3..73dbdd371f6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -43,7 +43,7 @@ rec { }; _module.check = mkOption { - type = types.uniq types.bool; + type = types.bool; internal = true; default = check; description = "Whether to check whether all option definitions have matching declarations."; diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index b57ccebae16..08963f7aab7 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -55,7 +55,7 @@ in enable = mkOption { default = false; description = "Whether to enable the influxdb server"; - type = types.uniq types.bool; + type = types.bool; }; package = mkOption { diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 575034c93ab..3cf22db7da2 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -43,7 +43,7 @@ in { enable = mkOption { description = "Whether to enable neo4j."; default = false; - type = types.uniq types.bool; + type = types.bool; }; package = mkOption { diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 5314a096fe0..cbfeef7a9c7 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -33,7 +33,7 @@ in { enable = mkOption { description = "Whether to enable Apache Kafka."; default = false; - type = types.uniq types.bool; + type = types.bool; }; brokerId = mkOption { diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 52f08c53b1d..6cbe94029d2 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -13,7 +13,7 @@ in { enable = mkOption { description = "Whether to enable the Mesos Master."; default = false; - type = types.uniq types.bool; + type = types.bool; }; port = mkOption { diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 811aa812c8d..7a7fcf105ac 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -21,7 +21,7 @@ in { enable = mkOption { description = "Whether to enable the Mesos Slave."; default = false; - type = types.uniq types.bool; + type = types.bool; }; ip = mkOption { diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 47675b8876c..827a050be11 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -27,7 +27,7 @@ in { enable = mkOption { description = "Whether to enable Zookeeper."; default = false; - type = types.uniq types.bool; + type = types.bool; }; port = mkOption { diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 6cd0254dbe3..9abd6e9ab64 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -74,7 +74,7 @@ in enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' Whether to enable the APC UPS daemon. apcupsd monitors your UPS and permits orderly shutdown of your computer in the event of a power diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 2a572a6a065..fb30daba1dc 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -67,7 +67,7 @@ in { enable = mkOption { description = "Whether to enable graphite web frontend."; default = false; - type = types.uniq types.bool; + type = types.bool; }; host = mkOption { @@ -95,7 +95,7 @@ in { ''; default = false; - type = types.uniq types.bool; + type = types.bool; }; finders = mkOption { @@ -177,7 +177,7 @@ in { enableCache = mkOption { description = "Whether to enable carbon cache, the graphite storage daemon."; default = false; - type = types.uniq types.bool; + type = types.bool; }; storageAggregation = mkOption { @@ -234,7 +234,7 @@ in { enableRelay = mkOption { description = "Whether to enable carbon relay, the carbon replication and sharding service."; default = false; - type = types.uniq types.bool; + type = types.bool; }; relayRules = mkOption { @@ -251,7 +251,7 @@ in { enableAggregator = mkOption { description = "Whether to enable carbon agregator, the carbon buffering service."; default = false; - type = types.uniq types.bool; + type = types.bool; }; aggregationRules = mkOption { @@ -269,7 +269,7 @@ in { enable = mkOption { description = "Whether to enable seyren service."; default = false; - type = types.uniq types.bool; + type = types.bool; }; port = mkOption { @@ -319,7 +319,7 @@ in { ''; default = false; - type = types.uniq types.bool; + type = types.bool; }; redisUrl = mkOption { diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 7d7ca27bb2f..10ce5a4ce4c 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -37,7 +37,7 @@ in enable = mkOption { description = "Whether to enable statsd stats aggregation service"; default = false; - type = types.uniq types.bool; + type = types.bool; }; host = mkOption { diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 8b3741bca0a..bbf21634c36 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -137,7 +137,7 @@ in nsswins = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' Whether to enable the WINS NSS (Name Service Switch) plug-in. Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a. diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix index a9fd1e3ef8e..d875ddc6352 100644 --- a/nixos/modules/services/networking/atftpd.nix +++ b/nixos/modules/services/networking/atftpd.nix @@ -18,7 +18,7 @@ in enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' Whenever to enable the atftpd TFTP server. ''; diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index e9cacf4a16e..b069526c768 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -20,7 +20,7 @@ in services.freenet = { enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "Enable the Freenet daemon"; }; diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix index bc0fbb42c99..6bfe62e6261 100644 --- a/nixos/modules/services/networking/iodined.nix +++ b/nixos/modules/services/networking/iodined.nix @@ -20,13 +20,13 @@ in services.iodined = { enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "Enable iodine, ip over dns daemon"; }; client = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "Start iodine in client mode"; }; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index d2045c9efc5..3412d02862b 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -16,7 +16,7 @@ rec { services.kippo = { enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = ''Enable the kippo honeypot ssh server.''; }; port = mkOption { diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix index 2e1412ff7c8..8aaccebccde 100644 --- a/nixos/modules/services/networking/notbit.nix +++ b/nixos/modules/services/networking/notbit.nix @@ -31,7 +31,7 @@ with lib; services.notbit = { enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = '' Enables the notbit daemon and provides a sendmail binary named `notbit-system-sendmail` for sending mail over the system instance of notbit. Users must be in the notbit group in order to send mail over the system notbit instance. Currently mail recipt is not supported. @@ -65,19 +65,19 @@ with lib; }; specifiedPeersOnly = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "If true, notbit will only connect to peers specified by the peers option."; }; allowPrivateAddresses = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "If true, notbit will allow connections to to RFC 1918 addresses."; }; noBootstrap = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers"; }; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index d6c8e0dc7a5..fd9e58f24a4 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -25,7 +25,7 @@ in options = { services.unifi.enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = '' Whether or not to enable the unifi controller service. diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index f36b886a744..db1f0f5f00c 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -13,7 +13,7 @@ in { enable = mkOption { description = "Whether to enable graphite web frontend."; default = false; - type = types.uniq types.bool; + type = types.bool; }; httpPort = mkOption { diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index b9f4a808b0c..4e837c62dc1 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -12,7 +12,7 @@ in { options.services.marathon = { enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = '' Whether to enable the marathon mesos framework. diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 12f163db463..f6a3fad6c5d 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -34,7 +34,7 @@ in { enable = mkOption { description = "Whether to enable elasticsearch."; default = false; - type = types.uniq types.bool; + type = types.bool; }; host = mkOption { diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 0360deac08b..38fbd3b226c 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -20,7 +20,7 @@ in { enable = mkOption { description = "Whether to enable peerflix service."; default = false; - type = types.uniq types.bool; + type = types.bool; }; stateDir = mkOption { diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 135113b3ceb..44cd6216f5c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -27,7 +27,7 @@ in options = { services.transmission = { enable = mkOption { - type = types.uniq types.bool; + type = types.bool; default = false; description = '' Whether or not to enable the headless Transmission BitTorrent daemon. diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index 34b2fa600ad..c8590e6a54e 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -15,7 +15,7 @@ in enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' If true, enable cgit (fast web interface for git repositories) as a sub-service in lighttpd. cgit will be accessible at diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 06f310eeb93..490df268e8f 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -122,7 +122,7 @@ in enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' Enable the lighttpd web server. ''; @@ -146,7 +146,7 @@ in mod_userdir = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' If true, requests in the form /~user/page.html are rewritten to take the file public_html/page.html from the home directory of the user. @@ -168,7 +168,7 @@ in mod_status = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' Show server status overview at /server-status, statistics at /server-statistics and list of loaded modules at /server-config. diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index ef7072ecba3..f12cc973446 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -17,7 +17,7 @@ in enable = mkOption { default = false; - type = types.uniq types.bool; + type = types.bool; description = '' If true, enable gitweb in lighttpd. Access it at http://yourserver/gitweb ''; From 19ffa212af8763e84e09e1e56fba99e1d7124d84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:11:32 +0200 Subject: [PATCH 400/412] types.uniq types.int -> types.int types.int already implies uniqueness. --- nixos/modules/services/backup/almir.nix | 2 +- nixos/modules/services/backup/bacula.nix | 6 +++--- .../services/continuous-integration/jenkins/default.nix | 2 +- nixos/modules/services/misc/gpsd.nix | 4 ++-- nixos/modules/services/monitoring/statsd.nix | 4 ++-- nixos/modules/services/monitoring/ups.nix | 4 ++-- nixos/modules/services/networking/freenet.nix | 2 +- nixos/modules/services/networking/kippo.nix | 2 +- nixos/modules/services/networking/notbit.nix | 4 ++-- nixos/modules/services/networking/ntopng.nix | 2 +- nixos/modules/services/torrent/transmission.nix | 2 +- nixos/modules/services/web-servers/lighttpd/default.nix | 2 +- nixos/modules/services/x11/redshift.nix | 4 ++-- nixos/modules/system/boot/systemd.nix | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix index ec39a997028..fbb4ff4034f 100644 --- a/nixos/modules/services/backup/almir.nix +++ b/nixos/modules/services/backup/almir.nix @@ -95,7 +95,7 @@ in { port = mkOption { default = 35000; - type = types.uniq types.int; + type = types.int; description = '' Port for Almir web server to listen on. ''; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index c2255f68818..9e3ae66f808 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -182,7 +182,7 @@ in { port = mkOption { default = 9102; - type = types.uniq types.int; + type = types.int; description = '' This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. The default is 9102. ''; @@ -237,7 +237,7 @@ in { port = mkOption { default = 9103; - type = types.uniq types.int; + type = types.int; description = '' Specifies port number on which the Storage daemon listens for Director connections. The default is 9103. ''; @@ -302,7 +302,7 @@ in { port = mkOption { default = 9101; - type = types.uniq types.int; + type = types.int; description = '' Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console configuration file. The default is 9101, so normally this directive need not be specified. This directive should not be used if you specify DirAddresses (N.B plural) directive. ''; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 29a81f066ab..ccea85faa3e 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -50,7 +50,7 @@ in { port = mkOption { default = 8080; - type = types.uniq types.int; + type = types.int; description = '' Specifies port number on which the jenkins HTTP interface listens. The default is 8080. ''; diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index 4a677f33fa0..a4a4c7b5d93 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -54,7 +54,7 @@ in }; port = mkOption { - type = types.uniq types.int; + type = types.int; default = 2947; description = '' The port where to listen for TCP connections. @@ -62,7 +62,7 @@ in }; debugLevel = mkOption { - type = types.uniq types.int; + type = types.int; default = 0; description = '' The debugging level. diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 10ce5a4ce4c..d9e0b83e238 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -49,7 +49,7 @@ in port = mkOption { description = "Port that stats listens for messages on over UDP"; default = 8125; - type = types.uniq types.int; + type = types.int; }; mgmt_address = mkOption { @@ -61,7 +61,7 @@ in mgmt_port = mkOption { description = "Port to run the management TCP interface on"; default = 8126; - type = types.uniq types.int; + type = types.int; }; backends = mkOption { diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index cc9026f768a..98817f22f5d 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -32,7 +32,7 @@ let shutdownOrder = mkOption { default = 0; - type = types.uniq types.int; + type = types.int; description = '' When you have multiple UPSes on your system, you usually need to turn them off in a certain order. upsdrvctl shuts down all the @@ -151,7 +151,7 @@ in maxStartDelay = mkOption { default = 45; - type = types.uniq types.int; + type = types.int; description = '' This can be set as a global variable above your first UPS definition and it can also be set in a UPS section. This value diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index b069526c768..3903a2c708c 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -26,7 +26,7 @@ in }; nice = mkOption { - type = types.uniq types.int; + type = types.int; default = 10; description = "Set the nice level for the Freenet daemon"; }; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 3412d02862b..68f26eefe27 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -21,7 +21,7 @@ rec { }; port = mkOption { default = 2222; - type = types.uniq types.int; + type = types.int; description = ''TCP port number for kippo to bind to.''; }; hostname = mkOption { diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix index 8aaccebccde..a96e181cb80 100644 --- a/nixos/modules/services/networking/notbit.nix +++ b/nixos/modules/services/networking/notbit.nix @@ -39,13 +39,13 @@ with lib; }; port = mkOption { - type = types.uniq types.int; + type = types.int; default = 8444; description = "The port which the daemon listens for other bitmessage clients"; }; nice = mkOption { - type = types.uniq types.int; + type = types.int; default = 10; description = "Set the nice level for the notbit daemon"; }; diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index ab86f1a5b2b..c1525711713 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -57,7 +57,7 @@ in http-port = mkOption { default = 3000; - type = types.uniq types.int; + type = types.int; description = '' Sets the HTTP port of the embedded web server. ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 44cd6216f5c..cf548bc696c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -66,7 +66,7 @@ in }; port = mkOption { - type = types.uniq types.int; + type = types.int; default = 9091; description = "TCP port number to run the RPC/web interface."; }; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 490df268e8f..2c662c0aead 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -130,7 +130,7 @@ in port = mkOption { default = 80; - type = types.uniq types.int; + type = types.int; description = '' TCP port number for lighttpd to bind to. ''; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 4ccb9153526..99d19f6ab15 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -26,12 +26,12 @@ in { day = mkOption { description = "Colour temperature to use during day time"; default = 5500; - type = types.uniq types.int; + type = types.int; }; night = mkOption { description = "Colour temperature to use during night time"; default = 3700; - type = types.uniq types.int; + type = types.int; }; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 1fde720bba0..2ad12c51b21 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -491,7 +491,7 @@ in services.journald.rateLimitBurst = mkOption { default = 100; - type = types.uniq types.int; + type = types.int; description = '' Configures the rate limiting burst limit (number of messages per interval) that is applied to all messages generated on the system. From c63bc92d4c040fb7999185e1948b29c3c84bacf9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:12:32 +0200 Subject: [PATCH 401/412] types.uniq types.str -> types.str --- nixos/modules/hardware/video/bumblebee.nix | 2 +- nixos/modules/misc/nixpkgs.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e20ebc3041e..e341eac4a81 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -26,7 +26,7 @@ in hardware.bumblebee.group = mkOption { default = "wheel"; example = "video"; - type = types.uniq types.str; + type = types.str; description = ''Group for bumblebee socket''; }; hardware.bumblebee.connectDisplay = mkOption { diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 114feb2562d..fb5516c953c 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -59,7 +59,7 @@ in }; nixpkgs.system = mkOption { - type = types.uniq types.str; + type = types.str; example = "i686-linux"; description = '' Specifies the Nix platform type for which NixOS should be built. From 6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 18:18:46 +0200 Subject: [PATCH 402/412] Some more type cleanup --- nixos/modules/config/shells-environment.nix | 2 +- nixos/modules/misc/assertions.nix | 2 +- nixos/modules/programs/ssh.nix | 4 ++-- nixos/modules/security/ca.nix | 2 +- nixos/modules/services/logging/logcheck.nix | 2 +- nixos/modules/services/logging/rsyslogd.nix | 2 +- nixos/modules/services/logging/syslogd.nix | 2 +- nixos/modules/services/mail/opensmtpd.nix | 2 +- nixos/modules/services/misc/apache-kafka.nix | 2 +- nixos/modules/services/misc/mesos-master.nix | 2 +- nixos/modules/services/misc/mesos-slave.nix | 2 +- nixos/modules/services/misc/zookeeper.nix | 2 +- nixos/modules/services/monitoring/ups.nix | 2 +- nixos/modules/services/networking/dnsmasq.nix | 2 +- nixos/modules/services/networking/firewall.nix | 4 ++-- nixos/modules/services/networking/minidlna.nix | 2 +- nixos/modules/services/networking/networkmanager.nix | 4 ++-- nixos/modules/services/networking/polipo.nix | 2 +- nixos/modules/services/networking/ssh/sshd.nix | 2 +- nixos/modules/services/networking/wpa_supplicant.nix | 2 +- nixos/modules/services/networking/znc.nix | 4 ++-- nixos/modules/services/search/elasticsearch.nix | 2 +- nixos/modules/system/boot/luksroot.nix | 2 +- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/modules/system/boot/systemd-unit-options.nix | 4 ++-- nixos/modules/tasks/filesystems.nix | 2 +- nixos/modules/tasks/kbd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 2 +- 28 files changed, 33 insertions(+), 33 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index e5b342afcc4..bff0b299132 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -63,7 +63,7 @@ in description = '' A list of profiles used to setup the global environment. ''; - type = types.listOf types.string; + type = types.listOf types.str; }; environment.profileRelativeEnvVars = mkOption { diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index c1be36e98cb..c42de038e61 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -21,7 +21,7 @@ with lib; warnings = mkOption { internal = true; default = []; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "The `foo' service is deprecated and will go away soon!" ]; description = '' This option allows modules to show warnings to users during diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 6ca73eea5f6..0d1ec500afc 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -27,7 +27,7 @@ in programs.ssh = { askPassword = mkOption { - type = types.string; + type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; description = ''Program used by SSH to ask for passwords.''; }; @@ -77,7 +77,7 @@ in }; agentTimeout = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "1h"; description = '' diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 31caab97a65..88f53eab9b4 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -33,7 +33,7 @@ in }; security.pki.certificates = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = singleton '' NixOS.org diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 1cd032ffa76..6069262b470 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -192,7 +192,7 @@ in extraGroups = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "postdrop" "mongodb" ]; description = '' Extra groups for the logcheck user, for example to be able to use sendmail, diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix index d4b7aa809f0..1ea96b8f132 100644 --- a/nixos/modules/services/logging/rsyslogd.nix +++ b/nixos/modules/services/logging/rsyslogd.nix @@ -66,7 +66,7 @@ in }; extraParams = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ ]; example = [ "-m 0" ]; description = '' diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index 325868079e2..a0f8e89fa69 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -83,7 +83,7 @@ in }; extraParams = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ ]; example = [ "-m 0" ]; description = '' diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index fbc4b1d7d8a..a3e50b42292 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -24,7 +24,7 @@ in { }; extraServerArgs = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "-v" "-P mta" ]; description = '' diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index cbfeef7a9c7..f6198e03bae 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -108,7 +108,7 @@ in { "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true" ]; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 6cbe94029d2..497646b2b41 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -45,7 +45,7 @@ in { See https://mesos.apache.org/documentation/latest/configuration/ ''; default = [ "" ]; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "--credentials=VALUE" ]; }; diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 7a7fcf105ac..8c29734813a 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -70,7 +70,7 @@ in { See https://mesos.apache.org/documentation/latest/configuration/ ''; default = [ "" ]; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "--gc_delay=3days" ]; }; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 827a050be11..4ce692b6f6a 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -94,7 +94,7 @@ in { extraCmdLineOptions = mkOption { description = "Extra command line options for the Zookeeper launcher."; default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; }; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 98817f22f5d..eb478f7da65 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -63,7 +63,7 @@ let directives = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' List of configuration directives for this UPS. ''; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 18086154b6b..4a812167bb5 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -45,7 +45,7 @@ in }; servers = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "8.8.8.8" "8.8.4.4" ]; description = '' diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index b05a640e11f..40681f5b957 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -287,7 +287,7 @@ in }; networking.firewall.trustedInterfaces = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; description = '' Traffic coming in from these interfaces will be accepted @@ -379,7 +379,7 @@ in networking.firewall.connectionTrackingModules = mkOption { default = [ "ftp" ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; - type = types.listOf types.string; + type = types.listOf types.str; description = '' List of connection-tracking helpers that are auto-loaded. diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 989ee4d91af..51850496e2c 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -30,7 +30,7 @@ in }; services.minidlna.mediaDirs = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "/data/media" "V,/home/alice/video" ]; description = diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 60f380f024b..adbc6099c95 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -118,7 +118,7 @@ in { }; appendNameservers = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; description = '' A list of name servers that should be appended @@ -127,7 +127,7 @@ in { }; insertNameservers = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; description = '' A list of name servers that should be inserted before diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 51179d9120f..847fc88ead4 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -42,7 +42,7 @@ in }; allowedClients = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "127.0.0.1" "::1" ]; example = [ "127.0.0.1" "::1" "134.157.168.0/24" "2001:660:116::/48" ]; description = '' diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 14d516ddbb6..bc89ea2d3cd 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -234,7 +234,7 @@ in ]; options = { hostNames = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; description = '' A list of host names and/or IP numbers used for accessing diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index e2d34ea079c..9e04bd40190 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -43,7 +43,7 @@ in }; interfaces = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = [ "wlan0" "wlan1" ]; description = '' diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index b39aea04521..196a14dd40e 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -144,7 +144,7 @@ in */ confOptions = { modules = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "partyline" "webadmin" "adminlog" "log" ]; example = [ "partyline" "webadmin" "adminlog" "log" ]; description = '' @@ -153,7 +153,7 @@ in }; userModules = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ ]; example = [ "fish" "push" ]; description = '' diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index f6a3fad6c5d..64620bf1604 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -102,7 +102,7 @@ in { extraCmdLineOptions = mkOption { description = "Extra command line options for the elasticsearch launcher."; default = []; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" ]; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 03070bef483..3799e5d7ddb 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -211,7 +211,7 @@ in }; boot.initrd.luks.cryptoModules = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8b58eccdcec..893861a2eed 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -358,7 +358,7 @@ in boot.initrd.supportedFilesystems = mkOption { default = [ ]; example = [ "btrfs" ]; - type = types.listOf types.string; + type = types.listOf types.str; description = "Names of supported filesystem types in the initial ramdisk."; }; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 57831a5e6ef..a7a334dec28 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -42,13 +42,13 @@ in rec { requiredBy = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = "Units that require (i.e. depend on and need to go down with) this unit."; }; wantedBy = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = "Units that want (i.e. depend on) this unit."; }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ce8d6079faa..ce21d9fe762 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -121,7 +121,7 @@ in boot.supportedFilesystems = mkOption { default = [ ]; example = [ "btrfs" ]; - type = types.listOf types.string; + type = types.listOf types.str; description = "Names of supported filesystem types."; }; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 8d26998021d..69f004888f5 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -22,7 +22,7 @@ in # FIXME: still needed? boot.extraTTYs = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; example = ["tty8" "tty9"]; description = '' Tty (virtual console) devices, in addition to the consoles on diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 71a721abba2..6361ed2cc43 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -392,7 +392,7 @@ in interfaces = mkOption { example = [ "eth0" "eth1" ]; - type = types.listOf types.string; + type = types.listOf types.str; description = "The physical network interfaces connected by the bridge."; }; From d3212beff9b4ff076d67e9334a83a967ab2baf6c Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Wed, 3 Jun 2015 20:21:12 +0000 Subject: [PATCH 403/412] Allow custom tags to be set for datadog monitoring --- nixos/modules/services/monitoring/dd-agent.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index dc51a7c7486..3e90393a662 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -23,6 +23,7 @@ let # proxy_password: password # tags: mytag0, mytag1 + ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"} # collect_ec2_tags: no # recent_point_threshold: 30 @@ -80,6 +81,13 @@ in { type = types.str; }; + tags = mkOption { + description = "The tags to mark this Datadog agent"; + example = [ "test" "service" ]; + default = null; + type = types.nullOr (types.listOf types.str); + }; + hostname = mkOption { description = "The hostname to show in the Datadog dashboard (optional)"; default = null; From fa5eb0a7da226ff593f36d3a6661b5a780926e7b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 14 Jun 2015 20:00:21 -0700 Subject: [PATCH 404/412] rethinkdb: 2.0.0-1 -> 2.0.3 --- pkgs/servers/nosql/rethinkdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 79343b04483..2f47d542d00 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.0.0-1"; + version = "2.0.3"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "0fbxs6gmlmgkbfrmi0f4xyr3vqwylr6i7fa4p68y12qy6kv7q9pc"; + sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd"; }; preConfigure = '' From 5af468d0bc670f020ff75372be82c2857da912bc Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Jun 2015 10:09:07 +0200 Subject: [PATCH 405/412] libmspack: update from 0.4alpha to 0.5alpha fixes CVE-2014-9732, CVE-2015-4467, CVE-2015-4468, CVE-2015-4469, CVE-2015-4470, CVE-2015-4471 and CVE-2015-4472. --- pkgs/development/libraries/libmspack/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index b78e583fa64..1b981edcdcd 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,13 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmspack-0.4alpha"; + name = "libmspack-0.5alpha"; src = fetchurl { - # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable" - #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; - url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/" - + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz"; - sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp"; + url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz"; + sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9"; }; meta = { @@ -15,5 +12,4 @@ stdenv.mkDerivation { homepage = http://www.cabextract.org.uk/libmspack; license = stdenv.lib.licenses.lgpl2; }; - } From d95fba37460d1a727e06b4df0e3dec659b67eafa Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Mon, 15 Jun 2015 10:47:53 +0200 Subject: [PATCH 406/412] haskell-uhc: Use newer version with relaxed cabal constraints. --- pkgs/development/compilers/uhc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 64d51f971b9..1dbfb039f90 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -2,13 +2,17 @@ let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.9.1"; + # Important: + # The commits "Fixate/tag v..." are the released versions. + # Ignore the "bumped version to ...." commits, they do not + # correspond to releases. + version = "1.1.9.1.20150611"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b"; - sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3"; + rev = "b80098e07d12900f098ea964b1d2b3f38e5c9900"; + sha256 = "14qg1fd9pgbczcmn5ggkd9674qadx1izmz8363ps7c207dg94f9x"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; From b3113802276b133fb62bd57d129937252cbe7c76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Jun 2015 11:38:10 +0200 Subject: [PATCH 407/412] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/2c4a8914cbc96987a1c2f9a32ca798f7055d548c with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e --- .../haskell-modules/hackage-packages.nix | 404 ++++++++++++------ 1 file changed, 275 insertions(+), 129 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e5cdabbed67..75d61b83d96 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17727,8 +17727,8 @@ self: { }: mkDerivation { pname = "agentx"; - version = "0.1.0.5"; - sha256 = "0a6zzn4zv5f1zl10vz1p4iw32s9jd605px4ziy5v24fmjm5xnbzb"; + version = "0.2.0.0"; + sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17891,8 +17891,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "3.1"; - sha256 = "19x4y060r9cgkfffyxdgilmrrjv4ycpxv6w8gclkfrxj1ywwkwx4"; + version = "4.0.3"; + sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv"; buildDepends = [ aivika base containers directory filepath mtl network-uri parallel-io split @@ -17925,8 +17925,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "3.1"; - sha256 = "17bp7bp3x7z3xlzd6922mjm44v8jlkw1ak3zfr31146hlifgfhyw"; + version = "4.0.3"; + sha256 = "1c5xzp0n67fg799cdf6aqc7sxbv3dy6nkiilyc5hlr8bg3r20bpd"; buildDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -19370,8 +19370,8 @@ self: { }: mkDerivation { pname = "angel"; - version = "0.6.0"; - sha256 = "0625r8jy9v6x5v5y5vrz2z7bqag9hwjnxr7ir35bq18xd5fpr9kf"; + version = "0.6.1"; + sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19785,7 +19785,9 @@ self: { mkDerivation { pname = "apiary"; version = "1.4.3"; + revision = "1"; sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc"; + editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19798,7 +19800,6 @@ self: { base bytestring http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -19853,14 +19854,13 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; - revision = "1"; + revision = "2"; sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32"; + editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -19909,15 +19909,14 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; - revision = "1"; + revision = "2"; sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c"; + editedCabalFile = "ce71ccd5e0a1f20777b17efdc536aab8f43a3468f54fa14609c635aa731ce944"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base types-compat ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -21693,6 +21692,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "attoparsec-trans" = callPackage + ({ mkDerivation, attoparsec, base, transformers }: + mkDerivation { + pname = "attoparsec-trans"; + version = "0.1.0.3"; + sha256 = "11a743qgh9rwjyf1hng5jg139xr11dsjj1bisqaaayb17addd2xx"; + buildDepends = [ attoparsec base transformers ]; + homepage = "https://github.com/srijs/haskell-attoparsec-trans"; + description = "Interleaved effects for attoparsec parsers"; + license = stdenv.lib.licenses.mit; + }) {}; + "attosplit" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -22178,6 +22189,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "aws-dynamodb-conduit" = callPackage + ({ mkDerivation, aeson, attoparsec-trans, aws, base, bytestring + , conduit, http-conduit, http-types, json-togo, resourcet, text + , transformers + }: + mkDerivation { + pname = "aws-dynamodb-conduit"; + version = "0.1.0.2"; + sha256 = "02q49anmairvjwzvgn8kqx27965n71xbyi86wwlmrs4w0dkbsd41"; + buildDepends = [ + aeson attoparsec-trans aws base bytestring conduit http-conduit + http-types json-togo resourcet text transformers + ]; + homepage = "https://github.com/srijs/haskell-aws-dynamodb-query"; + description = "Conduit-based interface for AWS DynamoDB"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-dynamodb-streams" = callPackage ({ mkDerivation, aeson, attoparsec, aws, aws-general, base , base-unicode-symbols, base16-bytestring, base64-bytestring @@ -23348,8 +23377,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.4.1"; - sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9"; + version = "0.5.0"; + sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi"; buildDepends = [ base bytestring containers filepath hashable lifted-base ReadArgs safe text transformers unordered-containers vector @@ -23781,8 +23810,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "between"; - version = "0.9.0.2"; - sha256 = "0n3nx077hv10rwv2kl3n1a3v40sr1qzfj9jwb6cvd1l0zx42igw8"; + version = "0.10.0.0"; + sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi"; buildDepends = [ base ]; homepage = "https://github.com/trskop/between"; description = "Function combinator \"between\" and derived combinators"; @@ -26879,6 +26908,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "break" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "break"; + version = "1.0.0"; + sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m"; + buildDepends = [ base mtl transformers ]; + description = "Break from a loop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "breakout" = callPackage ({ mkDerivation, base, haskgame, mtl, SDL }: mkDerivation { @@ -27723,8 +27763,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.3.0"; - sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; + version = "0.3.1"; + sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; jailbreak = true; @@ -31615,8 +31655,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.12.0"; - sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw"; + version = "0.12.0.1"; + sha256 = "0ny5cxkzbjhhsmypsp4sjm7nm0jv2l2kysgcphm6j1l3dr0ck6il"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base @@ -34181,8 +34221,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.0"; - sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv"; + version = "1.0.1"; + sha256 = "014n3qhn9flwj43zjp62vagp5df9ll6nkjk1x9qpagni1vf9cbqq"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -34555,13 +34595,12 @@ self: { }: mkDerivation { pname = "connection-pool"; - version = "0.1.1.0"; - sha256 = "08mfl5gwbxzkf6dvqvshmzpjy02f46avimw8ss66br2397bi0qj7"; + version = "0.1.2.0"; + sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az"; buildDepends = [ base between data-default-class monad-control network resource-pool streaming-commons time transformers-base ]; - jailbreak = true; homepage = "https://github.com/trskop/connection-pool"; description = "Connection pool built on top of resource-pool and streaming-commons"; license = stdenv.lib.licenses.bsd3; @@ -39912,8 +39951,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.1.0"; - sha256 = "0hzvv6aazpf7r75yygcqy1ldz3j9shs6spv71nzn040rny67cdll"; + version = "0.7.1.1"; + sha256 = "0r2f14h0bpbq861jfa0rgp0y87nq142f80dyjzyzzrdwc8szj120"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40373,6 +40412,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "delta" = callPackage + ({ mkDerivation, base, containers, directory, filepath, fs-events + , sodium, time + }: + mkDerivation { + pname = "delta"; + version = "0.1.0.1"; + sha256 = "0kjii2hqwzzsb8i09547y0qxrdak3xkhgv7dqahbpypzh8hldgzf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers directory filepath fs-events sodium time + ]; + homepage = "https://github.com/kryoxide/delta"; + description = "A library for detecting file changes"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "delta-h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, monad-atom , nlp-scores, text @@ -45579,10 +45636,9 @@ self: { ({ mkDerivation, base, between, transformers }: mkDerivation { pname = "endo"; - version = "0.1.0.2"; - sha256 = "1wqg0mcaf55wa70wjgd6n0gw56rghz6p76lc6kw4aki969h12xrl"; + version = "0.2.0.0"; + sha256 = "1gqw14nadw1cb49m251swly35gjkb2xhqi0cqhm17ww8r13mzp31"; buildDepends = [ base between transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/endo"; description = "Endomorphism utilities"; license = stdenv.lib.licenses.bsd3; @@ -46476,6 +46532,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ether" = callPackage + ({ mkDerivation, base, mtl, newtype-generics, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers + }: + mkDerivation { + pname = "ether"; + version = "0.2.1.0"; + sha256 = "1iwi3whaxnpwfdghw1rli9dxqh1c28hhxkdvl4wslj0vc014h3di"; + buildDepends = [ + base mtl newtype-generics template-haskell transformers + ]; + testDepends = [ + base mtl QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "https://int-index.github.io/ether/"; + description = "Monad transformers and classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ethereum-client-haskell" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, data-default @@ -52844,12 +52919,12 @@ self: { }) {}; "ghc-simple" = callPackage - ({ mkDerivation, base, data-default, ghc, ghc-paths }: + ({ mkDerivation, base, ghc, ghc-paths }: mkDerivation { pname = "ghc-simple"; - version = "0.1.0.0"; - sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf"; - buildDepends = [ base data-default ghc ghc-paths ]; + version = "0.1.2.0"; + sha256 = "0cwirw9j52khkl8fsgw22136nb3nwlbiahvfcds8hryvr64x9vql"; + buildDepends = [ base ghc ghc-paths ]; homepage = "https://github.com/valderman/ghc-simple"; description = "Simplified interface to the GHC API"; license = stdenv.lib.licenses.mit; @@ -62021,6 +62096,7 @@ self: { base basic-prelude containers errors mtl random-shuffle tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; description = "Implementation of the rules of Love Letter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -64598,7 +64674,9 @@ self: { mkDerivation { pname = "highlighting-kate"; version = "0.6"; + revision = "1"; sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk"; + editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64919,7 +64997,9 @@ self: { mkDerivation { pname = "hipbot"; version = "0.5"; + revision = "1"; sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs"; + editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri @@ -64927,7 +65007,6 @@ self: { unordered-containers utf8-string wai wai-lens webcrank webcrank-wai wreq ]; - jailbreak = true; homepage = "https://github.com/purefn/hipbot"; description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; @@ -65864,8 +65943,8 @@ self: { ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.3.0.2"; - sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn"; + version = "0.3.0.3"; + sha256 = "0zrh3knwqkaqlgajza22jfg3xhsxhiaf8qmiwnd9qjbasnm5a1lp"; buildDepends = [ base binary hmatrix storable-complex ]; pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; @@ -68322,9 +68401,10 @@ self: { mkDerivation { pname = "hs-pkg-config"; version = "0.2.1.0"; + revision = "1"; sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh"; + editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; buildDepends = [ base data-default-class text ]; - jailbreak = true; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; @@ -69704,9 +69784,9 @@ self: { mkDerivation { pname = "hslua"; version = "0.4.0"; - revision = "1"; + revision = "2"; sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p"; - editedCabalFile = "a2019a0881b90b842dfa9c88e452a45bbadb25d9461d0549ab8fd328a82757ee"; + editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec hspec-contrib HUnit text ]; extraLibraries = [ lua ]; @@ -75448,12 +75528,13 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, base, contravariant }: + ({ mkDerivation, base, contravariant, hspec, QuickCheck }: mkDerivation { pname = "invariant"; - version = "0.1.1"; - sha256 = "077jhn2fspnjkr8p3sh6draidqpk6wpism73rz8172acd4jjg4fz"; + version = "0.1.2"; + sha256 = "02p114wnpxbqxik4sz87bd9rcqfs9klgsxi9pc4v1qwyb64mb92b"; buildDepends = [ base contravariant ]; + testDepends = [ base hspec QuickCheck ]; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -77685,6 +77766,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json-togo" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base + , bytestring, scientific, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "json-togo"; + version = "0.1.0.1"; + sha256 = "05g8k8qsxjwqrdwqf24g90hx5jlrwjpa4vsjf0ddrw0whnva3gbz"; + buildDepends = [ + aeson attoparsec attoparsec-trans base bytestring scientific text + transformers unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/srijs/haskell-json-togo"; + description = "Effectful parsing of JSON documents"; + license = stdenv.lib.licenses.mit; + }) {}; + "json-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , process, tar, text, unordered-containers, vector @@ -80977,8 +81077,8 @@ self: { }: mkDerivation { pname = "leksah"; - version = "0.15.0.1"; - sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh"; + version = "0.15.0.3"; + sha256 = "11b4kp1bbw35gsrdcr5kjyjrfiqrqfy645nbpngjz7rzivjl6n4s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81012,8 +81112,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.15.0.1"; - sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp"; + version = "0.15.0.2"; + sha256 = "090nz2kvsf83jdp2lhng5x87a96xzxknsr4vx2jc2r2vs60841lx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -82466,13 +82566,13 @@ self: { }) {}; "linear-grammar" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "linear-grammar"; - version = "0.0.1.6"; - sha256 = "05mzxv1ixdxirmm31jqwd8w749dpy113pyw1mfr6ck3ksva5g1ap"; - buildDepends = [ base QuickCheck ]; - testDepends = [ base hspec QuickCheck ]; + version = "0.0.2.1"; + sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97"; + buildDepends = [ base containers QuickCheck ]; + testDepends = [ base containers hspec QuickCheck ]; description = "A simple grammar for building linear equations and inclusive inequalities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83785,8 +83885,8 @@ self: { }: mkDerivation { pname = "lock-file"; - version = "0.5.0.1"; - sha256 = "0x1pis244pg5k91y3p40m2pc483vx49gcdqa95f7q0gjsnvb9yi9"; + version = "0.5.0.2"; + sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7"; buildDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -83796,7 +83896,6 @@ self: { tagged-exception-core test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; @@ -89246,10 +89345,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.9.1"; - revision = "1"; - sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; - editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf"; + version = "0.9.2"; + sha256 = "1cw8bsf6ayalsx0l0xwb2f2j2rg6zpfsvci174fr4xiyr646mpd6"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -90450,6 +90547,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "murmur3" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "murmur3"; + version = "1.0.0"; + sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq"; + buildDepends = [ base binary bytestring ]; + testDepends = [ + base base16-bytestring bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/plaprade/murmur3"; + description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "murmurhash3" = callPackage ({ mkDerivation, haskell2010 }: mkDerivation { @@ -95214,6 +95330,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optional-args" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "optional-args"; + version = "1.0.0"; + sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z"; + buildDepends = [ base ]; + description = "Optional function arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "options" = callPackage ({ mkDerivation, base, chell, chell-quickcheck, containers , monads-tf, transformers @@ -95478,8 +95605,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.1.1"; - sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7"; + version = "0.1.1.2"; + sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -98006,8 +98133,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.3.3"; - sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5"; + version = "2.1.3.4"; + sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -98016,7 +98143,6 @@ self: { testDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -103669,8 +103795,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.0.1.0"; - sha256 = "04r5nqm7g5wp13k6d109yykky9i121f65bxlv5ji5sk35yp650c4"; + version = "0.1.0.0"; + sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl"; buildDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -105006,12 +105132,15 @@ self: { "record" = callPackage ({ mkDerivation, base, base-prelude, basic-lens, template-haskell + , transformers }: mkDerivation { pname = "record"; - version = "0.4.0.0"; - sha256 = "0ml0rmqscdkp4zp430q206lrnah3j5d4bbra7ka526gagmrvpnmb"; - buildDepends = [ base base-prelude basic-lens template-haskell ]; + version = "0.4.0.2"; + sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw"; + buildDepends = [ + base base-prelude basic-lens template-haskell transformers + ]; homepage = "https://github.com/nikita-volkov/record"; description = "Anonymous records"; license = stdenv.lib.licenses.mit; @@ -105815,7 +105944,9 @@ self: { mkDerivation { pname = "regex-tdfa"; version = "1.2.0"; + revision = "1"; sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw"; + editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e"; buildDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -113525,6 +113656,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "simplex-basic" = callPackage + ({ mkDerivation, base, bifunctors, containers, hspec + , linear-grammar, mtl, QuickCheck, transformers + }: + mkDerivation { + pname = "simplex-basic"; + version = "0.0.0.1"; + sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq"; + buildDepends = [ + base bifunctors linear-grammar mtl QuickCheck transformers + ]; + testDepends = [ + base bifunctors containers hspec linear-grammar mtl QuickCheck + transformers + ]; + description = "Very basic simplex implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -115320,10 +115470,10 @@ self: { }: mkDerivation { pname = "snaplet-sqlite-simple"; - version = "0.4.8.2"; - sha256 = "00a92wymniaw0si4xpkx1442prmcjimwrjjqiqnkj6k8bxs7p2jm"; + version = "0.4.8.3"; + sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3"; buildDepends = [ - aeson base bytestring clientsession configurator direct-sqlite + aeson base bytestring clientsession configurator direct-sqlite lens MonadCatchIO-transformers mtl snap sqlite-simple text transformers unordered-containers ]; @@ -115333,7 +115483,6 @@ self: { SafeSemaphore snap snap-core sqlite-simple stm test-framework test-framework-hunit text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -115544,8 +115693,8 @@ self: { }: mkDerivation { pname = "snmp"; - version = "0.1.0.3"; - sha256 = "1zncgn3i6xbvxrwdf6s6vhbmsf6sqncf2rbllx26dz1bmxh4gr33"; + version = "0.2.0.0"; + sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67"; buildDepends = [ asn1-encoding asn1-parse asn1-types async base binary bytestring cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl @@ -117299,44 +117448,44 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring - , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra - , containers, cpphs, cryptohash, cryptohash-conduit, deepseq - , directory, either, enclosed-exceptions, exceptions, fast-logger - , filepath, hashable, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-base, monad-control - , monad-logger, monad-loops, mtl, old-locale, optparse-applicative - , optparse-simple, path, persistent, persistent-sqlite - , persistent-template, pretty, process, resourcet, safe, split, stm - , streaming-commons, tar, template-haskell, temporary, text, time - , transformers, transformers-base, unix, unordered-containers - , vector, vector-binary-instances, void, yaml, zlib + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, bifunctors, binary, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, containers, cryptohash + , cryptohash-conduit, deepseq, directory, either + , enclosed-exceptions, exceptions, fast-logger, filepath, hashable + , hspec, http-client, http-client-tls, http-conduit, http-types + , lifted-base, monad-control, monad-logger, monad-loops, mtl + , old-locale, optparse-applicative, optparse-simple, path + , persistent, persistent-sqlite, persistent-template, pretty + , process, resourcet, safe, split, stm, streaming-commons, tar + , template-haskell, temporary, text, time, transformers + , transformers-base, unix, unordered-containers, vector + , vector-binary-instances, void, yaml, zlib }: mkDerivation { pname = "stack"; - version = "0.0.1"; - sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3"; + version = "0.0.2.1"; + sha256 = "1gv2cbjnr93s4cyhybpd8nsqa8gqd9hpm9wyrh19fl82p8db46x6"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async attoparsec base base64-bytestring bifunctors binary - bytestring Cabal conduit conduit-extra containers cryptohash - cryptohash-conduit deepseq directory either enclosed-exceptions - exceptions fast-logger filepath hashable http-client - http-client-tls http-conduit http-types lifted-base monad-control - monad-logger monad-loops mtl old-locale optparse-applicative - optparse-simple path persistent persistent-sqlite - persistent-template pretty process resourcet safe split stm - streaming-commons tar template-haskell temporary text time - transformers transformers-base unix unordered-containers vector - vector-binary-instances void yaml zlib + aeson async attoparsec base base16-bytestring base64-bytestring + bifunctors binary bytestring Cabal conduit conduit-combinators + conduit-extra containers cryptohash cryptohash-conduit deepseq + directory either enclosed-exceptions exceptions fast-logger + filepath hashable http-client http-client-tls http-conduit + http-types lifted-base monad-control monad-logger monad-loops mtl + old-locale optparse-applicative optparse-simple path persistent + persistent-sqlite persistent-template pretty process resourcet safe + split stm streaming-commons tar template-haskell temporary text + time transformers transformers-base unix unordered-containers + vector vector-binary-instances void yaml zlib ]; testDepends = [ base Cabal conduit conduit-extra containers cryptohash directory exceptions filepath hspec http-conduit monad-logger path resourcet temporary transformers ]; - buildTools = [ cpphs ]; homepage = "https://github.com/commercialhaskell/stack test/package-dump/ghc-7.8.txt test/package-dump/ghc-7.10.txt"; @@ -120949,17 +121098,14 @@ test/package-dump/ghc-7.10.txt"; }) {}; "tagged-exception-core" = callPackage - ({ mkDerivation, base, exceptions, extensible-exceptions, mmorph - , transformers - }: + ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }: mkDerivation { pname = "tagged-exception-core"; - version = "2.0.0.0"; - sha256 = "02ny4yz9afaazw2pxpkpalffx8i5nhi3x9561blrd0pdrqq8qnib"; - buildDepends = [ - base exceptions extensible-exceptions mmorph transformers - ]; - jailbreak = true; + version = "2.1.0.0"; + revision = "1"; + sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax"; + editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689"; + buildDepends = [ base exceptions mmorph mtl transformers ]; homepage = "https://github.com/trskop/tagged-exception"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; @@ -124059,8 +124205,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "thumbnail-plus"; - version = "1.0.4"; - sha256 = "110vfk5ri394awzmmq82r87gc9pmvy3500i836602syvd5zfa92x"; + version = "1.0.5"; + sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441"; buildDepends = [ base bytestring conduit conduit-extra data-default directory either gd imagesize-conduit resourcet temporary transformers @@ -124481,13 +124627,14 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "time-recurrence"; version = "0.9.2"; + revision = "1"; sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm"; + editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427"; buildDepends = [ base data-ordlist mtl time ]; testDepends = [ base data-ordlist HUnit mtl old-locale test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "http://github.com/hellertime/time-recurrence"; description = "Generate recurring dates"; license = stdenv.lib.licenses.gpl3; @@ -126026,8 +126173,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "trurl"; - version = "0.2.0.0"; - sha256 = "167f7wrvrva7764z35l48rxbcnnajm343gqw2b67jh14d5kj6fz9"; + version = "0.2.2.0"; + sha256 = "139c97c63fhgq9lisic5wyfn872j120xsj3i72fs5s0aa9m59w81"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -131837,8 +131984,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "wai-middleware-metrics"; - version = "0.2.0"; - sha256 = "0vqpp7fqjmhknvmizvbzzay3ixk0a5jqq9y80al62hc2yb75pz0w"; + version = "0.2.1"; + sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0"; buildDepends = [ base ekg-core http-types time wai ]; testDepends = [ base bytestring ekg-core http-types QuickCheck scotty tasty @@ -132815,7 +132962,9 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "webcrank"; version = "0.2.2"; + revision = "1"; sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj"; + editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -132826,7 +132975,6 @@ test/package-dump/ghc-7.10.txt"; http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck unordered-containers ]; - jailbreak = true; homepage = "https://github.com/webcrank/webcrank.hs"; description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; @@ -136478,8 +136626,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-auth"; - version = "1.4.5"; - sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn"; + version = "1.4.5.1"; + sha256 = "161gij0r82raih9lvdws4vsknpm36m00ikd17vhhlzz01q9z7l64"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -136489,7 +136637,6 @@ test/package-dump/ghc-7.10.txt"; resourcet safe shakespeare template-haskell text time transformers unordered-containers wai yesod-core yesod-form yesod-persistent ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; @@ -136784,8 +136931,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-bin"; - version = "1.4.9.2"; - sha256 = "0bbr9bjgj75jh8q9jzv9h1ivz87svz3j02hwphq32487f3682gd0"; + version = "1.4.10"; + sha256 = "1h55155l7ca664zdwq1x0c6p43gy35p1vvghpgd0ajzip8lsyfq1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -137302,8 +137449,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.0.2"; - sha256 = "06qzgq0mb7k0h8q6lh47l0mzx91xn4ba07nmn22vsfvjfdji6lib"; + version = "1.4.0.3"; + sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4"; buildDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -137312,7 +137459,6 @@ test/package-dump/ghc-7.10.txt"; base blaze-builder conduit hspec persistent persistent-sqlite text wai-extra yesod-core ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; From a0473fde87721c9211785c1ef66f85717554ca91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Jun 2015 13:04:08 +0200 Subject: [PATCH 408/412] tzdata -> 2015e --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 0ed99bfdb16..6d10fe68a09 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2015d"; in +let version = "2015e"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0cfmjvr753b3wjnr1njv268xcs31yl9pifkxx58y42bz4w4517wb"; + sha256 = "0vxs6j1i429vxz4a1lbwjz81k236lxdggqvrlix2ga5xib9vbjgz"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "0a3i65b6lracfx18s8j69k0x30x8aq9gx7qm040sybn4qm7ga6i2"; + sha256 = "185db6789kygcpcl48y1dh6m4fkgqcwqjwx7f3s5dys7b2sig8mm"; }) ]; From 553ce28bc296c8f51cf2605e58abaa14d4bb41b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2015 19:58:08 +0200 Subject: [PATCH 409/412] geolite-legacy -> 2015-06-15 --- pkgs/data/misc/geolite-legacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index a34c10630aa..b6cc2a25266 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-06-03"; + version = "2015-06-15"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4"; + "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs"; From b325c1556a9b769ec3f6d5c56eed707e319138a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Jun 2015 11:31:15 -0700 Subject: [PATCH 410/412] kernel: 3.12.43 -> 3.12.44 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 2646bf93b0a..e34eccadda6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.43"; + version = "3.12.44"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "08nsppn3rpwydkq0pd8k8fgjfm67y2nbbrcz1hri227crxxx13dm"; + sha256 = "05fyb49ibijq2iv4x25m5a77n8609b4lz8x8n8wfkdywm13479h8"; }; features.iwlwifi = true; From 2fd74f43b5a22923b64ceab2f13fb99f827dec04 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Jun 2015 11:31:26 -0700 Subject: [PATCH 411/412] kernel: 3.18.14 -> 3.18.16 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 592086b6547..168bfe5e94c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.14"; + version = "3.18.16"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i"; + sha256 = "0c2530amgsk29ina9mfvlncki64w0zs16d2k8bghq3fv9k2qv3nr"; }; features.iwlwifi = true; From 046ba6b7db940c8f70ee6fca0de28464febe4a4d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Jun 2015 11:37:05 -0700 Subject: [PATCH 412/412] linux-testing: 4.1-rc7 -> 4.1-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 60bc4e51209..ec7e597e871 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1-rc7"; - modDirVersion = "4.1.0-rc7"; + version = "4.1-rc8"; + modDirVersion = "4.1.0-rc8"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "09bxkm0nl9vzlfb14500bl6zjzhgacy7y32b3mw1d9hx62yknk2f"; + sha256 = "0ia4lajpr3w9iivmwm2d7gqrpv97da5g4j8pkqa7q4mlr86jki2w"; }; features.iwlwifi = true;